November 2019 - tor-commits - lists.torproject.org

[onionoo/release] Remove deprecation warning.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit afe4045b50330bf0c65eeae393eeefebfa191817 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:16:03 2019 +0100 Remove deprecation warning. Class#newInstance is deprecated in Java 9 and higher, which doesn't affect us yet in Java 8. But the suggested replacement already works in Java 8, so that we can safely switch to that. --- .../java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 778bab9..2963db2 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -524,9 +524,9 @@ public class DocumentStore { Class<T> documentType, String documentString) { T result = null; try { - result = documentType.newInstance(); + result = documentType.getDeclaredConstructor().newInstance(); result.setFromDocumentString(documentString); - } catch (InstantiationException | IllegalAccessException e) { + } catch (ReflectiveOperationException e) { /* Handle below. */ log.error(e.getMessage(), e); } @@ -558,9 +558,9 @@ public class DocumentStore { Class<T> documentType, String documentString) { T result = null; try { - result = documentType.newInstance(); + result = documentType.getDeclaredConstructor().newInstance(); result.setDocumentString(documentString); - } catch (InstantiationException | IllegalAccessException e) { + } catch (ReflectiveOperationException e) { /* Handle below. */ log.error(e.getMessage(), e); }

1 0

[onionoo/release] Use StandardCharsets.US_ASCII instead of "US-ASCII".
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit 4521ad33ba8a7eddfc3ee999aeb1bb46ef0fd859 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:14:53 2019 +0100 Use StandardCharsets.US_ASCII instead of "US-ASCII". --- src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 2963db2..78c0baa 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -20,6 +20,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -482,7 +483,7 @@ public class DocumentStore { /* Document file is empty. */ return null; } - documentString = new String(allData, "US-ASCII"); + documentString = new String(allData, StandardCharsets.US_ASCII); this.retrievedFiles++; this.retrievedBytes += documentString.length(); } catch (IOException e) { @@ -765,7 +766,7 @@ public class DocumentStore { throws IOException { try (BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(file))) { - bos.write(content.getBytes("US-ASCII")); + bos.write(content.getBytes(StandardCharsets.US_ASCII)); } }

1 0

[onionoo/release] Avoid unnecessary conversions to String.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit 09765ef24569d72666843440ae2a7225c2b38ac5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:17:56 2019 +0100 Avoid unnecessary conversions to String. --- .../java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java | 4 ++-- src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java | 4 ++-- .../java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java | 3 +-- .../java/org/torproject/metrics/onionoo/updater/LookupService.java | 2 +- .../org/torproject/metrics/onionoo/server/ResourceServletTest.java | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java index 6466b63..c9eddf1 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/BandwidthStatus.java @@ -173,12 +173,12 @@ public class BandwidthStatus extends Document { for (long[] v : writeHistory.values()) { sb.append("w ").append(DateTimeHelper.format(v[0])).append(" ") .append(DateTimeHelper.format(v[1])).append(" ") - .append(String.valueOf(v[2])).append("\n"); + .append(v[2]).append("\n"); } for (long[] v : readHistory.values()) { sb.append("r ").append(DateTimeHelper.format(v[0])).append(" ") .append(DateTimeHelper.format(v[1])).append(" ") - .append(String.valueOf(v[2])).append("\n"); + .append(v[2]).append("\n"); } return sb.toString(); } diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java index 826db9e..1294bd5 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/NodeStatus.java @@ -724,11 +724,11 @@ public class NodeStatus extends Document { sb.append("\t").append(this.dirPort).append("\t"); sb.append(StringUtils.join(this.getRelayFlags(), ",")); if (this.isRelay) { - sb.append("\t").append(String.valueOf(this.consensusWeight)); + sb.append("\t").append(this.consensusWeight); sb.append("\t") .append((this.countryCode != null ? this.countryCode : "??")); sb.append("\t"); /* formerly used for storing host names */ - sb.append("\t").append(String.valueOf(this.lastRdnsLookup)); + sb.append("\t").append(this.lastRdnsLookup); sb.append("\t").append((this.defaultPolicy != null ? this.defaultPolicy : "null")); sb.append("\t").append((this.portList != null ? this.portList : "null")); diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java index 6cae37e..c609b2a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/DescriptorQueue.java @@ -124,8 +124,7 @@ class DescriptorQueue { for (Map.Entry<String, Long> e : excludedAndParsedFiles.entrySet()) { String absolutePath = e.getKey(); long lastModifiedMillis = e.getValue(); - bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath - + "\n"); + bw.write(lastModifiedMillis + " " + absolutePath + "\n"); } } catch (IOException e) { log.error("Could not write history file '{}'. Not excluding descriptors " diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 947c78c..63fcaa8 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -248,7 +248,7 @@ public class LookupService { this.geoLite2AsnBlocksIpv4CsvFile.getAbsolutePath()); return lookupResults; } - String asNumber = "AS" + String.valueOf(Integer.parseInt(parts[1])); + String asNumber = "AS" + Integer.parseInt(parts[1]); String asName = parts[2]; while (firstAddressNumber < startIpNum && firstAddressNumber != -1L) { diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 7df56ea..9224620 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -1358,7 +1358,7 @@ public class ResourceServletTest { @Test(timeout = 100) public void testFirstSeenDaysMaxInt() { this.assertSummaryDocument( - "/summary?last_seen_days=" + String.valueOf(Integer.MAX_VALUE), 0, + "/summary?last_seen_days=" + Integer.MAX_VALUE, 0, null, 0, null); } @@ -1366,7 +1366,7 @@ public class ResourceServletTest { public void testFirstSeenDaysMaxIntPlusOne() { this.assertErrorStatusCode( "/summary?first_seen_days=" - + String.valueOf(((long) Integer.MAX_VALUE) + 1L), 400); + + (((long) Integer.MAX_VALUE) + 1L), 400); } @Test(timeout = 100)

1 0

[onionoo/release] Make inner classes static.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit bc0f0a6451372726fe4a018b7cecaf95c0f03709 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:19:53 2019 +0100 Make inner classes static. --- .../org/torproject/metrics/onionoo/server/ResourceServletTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 9224620..ac3f107 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -45,7 +45,7 @@ public class ResourceServletTest { private static long TEST_TIME = DateTimeHelper.parse("2013-04-24 12:22:22"); - private class TestingHttpServletRequestWrapper + private static class TestingHttpServletRequestWrapper extends HttpServletRequestWrapper { private String requestUri; private String queryString; @@ -78,7 +78,7 @@ public class ResourceServletTest { } } - private class TestingHttpServletResponseWrapper extends + private static class TestingHttpServletResponseWrapper extends HttpServletResponseWrapper { private TestingHttpServletResponseWrapper() {

1 0

[onionoo/release] Remove disappearing family members.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit 941ffd691b7ddaa7d4ae692746f056bcabdfc1d7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 10:59:13 2019 +0100 Remove disappearing family members. When a relay stops writing any family members into its server descriptor we never cleared old family members but kept them forever. We should do that. Fixes #28314. --- CHANGELOG.md | 7 +++++++ .../metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5c4c38..dc93ec6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 7.0-1.2?.? - 2019-1?-?? + + * Medium changes + - Remove declared/alleged family members after they disappear from + server descriptors. + + # Changes in version 7.0-1.21.1 - 2019-11-09 * Minor changes diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index a5f16e4..b25459d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -172,8 +172,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setExitPolicy(descriptor.getExitPolicyLines()); detailsStatus.setContact(descriptor.getContact()); detailsStatus.setPlatform(descriptor.getPlatform()); + SortedSet<String> declaredFamily = new TreeSet<>(); if (descriptor.getFamilyEntries() != null) { - SortedSet<String> declaredFamily = new TreeSet<>(); for (String familyMember : descriptor.getFamilyEntries()) { if (familyMember.startsWith("$") && familyMember.length() >= 41) { declaredFamily.add( @@ -182,8 +182,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, declaredFamily.add(familyMember); } } - this.declaredFamilies.put(fingerprint, declaredFamily); } + this.declaredFamilies.put(fingerprint, declaredFamily); if (descriptor.getIpv6DefaultPolicy() != null && (descriptor.getIpv6DefaultPolicy().equals("accept") || descriptor.getIpv6DefaultPolicy().equals("reject"))

1 0

[onionoo/release] Remove redundant local variable.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit e27191a0a735558d4d261934b1be8b4fe51089a6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:16:01 2019 +0100 Remove redundant local variable. --- src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 9489cba..81b428a 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -449,13 +449,12 @@ public class DocumentStore { SortedSet<String> verifiedHostNames = null; SortedSet<String> unverifiedHostNames = null; Boolean recommendedVersion = null; - SummaryDocument summaryDocument = new SummaryDocument(isRelay, + return new SummaryDocument(isRelay, nickname, fingerprint, addresses, lastSeenMillis, running, relayFlags, consensusWeight, countryCode, firstSeenMillis, asNumber, asName, contact, family, family, version, operatingSystem, verifiedHostNames, unverifiedHostNames, recommendedVersion); - return summaryDocument; } private <T extends Document> T retrieveDocumentFile(

1 0

[onionoo/release] Avoid unnecessary cast.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit 5ad9518d8b31a84bbf125d0c7256767d027664ce Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:20:10 2019 +0100 Avoid unnecessary cast. --- .../org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java index c9daf92..fdaa39c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java @@ -83,7 +83,7 @@ public class ClientsStatusUpdater implements DescriptorListener, * include in a clients document. */ return; } - double okResponses = (double) (responses.get("ok") - 4); + double okResponses = responses.get("ok") - 4; if (okResponses < 0.0) { /* Response numbers are not supposed to be negative. Skipping. */ return;

1 0

[onionoo/release] Simplify getStatsString methods.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit f0530196ab111ebad5862561b6617346fb52a256 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:36:18 2019 +0100 Simplify getStatsString methods. --- .../metrics/onionoo/docs/DocumentStore.java | 32 ++++++++++------------ .../onionoo/updater/ClientsStatusUpdater.java | 13 ++++----- .../metrics/onionoo/updater/LookupService.java | 11 ++++---- .../onionoo/updater/NodeDetailsStatusUpdater.java | 10 +++---- .../onionoo/updater/UptimeStatusUpdater.java | 18 +++++------- .../onionoo/writer/ClientsDocumentWriter.java | 6 ++-- .../onionoo/writer/SummaryDocumentWriter.java | 10 +++---- .../onionoo/writer/UptimeDocumentWriter.java | 6 ++-- 8 files changed, 43 insertions(+), 63 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java index 78c0baa..9489cba 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/DocumentStore.java @@ -817,24 +817,20 @@ public class DocumentStore { /** Returns a string with statistics on document storage operations. */ public String getStatsString() { - StringBuilder sb = new StringBuilder(); - 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(); + return String.format(" %s list operations performed\n" + + " %s files listed\n" + + " %s files stored\n" + + " %s stored\n" + + " %s files retrieved\n" + + " %s retrieved\n" + + " %s files removed\n", + FormattingUtils.formatDecimalNumber(listOperations), + FormattingUtils.formatDecimalNumber(listedFiles), + FormattingUtils.formatDecimalNumber(storedFiles), + FormattingUtils.formatBytes(storedBytes), + FormattingUtils.formatDecimalNumber(retrievedFiles), + FormattingUtils.formatBytes(retrievedBytes), + FormattingUtils.formatDecimalNumber(removedFiles)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java index fdaa39c..07dfb85 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/ClientsStatusUpdater.java @@ -172,14 +172,11 @@ public class ClientsStatusUpdater implements DescriptorListener, for (SortedSet<ClientsHistory> hist : this.newResponses.values()) { newIntervals += hist.size(); } - StringBuilder sb = new StringBuilder(); - 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(); + return String.format( + " %s client statistics processed from extra-info descriptors\n" + + " %s client status files updated\n", + FormattingUtils.formatDecimalNumber(newIntervals / 2), + FormattingUtils.formatDecimalNumber(this.newResponses.size())); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java index 63fcaa8..9e97487 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/LookupService.java @@ -358,12 +358,11 @@ public class LookupService { /** Returns a string with the number of addresses looked up and * resolved. */ public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - addressesLookedUp)).append(" addresses looked up\n"); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - addressesResolved)).append(" addresses resolved\n"); - return sb.toString(); + return String.format( + " %s addresses looked up\n" + + " %s addresses resolved\n", + FormattingUtils.formatDecimalNumber(addressesLookedUp), + FormattingUtils.formatDecimalNumber(addressesResolved)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index b25459d..9718202 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -951,12 +951,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - 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(); + return String.format(" %s relay consensuses processed\n" + + " %s bridge statuses processed\n", + FormattingUtils.formatDecimalNumber(relayConsensusesProcessed), + FormattingUtils.formatDecimalNumber(bridgeStatusesProcessed)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java index 584d24d..1f9f960 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/UptimeStatusUpdater.java @@ -176,17 +176,13 @@ public class UptimeStatusUpdater implements DescriptorListener, @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - 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(); + return String.format(" %s hours of relay uptimes processed\n" + + " %s hours of bridge uptimes processed\n" + + " %s uptime status files updated\n", + FormattingUtils.formatDecimalNumber(this.newRelayStatuses.size()), + FormattingUtils.formatDecimalNumber(this.newBridgeStatuses.size()), + FormattingUtils.formatDecimalNumber( + this.newRunningRelays.size() + this.newRunningBridges.size())); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java index b1406ac..e253d22 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/ClientsDocumentWriter.java @@ -113,10 +113,8 @@ public class ClientsDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.writtenDocuments)).append(" clients document files updated\n"); - return sb.toString(); + return String.format(" %s clients document files updated\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java index 0103c31..997fe40 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java @@ -113,12 +113,10 @@ public class SummaryDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - 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(); + return String.format(" %s summary document files written\n" + + " %s summary document files deleted\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments), + FormattingUtils.formatDecimalNumber(this.deletedDocuments)); } } diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java index fc9b08a..e2a0f63 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/UptimeDocumentWriter.java @@ -238,10 +238,8 @@ public class UptimeDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - StringBuilder sb = new StringBuilder(); - sb.append(" ").append(FormattingUtils.formatDecimalNumber( - this.writtenDocuments)).append(" uptime document files written\n"); - return sb.toString(); + return String.format(" %s uptime document files written\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments)); } }

1 0

[onionoo/release] Simplify comparison of Tor versions.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit dd58e89756efe94571b49b74a0f231c5c4323597 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 15:17:51 2019 +0100 Simplify comparison of Tor versions. --- src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java index fc25811..bba490c 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/TorVersion.java @@ -114,8 +114,8 @@ public class TorVersion implements Comparable<TorVersion> { } for (int position = 0; position < this.versionNumbers.size() && position < other.versionNumbers.size(); position++) { - if ((Integer.compare(this.versionNumbers.get(position), - other.versionNumbers.get(position))) != 0) { + if (!this.versionNumbers.get(position).equals( + other.versionNumbers.get(position))) { return false; } }

1 0

[onionoo/release] Fix indentation.
by karsten＠torproject.org 28 Nov '19

28 Nov '19

commit 6f6f39018ca40b1a819161db3d684edf09288d47 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 20:25:37 2019 +0100 Fix indentation. --- .../torproject/metrics/onionoo/writer/SummaryDocumentWriter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java index 997fe40..1c79c20 100644 --- a/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java +++ b/src/main/java/org/torproject/metrics/onionoo/writer/SummaryDocumentWriter.java @@ -113,10 +113,10 @@ public class SummaryDocumentWriter implements DocumentWriter { @Override public String getStatsString() { - return String.format(" %s summary document files written\n" - + " %s summary document files deleted\n", - FormattingUtils.formatDecimalNumber(this.writtenDocuments), - FormattingUtils.formatDecimalNumber(this.deletedDocuments)); + return String.format(" %s summary document files written\n" + + " %s summary document files deleted\n", + FormattingUtils.formatDecimalNumber(this.writtenDocuments), + FormattingUtils.formatDecimalNumber(this.deletedDocuments)); } }

1 0