tor-commits August 2018

tor-commits@lists.torproject.org

17 participants
2581 discussions

[metrics-web/master] Make a couple JavaDoc fixes.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit d81c8400af3127841d3c798f73b40ae5d83455d2 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 09:51:56 2018 +0200 Make a couple JavaDoc fixes. --- .../stats/servers/ConsensusStatsFileHandler.java | 20 ++++++++++---------- .../metrics/stats/servers/LoggingConfiguration.java | 2 -- .../servers/RelayDescriptorDatabaseImporter.java | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java index ebbce60..f4f99cd 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java +++ b/src/main/java/org/torproject/metrics/stats/servers/ConsensusStatsFileHandler.java @@ -33,11 +33,11 @@ import java.util.logging.Logger; /** * Generates statistics on the average number of relays and bridges per - * day. Accepts parse results from <code>RelayDescriptorParser</code> and - * <code>BridgeDescriptorParser</code> and stores them in intermediate - * result files <code>stats/consensus-stats-raw</code> and - * <code>stats/bridge-consensus-stats-raw</code>. Writes final results to - * <code>stats/consensus-stats</code> for all days for which at least half + * day. Accepts parse results from {@code RelayDescriptorParser} and + * {@code BridgeDescriptorParser} and stores them in intermediate + * result files {@code stats/consensus-stats-raw} and + * {@code stats/bridge-consensus-stats-raw}. Writes final results to + * {@code stats/consensus-stats} for all days for which at least half * of the expected consensuses or statuses are known. */ public class ConsensusStatsFileHandler { @@ -52,14 +52,14 @@ public class ConsensusStatsFileHandler { * Number of running bridges in a given bridge status. Map keys are the bridge * status time formatted as "yyyy-MM-dd HH:mm:ss", a comma, and the bridge * authority nickname, map values are lines as read from - * <code>stats/bridge-consensus-stats-raw</code>. + * {@code stats/bridge-consensus-stats-raw}. */ private SortedMap<String, String> bridgesRaw; /** * Average number of running bridges per day. Map keys are dates * formatted as "yyyy-MM-dd", map values are the remaining columns as written - * to <code>stats/consensus-stats</code>. + * to {@code stats/consensus-stats}. */ private SortedMap<String, String> bridgesPerDay; @@ -83,9 +83,9 @@ public class ConsensusStatsFileHandler { /** * Initializes this class, including reading in intermediate results - * files <code>stats/consensus-stats-raw</code> and - * <code>stats/bridge-consensus-stats-raw</code> and final results file - * <code>stats/consensus-stats</code>. + * files {@code stats/consensus-stats-raw} and + * {@code stats/bridge-consensus-stats-raw} and final results file + * {@code stats/consensus-stats}. */ public ConsensusStatsFileHandler(String connectionUrl, File bridgesDir, File statsDirectory, diff --git a/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java b/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java index f14241b..a11c6c4 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java +++ b/src/main/java/org/torproject/metrics/stats/servers/LoggingConfiguration.java @@ -20,7 +20,6 @@ import java.util.logging.Logger; * * Log levels used by ERNIE: * - * * <ul> * <li>SEVERE: An event made it impossible to continue program execution. * WARNING: A potential problem occurred that requires the operator to @@ -34,7 +33,6 @@ import java.util.logging.Logger; * using FINER.</li> * <li>FINEST: Most detailed debug messages. Not used.</li> * </ul> - * */ public class LoggingConfiguration { diff --git a/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java b/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java index 38afeec..750e231 100644 --- a/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java +++ b/src/main/java/org/torproject/metrics/stats/servers/RelayDescriptorDatabaseImporter.java @@ -173,7 +173,7 @@ public final class RelayDescriptorDatabaseImporter { /** * Set of fingerprints that we imported for the valid-after time in - * <code>lastCheckedStatusEntries</code>. + * {@code lastCheckedStatusEntries}. */ private Set<String> insertedStatusEntries = new HashSet<>();

1 0

[metrics-web/master] Remove unnecessary continue statements.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 482a8dd7ebd0e7df3a54eb535baa8c079ae412b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 15:19:47 2018 +0200 Remove unnecessary continue statements. --- src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java index 61b9fa8..f3163e1 100644 --- a/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java +++ b/src/main/java/org/torproject/metrics/stats/hidserv/DocumentStore.java @@ -132,11 +132,9 @@ public class DocumentStore<T extends Document> { && !(formattedString0 + line.substring(1)) .startsWith(prefix)) { /* Skip combined line not starting with prefix. */ - continue; } else if (prefix.length() > 0 && !formattedString0.startsWith(prefix)) { /* Skip line not starting with prefix. */ - continue; } else { T document = this.clazz.newInstance(); if (!document.parse(new String[] { formattedString0,

1 0

[onionoo/master] Use chained String.append calls.
by karsten＠torproject.org 27 Aug '18

27 Aug '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 < 0 ? ", " : "").append(".").append(permilles[j]) + .append(i < logValues.length - 1 ? "<" + (1L << i) + : ">=" + (1L < 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] Avoid manual array copies.
by karsten＠torproject.org 27 Aug '18

27 Aug '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/master] Remove unnecessary null check.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 6deaf25b382869d3e25204213813c261d28d01ba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:06:02 2018 +0200 Remove unnecessary null check. --- src/main/java/org/torproject/onionoo/updater/TorVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/onionoo/updater/TorVersion.java b/src/main/java/org/torproject/onionoo/updater/TorVersion.java index d8e1683..6440283 100644 --- a/src/main/java/org/torproject/onionoo/updater/TorVersion.java +++ b/src/main/java/org/torproject/onionoo/updater/TorVersion.java @@ -104,7 +104,7 @@ public class TorVersion implements Comparable<TorVersion> { @Override public boolean equals(Object other) { - return null != other && other instanceof TorVersion + return other instanceof TorVersion && this.compareTo((TorVersion) other) == 0; }

1 0

[onionoo/master] Use Arrays.asList with varargs.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 81b186c3bf2b97c8eb35cc6e83588ad9d2e94800 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:16:12 2018 +0200 Use Arrays.asList with varargs. --- .../onionoo/server/MostFrequentString.java | 2 +- .../torproject/onionoo/server/ResourceServlet.java | 4 +- .../onionoo/docs/SummaryDocumentTest.java | 14 +++--- .../torproject/onionoo/docs/UptimeStatusTest.java | 4 +- .../onionoo/server/ResourceServletTest.java | 53 +++++++++++----------- .../server/SummaryDocumentComparatorTest.java | 14 +++--- .../onionoo/writer/UptimeDocumentWriterTest.java | 8 ++-- 7 files changed, 50 insertions(+), 49 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java index dc9bb02..3d4d4c2 100644 --- a/src/main/java/org/torproject/onionoo/server/MostFrequentString.java +++ b/src/main/java/org/torproject/onionoo/server/MostFrequentString.java @@ -35,7 +35,7 @@ class MostFrequentString { for (Map.Entry<String, Integer> e : stringFrequencies.entrySet()) { if (!sortedFrequencies.containsKey(e.getValue())) { sortedFrequencies.put(e.getValue(), new TreeSet<>( - Arrays.asList(new String[] { e.getKey() } ))); + Arrays.asList(e.getKey()))); } else { sortedFrequencies.get(e.getValue()).add(e.getKey()); } diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index dce5601..4257348 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -592,10 +592,10 @@ public class ResourceServlet extends HttpServlet { Pattern.compile("^[0-9a-zA-Z_,-]*$"); private static HashSet<String> knownOrderParameters = new HashSet<>( - Arrays.asList(new String[] { OrderParameterValues.CONSENSUS_WEIGHT_ASC, + Arrays.asList(OrderParameterValues.CONSENSUS_WEIGHT_ASC, OrderParameterValues.CONSENSUS_WEIGHT_DES, OrderParameterValues.FIRST_SEEN_ASC, - OrderParameterValues.FIRST_SEEN_DES })); + OrderParameterValues.FIRST_SEEN_DES)); private String[] parseOrderParameter(String parameter) { if (!orderParameterPattern.matcher(parameter).matches()) { diff --git a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java index 120a226..be183e3 100644 --- a/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java +++ b/src/test/java/org/torproject/onionoo/docs/SummaryDocumentTest.java @@ -16,18 +16,18 @@ public class SummaryDocumentTest { private SummaryDocument createSummaryDocumentRelayTorkaZ() { return new SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( - new String[] { "62.216.201.221", "62.216.201.222", - "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), - false, new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), 20L, "de", + "62.216.201.221", "62.216.201.222", + "62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<>(Arrays.asList("Running", + "Valid")), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", - "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")), new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, + "001C13B3A55A71B977CA65EC85539D79C653A3FC")), null, null, null, null, true); } diff --git a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java index 1b567ac..31a7ef9 100644 --- a/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java +++ b/src/test/java/org/torproject/onionoo/docs/UptimeStatusTest.java @@ -201,7 +201,7 @@ public class UptimeStatusTest { } private static final SortedSet<String> RUNNING_FLAG = - new TreeSet<>(Arrays.asList(new String[] { "Running" })); + new TreeSet<>(Arrays.asList("Running")); @Test() public void testAddFlagsToNoFlagsEnd() { @@ -251,7 +251,7 @@ public class UptimeStatusTest { } private static final SortedSet<String> RUNNING_VALID_FLAGS = - new TreeSet<>(Arrays.asList(new String[] { "Running", "Valid" })); + new TreeSet<>(Arrays.asList("Running", "Valid")); @Test() public void testDontCompressDifferentFlags() { diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 74fec21..022381b 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -134,49 +134,50 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument relayTorkaZ = new org.torproject.onionoo.docs.SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( - new String[] { "62.216.201.221", "62.216.201.222", - "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), - false, new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), 20L, "de", + "62.216.201.221", "62.216.201.222", + "62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<>(Arrays.asList("Running", + "Valid")), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", - "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")), new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC")), "0.2.3.25", "linux", new TreeSet<>(Arrays.asList( - new String[] { "ppp-62-216-201-221.dynamic.mnet-online.de" })), + "ppp-62-216-201-221.dynamic.mnet-online.de")), null, true); this.relays.put("000C5F55BD4814B917CC474BD537F1A3B33CCE2A", relayTorkaZ); org.torproject.onionoo.docs.SummaryDocument relayFerrari458 = new org.torproject.onionoo.docs.SummaryDocument(true, "Ferrari458", "001C13B3A55A71B977CA65EC85539D79C653A3FC", Arrays.asList( - new String[] { "68.38.171.200", "[2001:4f8:3:2e::51]" }), + "68.38.171.200", "[2001:4f8:3:2e::51]"), DateTimeHelper.parse("2013-04-24 12:00:00"), true, - new TreeSet<>(Arrays.asList(new String[] { "Fast", "Named", - "Running", "V2Dir", "Valid" })), 1140L, "us", + new TreeSet<>(Arrays.asList("Fast", "Named", + "Running", "V2Dir", "Valid")), 1140L, "us", DateTimeHelper.parse("2013-04-16 18:00:00"), "AS7922", "comcast cable communications, llc", null, - new TreeSet<>(Arrays.asList(new String[]{ - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A"})), - new TreeSet<>(Arrays.asList(new String[] { - "000C5F55BD4814B917CC474BD537F1A3B33CCE2A" })), null, null, new TreeSet<>(Arrays.asList( - new String[] {"c-68-38-171-200.hsd1.in.comcast.net"})), + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A")), + new TreeSet<>(Arrays.asList( + "000C5F55BD4814B917CC474BD537F1A3B33CCE2A")), + null, null, + new TreeSet<>(Arrays.asList( + "c-68-38-171-200.hsd1.in.comcast.net")), null, null); this.relays.put("001C13B3A55A71B977CA65EC85539D79C653A3FC", relayFerrari458); org.torproject.onionoo.docs.SummaryDocument relayTimMayTribute = new org.torproject.onionoo.docs.SummaryDocument(true, "TimMayTribute", "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B", Arrays.asList( - new String[] { "89.69.68.246" }), + "89.69.68.246"), DateTimeHelper.parse("2013-04-22 20:00:00"), false, - new TreeSet<>(Arrays.asList(new String[] { "Fast", - "Running", "Unnamed", "V2Dir", "Valid" })), 63L, "a1", + new TreeSet<>(Arrays.asList("Fast", + "Running", "Unnamed", "V2Dir", "Valid")), 63L, "a1", DateTimeHelper.parse("2013-04-16 18:00:00"), null, "liberty global operations b.v.", "1024d/51e2a1c7 \"steven j. murdoch\" " @@ -189,9 +190,9 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument bridgeec2bridgercc7f31fe = new org.torproject.onionoo.docs.SummaryDocument(false, "ec2bridgercc7f31fe", "0000831B236DFF73D409AD17B40E2A728A53994F", - Arrays.asList(new String[] { "10.199.7.176" }), + Arrays.asList("10.199.7.176"), DateTimeHelper.parse("2013-04-21 18:07:03"), false, - new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, + new TreeSet<>(Arrays.asList("Valid")), -1L, null, DateTimeHelper.parse("2013-04-20 15:37:04"), null, null, null, null, null, "0.2.2.39", null, null, null, true); this.bridges.put("0000831B236DFF73D409AD17B40E2A728A53994F", @@ -199,9 +200,9 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument bridgeUnnamed = new org.torproject.onionoo.docs.SummaryDocument(false, "Unnamed", "0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", Arrays.asList( - new String[] { "10.0.52.84" }), + "10.0.52.84"), DateTimeHelper.parse("2013-04-20 17:37:04"), false, - new TreeSet<>(Arrays.asList(new String[] { "Valid" })), -1L, + new TreeSet<>(Arrays.asList("Valid")), -1L, null, DateTimeHelper.parse("2013-04-14 07:07:05"), null, null, null, null, null, null, null, null, null, null); this.bridges.put("0002D9BDBBC230BD9C78FF502A16E0033EF87E0C", @@ -209,10 +210,10 @@ public class ResourceServletTest { org.torproject.onionoo.docs.SummaryDocument bridgegummy = new org.torproject.onionoo.docs.SummaryDocument(false, "gummy", "1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", Arrays.asList( - new String[] { "10.63.169.98" }), + "10.63.169.98"), DateTimeHelper.parse("2013-04-24 01:07:04"), true, - new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), -1L, null, + new TreeSet<>(Arrays.asList("Running", + "Valid")), -1L, null, DateTimeHelper.parse("2013-01-16 21:07:04"), null, null, null, null, null, "0.2.4.4-alpha-dev", "windows 7", null, null, false); this.bridges.put("1FEDE50ED8DBA1DD9F9165F78C8131E4A44AB756", diff --git a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java index 44db510..92922f0 100644 --- a/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java +++ b/src/test/java/org/torproject/onionoo/server/SummaryDocumentComparatorTest.java @@ -29,18 +29,18 @@ public class SummaryDocumentComparatorTest { private SummaryDocument createSummaryDoc() { return new SummaryDocument(true, "TorkaZ", "000C5F55BD4814B917CC474BD537F1A3B33CCE2A", Arrays.asList( - new String[] { "62.216.201.221", "62.216.201.222", - "62.216.201.223" }), DateTimeHelper.parse("2013-04-19 05:00:00"), - false, new TreeSet<>(Arrays.asList(new String[] { "Running", - "Valid" })), 20L, "de", + "62.216.201.221", "62.216.201.222", + "62.216.201.223"), DateTimeHelper.parse("2013-04-19 05:00:00"), + false, new TreeSet<>(Arrays.asList("Running", + "Valid")), 20L, "de", DateTimeHelper.parse("2013-04-18 05:00:00"), "AS8767", "m-net telekommunikations gmbh", "torkaz <klaus dot zufall at gmx dot de> " + "<fb-token:np5_g_83jmf=>", new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC", - "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B" })), + "001C13B3A55A71B977CA65EC85539D79C653A3FC", + "0025C136C1F3A9EEFE2AE3F918F03BFA21B5070B")), new TreeSet<>(Arrays.asList( - new String[] { "001C13B3A55A71B977CA65EC85539D79C653A3FC" })), null, + "001C13B3A55A71B977CA65EC85539D79C653A3FC")), null, null, null, null, null); } diff --git a/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java b/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java index 2f322bd..795db56 100644 --- a/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java +++ b/src/test/java/org/torproject/onionoo/writer/UptimeDocumentWriterTest.java @@ -167,7 +167,7 @@ public class UptimeDocumentWriterTest { UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertOneWeekGraph(document, 1, "2014-03-23 09:30:00", "2014-03-23 11:30:00", 3, - Arrays.asList(new Integer[] { 999, 0, 999 })); + Arrays.asList(999, 0, 999)); } @Test @@ -183,7 +183,7 @@ public class UptimeDocumentWriterTest { UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertOneWeekGraph(document, 1, "2014-03-23 09:30:00", "2014-03-23 11:30:00", 3, - Arrays.asList(new Integer[] { 999, 999, 0 })); + Arrays.asList(999, 999, 0)); } @Test @@ -244,7 +244,7 @@ public class UptimeDocumentWriterTest { UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertOneMonthGraph(document, 2, "2014-03-16 10:00:00", "2014-03-16 14:00:00", 2, - Arrays.asList(new Integer[] { 999, 499 })); + Arrays.asList(999, 499)); } @Test @@ -280,7 +280,7 @@ public class UptimeDocumentWriterTest { UptimeDocument document = this.documentStore.getDocument( UptimeDocument.class, GABELMOO_FINGERPRINT); this.assertFiveYearGraph(document, 1, "2012-03-06 00:00:00", - "2012-03-16 00:00:00", 2, Arrays.asList(new Integer[] { 999, 999 })); + "2012-03-16 00:00:00", 2, Arrays.asList(999, 999)); } }

1 0

[onionoo/master] Avoid integer overflow in tests.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit ed9c9f342716edcb7ada756c4d5713e6296abf3d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:07:29 2018 +0200 Avoid integer overflow in tests. --- src/test/java/org/torproject/onionoo/server/ResourceServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 063f550..58bab5d 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -1367,7 +1367,7 @@ public class ResourceServletTest { public void testFirstSeenDaysMaxIntPlusOne() { this.assertErrorStatusCode( "/summary?first_seen_days=" - + String.valueOf(Integer.MAX_VALUE + 1), 400); + + String.valueOf(((long) Integer.MAX_VALUE) + 1L), 400); } @Test(timeout = 100)

1 0

[onionoo/master] Remove redundant cast.
by karsten＠torproject.org 27 Aug '18

27 Aug '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/master] Use parameterized map for parameters.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit ff82fdaa8a58ace4719a694cbd2b3c2fb11d2ec4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:13:05 2018 +0200 Use parameterized map for parameters. --- .../org/torproject/onionoo/server/HttpServletRequestWrapper.java | 3 +-- src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 6 +++--- .../java/org/torproject/onionoo/server/ResourceServletTest.java | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java b/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java index 904e55c..c8771c8 100644 --- a/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java +++ b/src/main/java/org/torproject/onionoo/server/HttpServletRequestWrapper.java @@ -20,8 +20,7 @@ public class HttpServletRequestWrapper { return this.request.getRequestURI(); } - @SuppressWarnings("rawtypes") - protected Map getParameterMap() { + protected Map<String, String[]> getParameterMap() { return this.request.getParameterMap(); } diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 1c72b9e..dce5601 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -133,10 +133,10 @@ public class ResourceServlet extends HttpServlet { /* Extract parameters either from the old-style URI or from request * parameters. */ Map<String, String> parameterMap = new HashMap<>(); - for (Object parameterKey : request.getParameterMap().keySet()) { + for (String parameterKey : request.getParameterMap().keySet()) { String[] parameterValues = - request.getParameterValues((String) parameterKey); - parameterMap.put((String) parameterKey, parameterValues[0]); + request.getParameterValues(parameterKey); + parameterMap.put(parameterKey, parameterValues[0]); } /* Make sure that the request doesn't contain any unknown diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index 58bab5d..74fec21 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -64,8 +64,7 @@ public class ResourceServletTest { return this.requestUri; } - @SuppressWarnings("rawtypes") - protected Map getParameterMap() { + protected Map<String, String[]> getParameterMap() { return this.parameterMap; }

1 0

[onionoo/master] Remove redundant initializers.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit d9cafd8e6b23f3520be78768272f08b180c2920f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:32:12 2018 +0200 Remove redundant initializers. --- src/main/java/org/torproject/onionoo/docs/ClientsHistory.java | 4 ++-- src/main/java/org/torproject/onionoo/docs/DocumentStore.java | 4 ++-- src/main/java/org/torproject/onionoo/docs/NodeStatus.java | 2 +- src/main/java/org/torproject/onionoo/docs/UptimeHistory.java | 2 +- .../org/torproject/onionoo/server/HttpServletResponseWrapper.java | 2 +- src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 4 ++-- .../java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java index 58e86e4..e4800e3 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsHistory.java @@ -90,7 +90,7 @@ public class ClientsHistory implements Comparable<ClientsHistory> { + "'. Skipping."); return null; } - double totalResponses = 0.0; + double totalResponses; try { totalResponses = Double.parseDouble(parts[4]); } catch (NumberFormatException e) { @@ -125,7 +125,7 @@ public class ClientsHistory implements Comparable<ClientsHistory> { /* Logged by caller */ return null; } - double value = 0.0; + double value; try { value = Double.parseDouble(keyValue[1]); } catch (NumberFormatException e) { diff --git a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java index af67d91..c5444c5 100644 --- a/src/main/java/org/torproject/onionoo/docs/DocumentStore.java +++ b/src/main/java/org/torproject/onionoo/docs/DocumentStore.java @@ -469,7 +469,7 @@ public class DocumentStore { + "directory."); return null; } - String documentString = null; + String documentString; try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); BufferedInputStream bis = new BufferedInputStream( new FileInputStream(documentFile))) { @@ -782,7 +782,7 @@ public class DocumentStore { StringBuilder sb = new StringBuilder(); for (SummaryDocument summaryDocument : this.cachedSummaryDocuments.values()) { - String line = null; + String line; try { line = objectMapper.writeValueAsString(summaryDocument); } catch (JsonProcessingException e) { diff --git a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java index bef403b..fe55229 100644 --- a/src/main/java/org/torproject/onionoo/docs/NodeStatus.java +++ b/src/main/java/org/torproject/onionoo/docs/NodeStatus.java @@ -564,7 +564,7 @@ public class NodeStatus extends Document { SortedSet<String> orAddressesAndPorts = new TreeSet<>(); SortedSet<String> exitAddresses = new TreeSet<>(); String addresses = parts[3]; - String address = null; + String address; if (addresses.contains(";")) { String[] addressParts = addresses.split(";", -1); if (addressParts.length != 3) { diff --git a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java index ef73a1c..0297b37 100644 --- a/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java +++ b/src/main/java/org/torproject/onionoo/docs/UptimeHistory.java @@ -78,7 +78,7 @@ public class UptimeHistory implements Comparable<UptimeHistory> { + uptimeHistoryString + "'. Skipping."); return null; } - int uptimeHours = -1; + int uptimeHours; try { uptimeHours = Integer.parseInt(parts[2]); } catch (NumberFormatException e) { diff --git a/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java b/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java index f6888a4..4734e63 100644 --- a/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java +++ b/src/main/java/org/torproject/onionoo/server/HttpServletResponseWrapper.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse; public class HttpServletResponseWrapper { - private HttpServletResponse response = null; + private HttpServletResponse response; protected HttpServletResponseWrapper(HttpServletResponse response) { this.response = response; diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 4257348..8f956a6 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -109,7 +109,7 @@ public class ResourceServlet extends HttpServlet { if (uri.startsWith("/onionoo/")) { uri = uri.substring("/onionoo".length()); } - String resourceType = null; + String resourceType; if (uri.startsWith("/summary")) { resourceType = "summary"; } else if (uri.startsWith("/details")) { @@ -388,7 +388,7 @@ public class ResourceServlet extends HttpServlet { rb.setBridgesSkipped(rh.getBridgesSkipped()); rb.setRelaysTruncated(rh.getRelaysTruncated()); rb.setBridgesTruncated(rh.getBridgesTruncated()); - String[] fields = null; + String[] fields; if (parameterMap.containsKey("fields")) { fields = this.parseFieldsParameter(parameterMap.get("fields")); if (fields == null) { diff --git a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java index 054ccf5..7223e5a 100644 --- a/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java @@ -458,7 +458,7 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, for (String fingerprint : previouslyKnownNodes) { NodeStatus nodeStatus = this.documentStore.retrieve( NodeStatus.class, true, fingerprint); - NodeStatus updatedNodeStatus = null; + NodeStatus updatedNodeStatus; if (this.knownNodes.containsKey(fingerprint)) { updatedNodeStatus = this.knownNodes.get(fingerprint); String address = nodeStatus.getAddress();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2018