tor-commits September 2018

tor-commits@lists.torproject.org

17 participants
3230 discussions

[onionoo/release] Use more appropriate assert methods in tests.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit d09bfefe943974b966eb487de0e062cac540ba56 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 14:41:26 2018 +0200 Use more appropriate assert methods in tests. --- .../torproject/onionoo/docs/UptimeStatusTest.java | 21 +++++++-------------- .../onionoo/updater/UptimeStatusUpdaterTest.java | 10 ++++++---- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java index aff5ce5..1b567ac 100644 --- a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java +++ b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java @@ -34,8 +34,7 @@ public class UptimeStatusTest { uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); + assertTrue("History not for relay.", newUptimeHistory.isRelay()); assertEquals("History start millis not same as provided.", DateTimeHelper.parse("2013-12-20 00:00:00"), newUptimeHistory.getStartMillis()); @@ -55,8 +54,7 @@ public class UptimeStatusTest { uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); + assertTrue("History not for relay.", newUptimeHistory.isRelay()); assertEquals("History start millis not same as provided.", DateTimeHelper.parse("2013-12-20 00:00:00"), newUptimeHistory.getStartMillis()); @@ -84,8 +82,7 @@ public class UptimeStatusTest { uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); + assertTrue("History not for relay.", newUptimeHistory.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 17:00:00"), newUptimeHistory.getStartMillis()); @@ -128,8 +125,7 @@ public class UptimeStatusTest { 3, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); + assertTrue("History not for relay.", newUptimeHistory.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 16:00:00"), newUptimeHistory.getStartMillis()); @@ -150,8 +146,7 @@ public class UptimeStatusTest { 2, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); + assertTrue("History not for relay.", newUptimeHistory.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 17:00:00"), newUptimeHistory.getStartMillis()); @@ -176,8 +171,7 @@ public class UptimeStatusTest { 1, uptimeStatus.getRelayHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getRelayHistory().first(); - assertEquals("History not for relay.", true, - newUptimeHistory.isRelay()); + assertTrue("History not for relay.", newUptimeHistory.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 16:00:00"), newUptimeHistory.getStartMillis()); @@ -198,8 +192,7 @@ public class UptimeStatusTest { + "entry.", 1, uptimeStatus.getBridgeHistory().size()); UptimeHistory newUptimeHistory = uptimeStatus.getBridgeHistory().last(); - assertEquals("History not for bridge.", false, - newUptimeHistory.isRelay()); + assertFalse("History not for bridge.", newUptimeHistory.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 16:00:00"), newUptimeHistory.getStartMillis()); diff --git a/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java b/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java index 4797356..df6dd66 100644 --- a/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java +++ b/src/test/java/org/torproject/onionoo/updater/UptimeStatusUpdaterTest.java @@ -4,6 +4,8 @@ package org.torproject.onionoo.updater; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.torproject.onionoo.docs.DateTimeHelper; import org.torproject.onionoo.docs.DocumentStoreFactory; @@ -75,7 +77,7 @@ public class UptimeStatusUpdaterTest { UptimeHistory history = status.getRelayHistory().first(); assertEquals("History must contain one entry.", 1, status.getRelayHistory().size()); - assertEquals("History not for relay.", true, history.isRelay()); + assertTrue("History not for relay.", history.isRelay()); assertEquals("History start millis not as expected.", VALID_AFTER_SAMPLE, history.getStartMillis()); assertEquals("History uptime hours must be 1.", 1, @@ -111,7 +113,7 @@ public class UptimeStatusUpdaterTest { assertEquals("Relay history must contain one entry.", 1, status.getRelayHistory().size()); UptimeHistory history = status.getRelayHistory().first(); - assertEquals("History not for relay.", true, history.isRelay()); + assertTrue("History not for relay.", history.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 17:00:00"), history.getStartMillis()); @@ -151,7 +153,7 @@ public class UptimeStatusUpdaterTest { UptimeHistory history = status.getBridgeHistory().first(); assertEquals("Bridge history must contain one entry.", 1, status.getBridgeHistory().size()); - assertEquals("History not for bridge.", false, history.isRelay()); + assertFalse("History not for bridge.", history.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2014-03-21 20:00:00"), history.getStartMillis()); @@ -174,7 +176,7 @@ public class UptimeStatusUpdaterTest { assertEquals("Bridge history must contain one entry.", 1, status.getBridgeHistory().size()); UptimeHistory history = status.getBridgeHistory().last(); - assertEquals("History not for bridge.", false, history.isRelay()); + assertFalse("History not for bridge.", history.isRelay()); assertEquals("History start millis not as expected.", DateTimeHelper.parse("2013-07-22 17:00:00"), history.getStartMillis());

1 0

[onionoo/release] Replace Comparator with lambda.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit ec16e791150785cfda603961469bc86bd65218a7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 12:37:07 2018 +0200 Replace Comparator with lambda. --- .../org/torproject/onionoo/docs/WeightsStatus.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java index c221fdd..adce2c8 100644 --- a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java @@ -27,16 +27,14 @@ public class WeightsStatus extends Document { this.isDirty = false; } - private Comparator<long[]> histComparator = new Comparator<long[]>() { - public int compare(long[] first, long[] second) { - int relation = Long.compare(first[0], second[0]); - if (0 != relation) { - return relation; - } else { - return Long.compare(first[1], second[1]); - } - } - }; + private Comparator<long[]> histComparator = (first, second) -> { + int relation = Long.compare(first[0], second[0]); + if (0 != relation) { + return relation; + } else { + return Long.compare(first[1], second[1]); + } + }; private SortedMap<long[], double[]> history = new TreeMap<>(histComparator);

1 0

[onionoo/release] Avoid manual array copies.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit cc0ed7b085e68a8c196cd3596bb0997c11d7a4af Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:41:51 2018 +0200 Avoid manual array copies. --- src/main/java/org/torproject/onionoo/docs/UptimeHistory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index d549f92..3c7f61e 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -6,6 +6,7 @@ package org.torproject.onionoo.docs; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.Arrays; import java.util.SortedSet; import java.util.TreeSet; @@ -88,9 +89,7 @@ public class UptimeHistory implements Comparable<UptimeHistory> { SortedSet<String> flags = null; if (parts[0].equals("R")) { flags = new TreeSet<>(); - for (int i = 3; i < parts.length; i++) { - flags.add(parts[i]); - } + flags.addAll(Arrays.asList(parts).subList(3, parts.length)); } return new UptimeHistory(relay, startMillis, uptimeHours, flags); }

1 0

[onionoo/release] Simplify compareTo methods.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit f8ee7cf0ece963f35c311ed9e057271cdd5992bf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:22:37 2018 +0200 Simplify compareTo methods. --- src/main/java/org/torproject/onionoo/docs/ClientsHistory.java | 3 +-- src/main/java/org/torproject/onionoo/docs/UptimeHistory.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java index ba21458..15e70c5 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java @@ -194,8 +194,7 @@ public class ClientsHistory implements Comparable<ClientsHistory> { @Override public int compareTo(ClientsHistory other) { - return this.startMillis < other.startMillis ? -1 - : this.startMillis > other.startMillis ? 1 : 0; + return Long.compare(this.startMillis, other.startMillis); } @Override diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index f8cc116..d549f92 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -128,8 +128,7 @@ public class UptimeHistory implements Comparable<UptimeHistory> { } else if (!this.relay && other.relay) { return 1; } - return this.startMillis < other.startMillis ? -1 - : this.startMillis > other.startMillis ? 1 : 0; + return Long.compare(this.startMillis, other.startMillis); } @Override

1 0

[onionoo/release] Remove redundant cast.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 377c7666bb481d7c44ca568bf05420c3b77989f6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:54:53 2018 +0200 Remove redundant cast. --- .../java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java index 2915a04..2f322bd 100644 --- a/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java +++ b/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java @@ -94,7 +94,7 @@ public class UptimeDocumentWriterTest { assertEquals("Interval should be " + interval + " seconds.", interval, (int) history.getInterval()); assertEquals("Factor should be 1.0 / 999.0.", 1.0 / 999.0, - (double) history.getFactor(), 0.01); + history.getFactor(), 0.01); assertEquals("There should be " + count + " data points.", count, (int) history.getCount()); assertEquals("Count should be the same as the number of values.",

1 0

[onionoo/release] Collapse identical catch blocks.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit ad1ec28102596c5ac8fb19d4ea70963d00904fc5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:35:47 2018 +0200 Collapse identical catch blocks. --- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index c9dc13b..6efbb52 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -529,10 +529,7 @@ public class DocumentStore { try { result = documentType.newInstance(); result.setFromDocumentString(documentString); - } catch (InstantiationException e) { - /* Handle below. */ - log.error(e.getMessage(), e); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { /* Handle below. */ log.error(e.getMessage(), e); } @@ -566,10 +563,7 @@ public class DocumentStore { try { result = documentType.newInstance(); result.setDocumentString(documentString); - } catch (InstantiationException e) { - /* Handle below. */ - log.error(e.getMessage(), e); - } catch (IllegalAccessException e) { + } catch (InstantiationException | IllegalAccessException e) { /* Handle below. */ log.error(e.getMessage(), e); }

1 0

[onionoo/release] Use diamond operator.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 38bd70aecb7b6c0a1440a31ec0a5585b2a2c8ef4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:05:33 2018 +0200 Use diamond operator. --- .../org/torproject/onionoo/docs/DetailsDocument.java | 2 +- .../org/torproject/onionoo/docs/DetailsStatus.java | 2 +- .../java/org/torproject/onionoo/docs/NodeStatus.java | 2 +- .../org/torproject/onionoo/server/NodeIndexer.java | 20 ++++++++++---------- .../onionoo/updater/ClientsStatusUpdater.java | 2 +- .../torproject/onionoo/updater/DescriptorSource.java | 2 +- .../onionoo/updater/NodeDetailsStatusUpdater.java | 2 +- .../onionoo/updater/RdnsLookupRequest.java | 2 +- .../onionoo/updater/UptimeStatusUpdater.java | 4 ++-- .../torproject/onionoo/docs/DummyDocumentStore.java | 2 +- .../onionoo/server/ResourceServletTest.java | 10 +++++----- .../onionoo/updater/DummyDescriptorSource.java | 4 ++-- .../onionoo/updater/LookupServiceTest.java | 6 +++--- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java index 5e53d4c..504f0b5 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsDocument.java @@ -76,7 +76,7 @@ public class DetailsDocument extends Document { } public List<String> getExitAddresses() { - return this.exitAddresses == null ? new ArrayList<String>() + return this.exitAddresses == null ? new ArrayList<>() : this.exitAddresses; } diff --git a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java index 7cd87ee..31762d3 100644 --- a/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/DetailsStatus.java @@ -248,7 +248,7 @@ public class DetailsStatus extends Document { } public SortedSet<String> getOrAddressesAndPorts() { - return this.orAddressesAndPorts == null ? new TreeSet<String>() : + return this.orAddressesAndPorts == null ? new TreeSet<>() : this.orAddressesAndPorts; } diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index c0c6adf..bef403b 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -182,7 +182,7 @@ public class NodeStatus extends Document { } public SortedSet<String> getOrAddressesAndPorts() { - return this.orAddressesAndPorts == null ? new TreeSet<String>() + return this.orAddressesAndPorts == null ? new TreeSet<>() : this.orAddressesAndPorts; } diff --git a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java index 3812fea..350a3ef 100644 --- a/src/main/java/org/torproject/onionoo/server/NodeIndexer.java +++ b/src/main/java/org/torproject/onionoo/server/NodeIndexer.java @@ -211,7 +211,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { } if (!newRelaysByCountryCode.containsKey(countryCode)) { newRelaysByCountryCode.put(countryCode, - new HashSet<String>()); + new HashSet<>()); } newRelaysByCountryCode.get(countryCode).add(fingerprint); newRelaysByCountryCode.get(countryCode).add(hashedFingerprint); @@ -226,7 +226,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { asNumber = "AS0"; } if (!newRelaysByAsNumber.containsKey(asNumber)) { - newRelaysByAsNumber.put(asNumber, new HashSet<String>()); + newRelaysByAsNumber.put(asNumber, new HashSet<>()); } newRelaysByAsNumber.get(asNumber).add(fingerprint); newRelaysByAsNumber.get(asNumber).add(hashedFingerprint); @@ -239,7 +239,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { for (String flag : entry.getRelayFlags()) { String flagLowerCase = flag.toLowerCase(); if (!newRelaysByFlag.containsKey(flagLowerCase)) { - newRelaysByFlag.put(flagLowerCase, new HashSet<String>()); + newRelaysByFlag.put(flagLowerCase, new HashSet<>()); } newRelaysByFlag.get(flagLowerCase).add(fingerprint); newRelaysByFlag.get(flagLowerCase).add(hashedFingerprint); @@ -260,7 +260,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { - entry.getFirstSeenMillis()) / ONE_DAY); if (!newRelaysByFirstSeenDays.containsKey(daysSinceFirstSeen)) { newRelaysByFirstSeenDays.put(daysSinceFirstSeen, - new HashSet<String>()); + new HashSet<>()); } newRelaysByFirstSeenDays.get(daysSinceFirstSeen).add(fingerprint); newRelaysByFirstSeenDays.get(daysSinceFirstSeen).add( @@ -270,21 +270,21 @@ public class NodeIndexer implements ServletContextListener, Runnable { - entry.getLastSeenMillis()) / ONE_DAY); if (!newRelaysByLastSeenDays.containsKey(daysSinceLastSeen)) { newRelaysByLastSeenDays.put(daysSinceLastSeen, - new HashSet<String>()); + new HashSet<>()); } newRelaysByLastSeenDays.get(daysSinceLastSeen).add(fingerprint); newRelaysByLastSeenDays.get(daysSinceLastSeen).add( hashedFingerprint); String contact = entry.getContact(); if (!newRelaysByContact.containsKey(contact)) { - newRelaysByContact.put(contact, new HashSet<String>()); + newRelaysByContact.put(contact, new HashSet<>()); } newRelaysByContact.get(contact).add(fingerprint); newRelaysByContact.get(contact).add(hashedFingerprint); String version = entry.getVersion(); if (null != version) { if (!newRelaysByVersion.containsKey(version)) { - newRelaysByVersion.put(version, new HashSet<String>()); + newRelaysByVersion.put(version, new HashSet<>()); } newRelaysByVersion.get(version).add(fingerprint); newRelaysByVersion.get(version).add(hashedFingerprint); @@ -347,7 +347,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { for (String flag : entry.getRelayFlags()) { String flagLowerCase = flag.toLowerCase(); if (!newBridgesByFlag.containsKey(flagLowerCase)) { - newBridgesByFlag.put(flagLowerCase, new HashSet<String>()); + newBridgesByFlag.put(flagLowerCase, new HashSet<>()); } newBridgesByFlag.get(flagLowerCase).add(hashedFingerprint); newBridgesByFlag.get(flagLowerCase).add( @@ -358,7 +358,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { - entry.getFirstSeenMillis()) / ONE_DAY); if (!newBridgesByFirstSeenDays.containsKey(daysSinceFirstSeen)) { newBridgesByFirstSeenDays.put(daysSinceFirstSeen, - new HashSet<String>()); + new HashSet<>()); } newBridgesByFirstSeenDays.get(daysSinceFirstSeen).add( hashedFingerprint); @@ -369,7 +369,7 @@ public class NodeIndexer implements ServletContextListener, Runnable { - entry.getLastSeenMillis()) / ONE_DAY); if (!newBridgesByLastSeenDays.containsKey(daysSinceLastSeen)) { newBridgesByLastSeenDays.put(daysSinceLastSeen, - new HashSet<String>()); + new HashSet<>()); } newBridgesByLastSeenDays.get(daysSinceLastSeen).add( hashedFingerprint); diff --git a/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java index 0529dcf..8265f43 100644 --- a/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java @@ -116,7 +116,7 @@ public class ClientsStatusUpdater implements DescriptorListener, responsesByTransport, responsesByVersion); if (!this.newResponses.containsKey(hashedFingerprint)) { this.newResponses.put(hashedFingerprint, - new TreeSet<ClientsHistory>()); + new TreeSet<>()); } this.newResponses.get(hashedFingerprint).add( newResponseHistory); diff --git a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java index 20e249d..64bb0e4 100644 --- a/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java +++ b/src/main/java/org/torproject/onionoo/updater/DescriptorSource.java @@ -83,7 +83,7 @@ public class DescriptorSource { DescriptorType descriptorType) { if (!this.descriptorListeners.containsKey(descriptorType)) { this.descriptorListeners.put(descriptorType, - new HashSet<DescriptorListener>()); + new HashSet<>()); } this.descriptorListeners.get(descriptorType).add(listener); } diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 507d633..82cea1b 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -224,7 +224,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, continue; } if (!this.exitListEntries.containsKey(fingerprint)) { - this.exitListEntries.put(fingerprint, new HashMap<String, Long>()); + this.exitListEntries.put(fingerprint, new HashMap<>()); } String exitAddress = exitAddressScanMillis.getKey(); if (!this.exitListEntries.get(fingerprint).containsKey( diff --git a/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java b/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java index 380b62c..9f3c6cf 100644 --- a/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java +++ b/src/main/java/org/torproject/onionoo/updater/RdnsLookupRequest.java @@ -91,7 +91,7 @@ class RdnsLookupRequest extends Thread { envProps.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory"); final DirContext dnsContext = new InitialDirContext(envProps); - Set<String> results = new TreeSet<String>(); + Set<String> results = new TreeSet<>(); Attributes dnsEntries = dnsContext.getAttributes(hostName, new String[] { type }); if (dnsEntries != null) { diff --git a/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java index 8405bf8..338bf58 100644 --- a/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java @@ -105,7 +105,7 @@ public class UptimeStatusUpdater implements DescriptorListener, String fingerprint = entry.getFingerprint(); if (!this.newRunningRelays.containsKey(fingerprint)) { this.newRunningRelays.put(fingerprint, - new TreeMap<Long, Flags>()); + new TreeMap<>()); } this.newRunningRelays.get(fingerprint).put(dateHourMillis, new Flags(entry.getFlags())); @@ -125,7 +125,7 @@ public class UptimeStatusUpdater implements DescriptorListener, / DateTimeHelper.ONE_HOUR) * DateTimeHelper.ONE_HOUR; for (String fingerprint : fingerprints) { if (!this.newRunningBridges.containsKey(fingerprint)) { - this.newRunningBridges.put(fingerprint, new TreeSet<Long>()); + this.newRunningBridges.put(fingerprint, new TreeSet<>()); } this.newRunningBridges.get(fingerprint).add(dateHourMillis); } diff --git a/src/test/java/org/torproject/onionoo/docs/DummyDocumentStore.java b/src/test/java/org/torproject/onionoo/docs/DummyDocumentStore.java index 8827725..3c79235 100644 --- a/src/test/java/org/torproject/onionoo/docs/DummyDocumentStore.java +++ b/src/test/java/org/torproject/onionoo/docs/DummyDocumentStore.java @@ -20,7 +20,7 @@ public class DummyDocumentStore extends DocumentStore { private <T extends Document> SortedMap<String, Document> getStoredDocumentsByClass(Class<T> documentType) { if (!this.storedDocuments.containsKey(documentType)) { - this.storedDocuments.put(documentType, new TreeMap<String, Document>()); + this.storedDocuments.put(documentType, new TreeMap<>()); } return this.storedDocuments.get(documentType); } diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 0be1635..063f550 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -56,7 +56,7 @@ public class ResourceServletTest { this.requestUri = requestUri; this.queryString = queryString; this.parameterMap = parameterMap == null - ? new HashMap<String, String[]>() : parameterMap; + ? new HashMap<>() : parameterMap; } @Override @@ -162,8 +162,8 @@ public class ResourceServletTest { "Running", "V2Dir", "Valid" })), 1140L, "us", DateTimeHelper.parse("2013-04-16 18:00:00"), "AS7922", "comcast cable communications, llc", null, - new TreeSet<String>(Arrays.asList(new String[] { - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), + new TreeSet<>(Arrays.asList(new String[]{ + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A"})), new TreeSet<>(Arrays.asList(new String[] { "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, null, new TreeSet<>(Arrays.asList( @@ -182,7 +182,7 @@ public class ResourceServletTest { "liberty global operations b.v.", "1024d/51e2a1c7 \"steven j. murdoch\" " + "<tor+steven.murdoch(a)cl.cam.ac.uk> <fb-token:5sr_k_zs2wm=>", - new TreeSet<String>(), new TreeSet<String>(), "0.2.3.24-rc-dev", + new TreeSet<>(), new TreeSet<>(), "0.2.3.24-rc-dev", "windows xp", null, null, false); this.relays.put("0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", relayTimMayTribute); @@ -337,7 +337,7 @@ public class ResourceServletTest { String[] parameterParts = parameter.split("="); if (!parameterLists.containsKey(parameterParts[0])) { parameterLists.put(parameterParts[0], - new ArrayList<String>()); + new ArrayList<>()); } parameterLists.get(parameterParts[0]).add(parameterParts[1]); } diff --git a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java index c311b2b..c985090 100644 --- a/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java +++ b/src/test/java/org/torproject/onionoo/updater/DummyDescriptorSource.java @@ -32,7 +32,7 @@ public class DummyDescriptorSource extends DescriptorSource { private Set<Descriptor> getDescriptorsByType( DescriptorType descriptorType) { if (!this.descriptors.containsKey(descriptorType)) { - this.descriptors.put(descriptorType, new HashSet<Descriptor>()); + this.descriptors.put(descriptorType, new HashSet<>()); } return this.descriptors.get(descriptorType); } @@ -45,7 +45,7 @@ public class DummyDescriptorSource extends DescriptorSource { DescriptorType descriptorType) { if (!this.descriptorListeners.containsKey(descriptorType)) { this.descriptorListeners.put(descriptorType, - new HashSet<DescriptorListener>()); + new HashSet<>()); } this.descriptorListeners.get(descriptorType).add(listener); } diff --git a/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java b/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java index 6311316..743fe1d 100644 --- a/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java +++ b/src/test/java/org/torproject/onionoo/updater/LookupServiceTest.java @@ -234,19 +234,19 @@ public class LookupServiceTest { @Test() public void testLookupNoBlocksLines() { - this.assertLookupResult(new ArrayList<String>(), null, null, + this.assertLookupResult(new ArrayList<>(), null, null, "8.8.8.8", null, null, null, null, null, null, null, null); } @Test() public void testLookupNoLocationLines() { - this.assertLookupResult(null, new ArrayList<String>(), null, + this.assertLookupResult(null, new ArrayList<>(), null, "8.8.8.8", null, null, null, null, null, null, null, null); } @Test() public void testLookupNoGeoipAsNum2Lines() { - this.assertLookupResult(null, null, new ArrayList<String>(), + this.assertLookupResult(null, null, new ArrayList<>(), "8.8.8.8", null, null, null, null, null, null, null, null); }

1 0

[onionoo/release] Replace Collections.sort with List.sort.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 17f2c134fb199dcda021a61f754512ec8b06a353 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:24:54 2018 +0200 Replace Collections.sort with List.sort. --- src/main/java/org/torproject/onionoo/server/RequestHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/RequestHandler.java b/src/main/java/org/torproject/onionoo/server/RequestHandler.java index 33c35e1..81cd8dc 100644 --- a/src/main/java/org/torproject/onionoo/server/RequestHandler.java +++ b/src/main/java/org/torproject/onionoo/server/RequestHandler.java @@ -9,7 +9,6 @@ import org.torproject.onionoo.docs.SummaryDocument; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; @@ -661,8 +660,8 @@ public class RequestHandler { } Comparator<SummaryDocument> comparator = new SummaryDocumentComparator(this.order); - Collections.sort(uniqueRelays, comparator); - Collections.sort(uniqueBridges, comparator); + uniqueRelays.sort(comparator); + uniqueBridges.sort(comparator); this.orderedRelays.addAll(uniqueRelays); this.orderedBridges.addAll(uniqueBridges); }

1 0

[onionoo/release] Use chained String.append calls.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit c41454305d62f497d292d19ab933797bfde61310 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:50:23 2018 +0200 Use chained String.append calls. --- .../torproject/onionoo/docs/BandwidthStatus.java | 12 ++++---- .../torproject/onionoo/docs/ClientsHistory.java | 8 ++--- .../org/torproject/onionoo/docs/ClientsStatus.java | 2 +- .../org/torproject/onionoo/docs/DocumentStore.java | 36 ++++++++++++---------- .../org/torproject/onionoo/docs/UptimeHistory.java | 6 ++-- .../org/torproject/onionoo/docs/UptimeStatus.java | 4 +-- .../org/torproject/onionoo/docs/WeightsStatus.java | 4 +-- .../onionoo/server/IntegerDistribution.java | 9 +++--- .../onionoo/server/MostFrequentString.java | 4 +-- .../torproject/onionoo/server/ResponseBuilder.java | 4 +-- .../onionoo/updater/ClientsStatusUpdater.java | 12 ++++---- .../torproject/onionoo/updater/LookupService.java | 8 ++--- .../onionoo/updater/NodeDetailsStatusUpdater.java | 8 ++--- .../onionoo/updater/ReverseDomainNameResolver.java | 30 +++++++++--------- .../onionoo/updater/UptimeStatusUpdater.java | 18 +++++------ .../onionoo/writer/ClientsDocumentWriter.java | 4 +-- .../onionoo/writer/SummaryDocumentWriter.java | 8 ++--- .../onionoo/writer/UptimeDocumentWriter.java | 4 +-- 18 files changed, 92 insertions(+), 89 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java b/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java index 252a018..20e2e27 100644 --- a/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/BandwidthStatus.java @@ -171,14 +171,14 @@ public class BandwidthStatus extends Document { public String toDocumentString() { StringBuilder sb = new StringBuilder(); for (long[] v : writeHistory.values()) { - sb.append("w " + DateTimeHelper.format(v[0]) + " " - + DateTimeHelper.format(v[1]) + " " + String.valueOf(v[2]) - + "\n"); + sb.append("w ").append(DateTimeHelper.format(v[0])).append(" ") + .append(DateTimeHelper.format(v[1])).append(" ") + .append(String.valueOf(v[2])).append("\n"); } for (long[] v : readHistory.values()) { - sb.append("r " + DateTimeHelper.format(v[0]) + " " - + DateTimeHelper.format(v[1]) + " " + String.valueOf(v[2]) - + "\n"); + sb.append("r ").append(DateTimeHelper.format(v[0])).append(" ") + .append(DateTimeHelper.format(v[1])).append(" ") + .append(String.valueOf(v[2])).append("\n"); } return sb.toString(); } diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java index 15e70c5..58e86e4 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java @@ -142,8 +142,8 @@ public class ClientsHistory implements Comparable<ClientsHistory> { public String toString() { StringBuilder sb = new StringBuilder(); sb.append(DateTimeHelper.format(startMillis)); - sb.append(" " + DateTimeHelper.format(endMillis)); - sb.append(" " + String.format("%.3f", this.totalResponses)); + sb.append(" ").append(DateTimeHelper.format(endMillis)); + sb.append(" ").append(String.format("%.3f", this.totalResponses)); this.appendResponses(sb, this.responsesByCountry); this.appendResponses(sb, this.responsesByTransport); this.appendResponses(sb, this.responsesByVersion); @@ -155,8 +155,8 @@ public class ClientsHistory implements Comparable<ClientsHistory> { sb.append(" "); int written = 0; for (Map.Entry<String, Double> e : responses.entrySet()) { - sb.append((written++ > 0 ? "," : "") + e.getKey() + "=" - + String.format("%.3f", e.getValue())); + sb.append(written++ > 0 ? "," : "").append(e.getKey()).append("=") + .append(String.format("%.3f", e.getValue())); } } diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java b/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java index 2e11b50..21a76e1 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsStatus.java @@ -111,7 +111,7 @@ public class ClientsStatus extends Document { public String toDocumentString() { StringBuilder sb = new StringBuilder(); for (ClientsHistory interval : this.history) { - sb.append(interval.toString() + "\n"); + sb.append(interval.toString()).append("\n"); } return sb.toString(); } diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index 6efbb52..af67d91 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -737,7 +737,7 @@ public class DocumentStore { for (NodeStatus relay : cachedRelays.values()) { String line = relay.toString(); if (line != null) { - sb.append(line + "\n"); + sb.append(line).append("\n"); } else { log.error("Could not serialize relay node status '" + relay.getFingerprint() + "'"); @@ -746,7 +746,7 @@ public class DocumentStore { for (NodeStatus bridge : cachedBridges.values()) { String line = bridge.toString(); if (line != null) { - sb.append(line + "\n"); + sb.append(line).append("\n"); } else { log.error("Could not serialize bridge node status '" + bridge.getFingerprint() + "'"); @@ -789,7 +789,7 @@ public class DocumentStore { line = null; } if (line != null) { - sb.append(line + "\n"); + sb.append(line).append("\n"); } else { log.error("Could not serialize relay summary document '" + summaryDocument.getFingerprint() + "'"); @@ -823,20 +823,22 @@ public class DocumentStore { /** Returns a string with statistics on document storage operations. */ public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber(listOperations) - + " list operations performed\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber(listedFiles) - + " files listed\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber(storedFiles) - + " files stored\n"); - sb.append(" " + FormattingUtils.formatBytes(storedBytes) - + " stored\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber(retrievedFiles) - + " files retrieved\n"); - sb.append(" " + FormattingUtils.formatBytes(retrievedBytes) - + " retrieved\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber(removedFiles) - + " files removed\n"); + sb.append(" ") + .append(FormattingUtils.formatDecimalNumber(listOperations)) + .append(" list operations performed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber(listedFiles)) + .append(" files listed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber(storedFiles)) + .append(" files stored\n"); + sb.append(" ").append(FormattingUtils.formatBytes(storedBytes)) + .append(" stored\n"); + sb.append(" ") + .append(FormattingUtils.formatDecimalNumber(retrievedFiles)) + .append(" files retrieved\n"); + sb.append(" ").append(FormattingUtils.formatBytes(retrievedBytes)) + .append(" retrieved\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber(removedFiles)) + .append(" files removed\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index 3c7f61e..8ddfc2b 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -98,12 +98,12 @@ public class UptimeHistory implements Comparable<UptimeHistory> { public String toString() { StringBuilder sb = new StringBuilder(); sb.append(this.relay ? (this.flags == null ? "r" : "R") : "b"); - sb.append(" " + DateTimeHelper.format(this.startMillis, + sb.append(" ").append(DateTimeHelper.format(this.startMillis, DateTimeHelper.DATEHOUR_NOSPACE_FORMAT)); - sb.append(" " + String.format("%d", this.uptimeHours)); + sb.append(" ").append(String.format("%d", this.uptimeHours)); if (this.flags != null) { for (String flag : this.flags) { - sb.append(" " + flag); + sb.append(" ").append(flag); } } return sb.toString(); diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeStatus.java b/src/main/java/org/torproject/onionoo/docs/UptimeStatus.java index 87ee962..bec5028 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeStatus.java @@ -143,10 +143,10 @@ public class UptimeStatus extends Document { public String toDocumentString() { StringBuilder sb = new StringBuilder(); for (UptimeHistory interval : this.relayHistory) { - sb.append(interval.toString() + "\n"); + sb.append(interval.toString()).append("\n"); } for (UptimeHistory interval : this.bridgeHistory) { - sb.append(interval.toString() + "\n"); + sb.append(interval.toString()).append("\n"); } return sb.toString(); } diff --git a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java index adce2c8..f3b5452 100644 --- a/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/WeightsStatus.java @@ -201,8 +201,8 @@ public class WeightsStatus extends Document { for (Map.Entry<long[], double[]> e : history.entrySet()) { long[] fresh = e.getKey(); double[] weights = e.getValue(); - sb.append(DateTimeHelper.format(fresh[0]) + " " - + DateTimeHelper.format(fresh[1])); + sb.append(DateTimeHelper.format(fresh[0])).append(" ") + .append(DateTimeHelper.format(fresh[1])); for (int i = 0; i < weights.length; i++) { sb.append(" "); if (i != 0 && i != 5 && !Double.valueOf(weights[i]).isNaN()) { diff --git a/src/main/java/org/torproject/onionoo/server/IntegerDistribution.java b/src/main/java/org/torproject/onionoo/server/IntegerDistribution.java index 19862a0..6c1f84d 100644 --- a/src/main/java/org/torproject/onionoo/server/IntegerDistribution.java +++ b/src/main/java/org/torproject/onionoo/server/IntegerDistribution.java @@ -27,9 +27,9 @@ class IntegerDistribution { seenValues += logValues[i]; while (j < permilles.length && (seenValues * 1000 > totalValues * permilles[j])) { - sb.append((j > 0 ? ", " : "") + "." + permilles[j] - + (i < logValues.length - 1 ? "<" + (1L << i) - : ">=" + (1L << i - 1))); + sb.append(j > 0 ? ", " : "").append(".").append(permilles[j]) + .append(i < logValues.length - 1 ? "<" + (1L << i) + : ">=" + (1L << i - 1)); j++; } if (j == permilles.length) { @@ -38,7 +38,8 @@ class IntegerDistribution { } } else { for (int j = 0; j < permilles.length; j++) { - sb.append((j > 0 ? ", " : "") + "." + permilles[j] + "<null"); + sb.append(j > 0 ? ", " : "").append(".").append(permilles[j]) + .append("<null"); } } return sb.toString(); diff --git a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java index c677bb5..dc9bb02 100644 --- a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java +++ b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java @@ -48,8 +48,8 @@ class MostFrequentString { sortedFrequencies.entrySet()) { for (String string : e.getValue()) { if (stringsToAdd-- > 0) { - sb.append((written++ > 0 ? ", " : "") + string + " (" - + e.getKey() + ")"); + sb.append(written++ > 0 ? ", " : "").append(string).append(" (") + .append(e.getKey()).append(")"); } else { remainingStrings.add(string); } diff --git a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java index 8b350b0..3d8a76f 100644 --- a/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/onionoo/server/ResponseBuilder.java @@ -217,8 +217,8 @@ public class ResponseBuilder { StringBuilder addressesBuilder = new StringBuilder(); int written = 0; for (String address : addresses) { - addressesBuilder.append((written++ > 0 ? "," : "") + "\"" - + address.toLowerCase() + "\""); + addressesBuilder.append(written++ > 0 ? "," : "").append("\"") + .append(address.toLowerCase()).append("\""); } return String.format("{\"n\":\"%s\",\"f\":\"%s\",\"a\":[%s],\"r\":%s}", nickname, fingerprint, addressesBuilder.toString(), running); diff --git a/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java index 8265f43..205e391 100644 --- a/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/ClientsStatusUpdater.java @@ -177,12 +177,12 @@ public class ClientsStatusUpdater implements DescriptorListener, newIntervals += hist.size(); } StringBuilder sb = new StringBuilder(); - sb.append(" " - + FormattingUtils.formatDecimalNumber(newIntervals / 2) - + " client statistics processed from extra-info descriptors\n"); - sb.append(" " - + FormattingUtils.formatDecimalNumber(this.newResponses.size()) - + " client status files updated\n"); + sb.append(" ") + .append(FormattingUtils.formatDecimalNumber(newIntervals / 2)) + .append(" client statistics processed from extra-info descriptors\n"); + sb.append(" ") + .append(FormattingUtils.formatDecimalNumber(this.newResponses.size())) + .append(" client status files updated\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/updater/LookupService.java b/src/main/java/org/torproject/onionoo/updater/LookupService.java index 4af4443..9c07e68 100644 --- a/src/main/java/org/torproject/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/onionoo/updater/LookupService.java @@ -366,10 +366,10 @@ public class LookupService { * resolved. */ public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - addressesLookedUp) + " addresses looked up\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - addressesResolved) + " addresses resolved\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + addressesLookedUp)).append(" addresses looked up\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + addressesResolved)).append(" addresses resolved\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 82cea1b..054ccf5 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -958,10 +958,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, @Override public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - relayConsensusesProcessed) + " relay consensuses processed\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - bridgeStatusesProcessed) + " bridge statuses processed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + relayConsensusesProcessed)).append(" relay consensuses processed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + bridgeStatusesProcessed)).append(" bridge statuses processed\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java b/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java index d46d6b5..6d48135 100644 --- a/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java +++ b/src/main/java/org/torproject/onionoo/updater/ReverseDomainNameResolver.java @@ -104,23 +104,23 @@ public class ReverseDomainNameResolver { * lookups and some simple statistics on lookup time. */ public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - rdnsLookupMillis.size()) + " lookups performed\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - rdnsVerifiedLookupResults.size()) + " verified results found\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - rdnsUnverifiedLookupResults.size()) - + " unverified results found\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + rdnsLookupMillis.size())).append(" lookups performed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + rdnsVerifiedLookupResults.size())).append(" verified results found\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + rdnsUnverifiedLookupResults.size())) + .append(" unverified results found\n"); if (!rdnsLookupMillis.isEmpty()) { Collections.sort(rdnsLookupMillis); - sb.append(" " + FormattingUtils.formatMillis( - rdnsLookupMillis.get(0)) + " minimum lookup time\n"); - sb.append(" " + FormattingUtils.formatMillis( - rdnsLookupMillis.get(rdnsLookupMillis.size() / 2)) - + " median lookup time\n"); - sb.append(" " + FormattingUtils.formatMillis( - rdnsLookupMillis.get(rdnsLookupMillis.size() - 1)) - + " maximum lookup time\n"); + sb.append(" ").append(FormattingUtils.formatMillis( + rdnsLookupMillis.get(0))).append(" minimum lookup time\n"); + sb.append(" ").append(FormattingUtils.formatMillis( + rdnsLookupMillis.get(rdnsLookupMillis.size() / 2))) + .append(" median lookup time\n"); + sb.append(" ").append(FormattingUtils.formatMillis( + rdnsLookupMillis.get(rdnsLookupMillis.size() - 1))) + .append(" maximum lookup time\n"); } return sb.toString(); } diff --git a/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java index 338bf58..f1ff574 100644 --- a/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/UptimeStatusUpdater.java @@ -182,15 +182,15 @@ public class UptimeStatusUpdater implements DescriptorListener, @Override public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.newRelayStatuses.size()) + " hours of relay uptimes " - + "processed\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.newBridgeStatuses.size()) + " hours of bridge uptimes " - + "processed\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.newRunningRelays.size() + this.newRunningBridges.size()) - + " uptime status files updated\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.newRelayStatuses.size())).append(" hours of relay uptimes ") + .append("processed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.newBridgeStatuses.size())).append(" hours of bridge uptimes ") + .append("processed\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.newRunningRelays.size() + this.newRunningBridges.size())) + .append(" uptime status files updated\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java index de63893..2bf1862 100644 --- a/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java @@ -120,8 +120,8 @@ public class ClientsDocumentWriter implements DocumentWriter { @Override public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.writtenDocuments) + " clients document files updated\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.writtenDocuments)).append(" clients document files updated\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java index 5063026..3fb8312 100644 --- a/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/SummaryDocumentWriter.java @@ -114,10 +114,10 @@ public class SummaryDocumentWriter implements DocumentWriter { @Override public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.writtenDocuments) + " summary document files written\n"); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.deletedDocuments) + " summary document files deleted\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.writtenDocuments)).append(" summary document files written\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.deletedDocuments)).append(" summary document files deleted\n"); return sb.toString(); } } diff --git a/src/main/java/org/torproject/onionoo/writer/UptimeDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/UptimeDocumentWriter.java index 22b7ba5..73e8dee 100644 --- a/src/main/java/org/torproject/onionoo/writer/UptimeDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/UptimeDocumentWriter.java @@ -239,8 +239,8 @@ public class UptimeDocumentWriter implements DocumentWriter { @Override public String getStatsString() { StringBuilder sb = new StringBuilder(); - sb.append(" " + FormattingUtils.formatDecimalNumber( - this.writtenDocuments) + " uptime document files written\n"); + sb.append(" ").append(FormattingUtils.formatDecimalNumber( + this.writtenDocuments)).append(" uptime document files written\n"); return sb.toString(); } }

1 0

[onionoo/master] Remove the "fingerprint" parameter.
by karsten＠torproject.org 10 Sep '18

10 Sep '18

commit 4029f0fc2e3c5f83476fcb93d9d2d7b0f2dbf693 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 4 20:28:52 2018 +0200 Remove the "fingerprint" parameter. This commit actually only disables the "fingerprint" parameter. Even though we gave people a 1 month warning, it might happen that somebody comes along next week and tells us their truly important use case why they still need this parameter. Once we're really sure this won't happen, we can rip out some more code that was necessary to implement this parameter. Implements #26919. --- CHANGELOG.md | 1 + .../torproject/onionoo/server/ResourceServlet.java | 2 +- .../onionoo/server/ResourceServletTest.java | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79d7a9b..34ec5b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ documents. - Change "3_months" graphs to "6_months" graphs in all documents containing history objects. + - Remove the "fingerprint" parameter. # Changes in version 6.2-1.17.1 - 2018-08-17 diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 22077ae..92c6635 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -68,7 +68,7 @@ public class ResourceServlet extends HttpServlet { private static final long CACHE_INTERVAL = 5L * 60L * 1000L; private static Set<String> knownParameters = new HashSet<>( - Arrays.asList("type", "running", "search", "lookup", "fingerprint", + Arrays.asList("type", "running", "search", "lookup", "country", "as", "as_name", "flag", "first_seen_days", "last_seen_days", "contact", "order", "limit", "offset", "fields", "family", "version", "os", "host_name", "recommended_version")); diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 921d6e4..5ed4d11 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -1056,37 +1056,37 @@ public class ResourceServletTest { @Test(timeout = 100) public void testFingerprintRelayFingerprint() { - this.assertSummaryDocument( + this.assertErrorStatusCode( "/summary?fingerprint=000C5F55BD4814B917CC474BD537F1A3B33CCE2A", - 1, new String[] { "TorkaZ" }, 0, null); + 400); } @Test(timeout = 100) public void testFingerprintRelayHashedFingerprint() { - this.assertSummaryDocument( + this.assertErrorStatusCode( "/summary?fingerprint=4aa14c08d62913e0057a9ad5863b458c0ce94cee", - 0, null, 0, null); + 400); } @Test(timeout = 100) public void testFingerprintBridgeHashedFingerprint() { - this.assertSummaryDocument( + this.assertErrorStatusCode( "/summary?fingerprint=1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", - 0, null, 1, new String[] { "gummy" }); + 400); } @Test(timeout = 100) public void testFingerprintBridgeHashedHashedFingerprint() { - this.assertSummaryDocument( + this.assertErrorStatusCode( "/summary?fingerprint=CE52F898DB3678BCE33FAC28C92774DE90D618B5", - 0, null, 0, null); + 400); } @Test(timeout = 100) public void testFingerprintBridgeOriginalFingerprint() { - this.assertSummaryDocument( + this.assertErrorStatusCode( "/summary?fingerprint=0010D49C6DA1E46A316563099F41BFE40B6C7183", - 0, null, 0, null); + 400); } @Test(timeout = 100)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2018