October 2018 - tor-commits - lists.torproject.org

[collector/release] Replace lambdas with method references.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit e88a10371160477a29fa3098af857f7fd2c731ac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:18:16 2018 +0200 Replace lambdas with method references. --- .../torproject/metrics/collector/bridgedescs/DescriptorBuilder.java | 2 +- .../org/torproject/metrics/collector/webstats/SanitizeWeblogs.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java index 367e2e2..8fc25b4 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/DescriptorBuilder.java @@ -88,7 +88,7 @@ class DescriptorBuilder { public String toString() { if (!this.finalized) { this.finalized = true; - this.value = this.parts.stream().map(part -> part.toString()) + this.value = this.parts.stream().map(Object::toString) .collect(Collectors.joining("")); this.parts.clear(); // not needed anymore this.lastPart = null; diff --git a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index 32d4702..f3fbf43 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -264,9 +264,9 @@ public class SanitizeWeblogs extends CollecTorMain { br.close(); return lists.parallelStream() .map(list -> list.stream() - .map(line -> sanitize(line)) - .filter(line -> line.isPresent()) - .map(line -> line.get()) + .map(SanitizeWeblogs::sanitize) + .filter(Optional::isPresent) + .map(Optional::get) .collect(groupingBy(WebServerAccessLogLine::getDate, groupingBy(WebServerAccessLogLine::toLogString, counting())))) .flatMap(map -> map.entrySet().stream()).parallel()

1 0

[collector/release] Use more powerful Map methods.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit 013370a0088a04d521e43f1a298d0947315462d8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:21:58 2018 +0200 Use more powerful Map methods. --- .../metrics/collector/relaydescs/ArchiveWriter.java | 3 +-- .../torproject/metrics/collector/webstats/LogFileMap.java | 13 +++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index 98d2864..08874b9 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -427,8 +427,7 @@ public class ArchiveWriter extends CollecTorMain { } } sb.append("\nC, " + validAfterTime); - int allVotes = this.expectedVotes.containsKey(validAfterMillis) - ? this.expectedVotes.get(validAfterMillis) : 0; + int allVotes = this.expectedVotes.getOrDefault(validAfterMillis, 0); if (allVotes > 0) { sb.append(String.format(", %d/%d V (%.1f%%)", foundVotes, allVotes, 100.0D * (double) foundVotes / (double) allVotes)); diff --git a/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java index b265e4b..6d9e22d 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java @@ -70,17 +70,10 @@ public class LogFileMap /** Add log metadata to the map structure. */ public void add(LogMetadata metadata) { TreeMap<String, TreeMap<LocalDate, LogMetadata>> virtualHosts - = this.get(metadata.virtualHost); - if (null == virtualHosts) { - virtualHosts = new TreeMap<>(); - this.put(metadata.virtualHost, virtualHosts); - } + = this.computeIfAbsent(metadata.virtualHost, k -> new TreeMap<>()); TreeMap<LocalDate, LogMetadata> physicalHosts - = virtualHosts.get(metadata.physicalHost); - if (null == physicalHosts) { - physicalHosts = new TreeMap<>(); - virtualHosts.put(metadata.physicalHost, physicalHosts); - } + = virtualHosts.computeIfAbsent(metadata.physicalHost, + k -> new TreeMap<>()); physicalHosts.put(metadata.date, metadata); }

1 0

[collector/release] Collapse identical catch blocks.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit bc83cc6450cce9bed6f23b7bdee19b9c7d113d84 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:36:00 2018 +0200 Collapse identical catch blocks. --- .../metrics/collector/relaydescs/CachedRelayDescriptorReader.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 737344b..1a8922b 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -220,10 +220,7 @@ public class CachedRelayDescriptorReader { + (f.getName().startsWith("cached-descriptors") ? "server" : "extra-info") + " descriptors"); } - } catch (IOException e) { - logger.warn("Failed reading " - + cachedDescDir.getAbsolutePath() + " directory.", e); - } catch (ParseException e) { + } catch (IOException | ParseException e) { logger.warn("Failed reading " + cachedDescDir.getAbsolutePath() + " directory.", e); }

1 0

[collector/release] Replace Option.ifPresent() with functional style.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit 4204fcfd62275e2a378f2940310857bc8658d646 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:37:32 2018 +0200 Replace Option.ifPresent() with functional style. --- .../java/org/torproject/metrics/collector/webstats/LogFileMap.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java index 6d9e22d..2036b1f 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/LogFileMap.java @@ -39,9 +39,7 @@ public class LogFileMap @Override public FileVisitResult visitFile(Path path, BasicFileAttributes att) { Optional<LogMetadata> optionalMetadata = LogMetadata.create(path); - if (optionalMetadata.isPresent()) { - logFileMap.add(optionalMetadata.get()); - } + optionalMetadata.ifPresent(logFileMap::add); return FileVisitResult.CONTINUE; }

1 0

[collector/release] Avoid manual array copies.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit 82444f7e3f8e03a039aa6a33e3db9a4ac1a8da24 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:42:34 2018 +0200 Avoid manual array copies. --- .../metrics/collector/bridgedescs/BridgeSnapshotReader.java | 5 ++--- .../torproject/metrics/collector/exitlists/ExitListDownloader.java | 4 +--- .../org/torproject/metrics/collector/relaydescs/ArchiveReader.java | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 85c593d..0ffb233 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -22,6 +22,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.SortedSet; @@ -82,9 +83,7 @@ public class BridgeSnapshotReader { while (!filesInInputDir.isEmpty()) { File pop = filesInInputDir.pop(); if (pop.isDirectory()) { - for (File f : pop.listFiles()) { - filesInInputDir.add(f); - } + Collections.addAll(filesInInputDir, pop.listFiles()); } else if (!parsed.contains(pop.getName())) { try { FileInputStream in = new FileInputStream(pop); diff --git a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index 2531cb7..4f9d082 100644 --- a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -174,9 +174,7 @@ public class ExitListDownloader extends CollecTorMain { while (lastThreeElements.size() > 3) { lastThreeElements.remove(lastThreeElements.first()); } - for (File f : lastThreeElements) { - filesInInputDir.add(f); - } + filesInInputDir.addAll(lastThreeElements); } else { lastThreeExitLists.add(pop); while (lastThreeExitLists.size() > 3) { diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index 0119aef..72960b0 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -23,6 +23,7 @@ import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -86,9 +87,7 @@ public class ArchiveReader { while (!filesInInputDir.isEmpty()) { File pop = filesInInputDir.pop(); if (pop.isDirectory()) { - for (File f : pop.listFiles()) { - filesInInputDir.add(f); - } + Collections.addAll(filesInInputDir, pop.listFiles()); } else { try { BufferedInputStream bis = null;

1 0

[collector/release] Use chained String.append calls.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit a9ebc71f75c55643eaba84c64529dd4f2bc94c50 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:45:50 2018 +0200 Use chained String.append calls. --- .../bridgedescs/BridgeSnapshotReader.java | 2 +- .../collector/exitlists/ExitListDownloader.java | 5 +++-- .../collector/relaydescs/ArchiveReader.java | 2 +- .../collector/relaydescs/ArchiveWriter.java | 26 ++++++++++++---------- .../relaydescs/CachedRelayDescriptorReader.java | 17 +++++++------- .../relaydescs/RelayDescriptorDownloader.java | 6 ++--- .../relaydescs/RelayDescriptorParser.java | 4 ++-- 7 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 0ffb233..9df94d9 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -248,7 +248,7 @@ public class BridgeSnapshotReader { pbdFile.getParentFile().mkdirs(); try (BufferedWriter bw = new BufferedWriter(new FileWriter(pbdFile))) { for (String f : parsed) { - bw.append(f + "\n"); + bw.append(f).append("\n"); } logger.debug("Finished writing file " + pbdFile.getAbsolutePath() + "."); diff --git a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index 4f9d082..a346d02 100644 --- a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -74,7 +74,8 @@ public class ExitListDownloader extends CollecTorMain { logger.debug("Downloading exit list..."); StringBuilder sb = new StringBuilder(); sb.append(Annotation.ExitList.toString()); - sb.append("Downloaded " + dateTimeFormat.format(downloadedDate) + "\n"); + sb.append("Downloaded ").append(dateTimeFormat.format(downloadedDate)) + .append("\n"); URL url = config.getUrl(Key.ExitlistUrl); try { HttpURLConnection huc = (HttpURLConnection) url.openConnection(); @@ -183,7 +184,7 @@ public class ExitListDownloader extends CollecTorMain { } } for (File f : lastThreeExitLists) { - dumpStats.append("\n" + f.getName()); + dumpStats.append("\n").append(f.getName()); } logger.info(dumpStats.toString()); diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index 72960b0..aea169f 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -238,7 +238,7 @@ public class ArchiveReader { + "directory " + archivesDirectory + "/:"); int printed = 0; for (File f : problems) { - sb.append("\n " + f.getAbsolutePath()); + sb.append("\n ").append(f.getAbsolutePath()); if (++printed >= 3) { sb.append("\n ... more"); break; diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index 08874b9..1e13d6d 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -302,15 +302,17 @@ public class ArchiveWriter extends CollecTorMain { /** Compiles a message with statistics on stored descriptors by type for * later inclusion in the log and resets counters. */ public void intermediateStats(String event) { - intermediateStats.append("While " + event + ", we stored " - + this.storedConsensusesCounter + " consensus(es), " - + this.storedMicrodescConsensusesCounter + " microdesc " - + "consensus(es), " + this.storedVotesCounter + " vote(s), " - + this.storedCertsCounter + " certificate(s), " - + this.storedServerDescriptorsCounter + " server descriptor(s), " - + this.storedExtraInfoDescriptorsCounter + " extra-info " - + "descriptor(s), and " + this.storedMicrodescriptorsCounter - + " microdescriptor(s) to disk.\n"); + intermediateStats.append("While ").append(event).append(", we stored ") + .append(this.storedConsensusesCounter).append(" consensus(es), ") + .append(this.storedMicrodescConsensusesCounter).append(" microdesc ") + .append("consensus(es), ").append(this.storedVotesCounter) + .append(" vote(s), ").append(this.storedCertsCounter) + .append(" certificate(s), ").append(this.storedServerDescriptorsCounter) + .append(" server descriptor(s), ") + .append(this.storedExtraInfoDescriptorsCounter).append(" extra-info ") + .append("descriptor(s), and ") + .append(this.storedMicrodescriptorsCounter) + .append(" microdescriptor(s) to disk.\n"); this.storedConsensusesCounter = 0; this.storedMicrodescConsensusesCounter = 0; this.storedVotesCounter = 0; @@ -376,7 +378,7 @@ public class ArchiveWriter extends CollecTorMain { } } } - sb.append("\nV, " + validAfterTime); + sb.append("\nV, ").append(validAfterTime); if (voteAllServerDescs > 0) { sb.append(String.format(", %d/%d S (%.1f%%)", voteFoundServerDescs, voteAllServerDescs, @@ -426,7 +428,7 @@ public class ArchiveWriter extends CollecTorMain { } } } - sb.append("\nC, " + validAfterTime); + sb.append("\nC, ").append(validAfterTime); int allVotes = this.expectedVotes.getOrDefault(validAfterMillis, 0); if (allVotes > 0) { sb.append(String.format(", %d/%d V (%.1f%%)", foundVotes, allVotes, @@ -456,7 +458,7 @@ public class ArchiveWriter extends CollecTorMain { foundMicrodescriptors++; } } - sb.append("\nM, " + validAfterTime); + sb.append("\nM, ").append(validAfterTime); if (allMicrodescriptors > 0) { sb.append(String.format(", %d/%d M (%.1f%%)", foundMicrodescriptors, allMicrodescriptors, diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index 1a8922b..ad0f6a5 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -113,8 +113,8 @@ public class CachedRelayDescriptorReader { String line = null; while ((line = br.readLine()) != null) { if (line.startsWith("valid-after ")) { - dumpStats.append("\n" + f.getName() + ": " + line.substring( - "valid-after ".length())); + dumpStats.append("\n").append(f.getName()).append(": ") + .append(line.substring("valid-after ".length())); SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); @@ -172,8 +172,9 @@ public class CachedRelayDescriptorReader { } start = next; } - dumpStats.append("\n" + f.getName() + ": parsed " + parsedNum - + ", skipped " + skippedNum + " votes"); + dumpStats.append("\n").append(f.getName()).append(": parsed ") + .append(parsedNum).append(", skipped ").append(skippedNum) + .append(" votes"); } else if (f.getName().startsWith("cached-descriptors") || f.getName().startsWith("cached-extrainfo")) { String ascii = new String(allData, "US-ASCII"); @@ -215,10 +216,10 @@ public class CachedRelayDescriptorReader { } currentImportHistory.add(digest); } - dumpStats.append("\n" + f.getName() + ": parsed " + parsedNum - + ", skipped " + skippedNum + " " - + (f.getName().startsWith("cached-descriptors") - ? "server" : "extra-info") + " descriptors"); + dumpStats.append("\n").append(f.getName()).append(": parsed ") + .append(parsedNum).append(", skipped ").append(skippedNum) + .append(" ").append(f.getName().startsWith("cached-descriptors") + ? "server" : "extra-info").append(" descriptors"); } } catch (IOException | ParseException e) { logger.warn("Failed reading " diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index cf9ebc4..8becbe1 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -807,7 +807,7 @@ public class RelayDescriptorDownloader { combinedResource = new StringBuilder("/tor/" + type + "/d/" + descriptorIdentifier); } else { - combinedResource.append(separator + descriptorIdentifier); + combinedResource.append(separator).append(descriptorIdentifier); } descriptorsInCombinedResource++; } @@ -1087,8 +1087,8 @@ public class RelayDescriptorDownloader { + " missing microdescriptor(s) from the directory authorities."); StringBuilder sb = new StringBuilder(); for (String authority : this.authorities) { - sb.append(" " + authority + "=" - + this.requestsByAuthority.get(authority)); + sb.append(" ").append(authority).append("=").append( + this.requestsByAuthority.get(authority)); } logger.info("We sent these numbers of requests to the directory " + "authorities:" + sb.toString()); diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java index 65e2e2e..664b566 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -115,7 +115,7 @@ public class RelayDescriptorParser { certificateString = certificateStringBuilder.toString(); certificateStringBuilder = null; } else { - certificateStringBuilder.append(line + "\n"); + certificateStringBuilder.append(line).append("\n"); } } if (line.equals("vote-status vote")) { @@ -129,7 +129,7 @@ public class RelayDescriptorParser { dirSources.add(dirSource); } else if (line.startsWith("dir-key-certificate-version ")) { certificateStringBuilder = new StringBuilder(); - certificateStringBuilder.append(line + "\n"); + certificateStringBuilder.append(line).append("\n"); } else if (line.startsWith("fingerprint ")) { fingerprint = line.split(" ")[1]; } else if (line.startsWith("dir-key-published ")) {

1 0

[collector/release] Replace addAll with parameterized constructor call.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit 1c74a356ad02ff79846fe53d8a74567e4d15fa52 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:27:18 2018 +0200 Replace addAll with parameterized constructor call. --- .../org/torproject/metrics/collector/webstats/SanitizeWeblogs.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java index f3fbf43..7096832 100644 --- a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java +++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java @@ -218,8 +218,7 @@ public class SanitizeWeblogs extends CollecTorMain { if (dates.isEmpty()) { // return the empty interval return new LocalDate[]{LocalDate.MAX, LocalDate.MIN}; } - SortedSet<LocalDate> sorted = new TreeSet<>(); - sorted.addAll(dates); + SortedSet<LocalDate> sorted = new TreeSet<>(dates); if (this.limits) { for (int i = 0; i < LIMIT - 1; i++) { sorted.remove(sorted.last());

1 0

[collector/release] Remove redundant initializers.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit cc692b7e2f26766eb977641586bd62b3c30e9767 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:29:32 2018 +0200 Remove redundant initializers. --- src/main/java/org/torproject/metrics/collector/Main.java | 2 +- .../metrics/collector/bridgedescs/BridgeSnapshotReader.java | 10 +++++----- .../metrics/collector/bridgedescs/SanitizedBridgesWriter.java | 10 +++++----- .../metrics/collector/exitlists/ExitListDownloader.java | 2 +- .../metrics/collector/onionperf/OnionPerfDownloader.java | 4 ++-- .../torproject/metrics/collector/relaydescs/ArchiveReader.java | 8 ++++---- .../collector/relaydescs/CachedRelayDescriptorReader.java | 6 +++--- .../collector/relaydescs/RelayDescriptorDownloader.java | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/Main.java b/src/main/java/org/torproject/metrics/collector/Main.java index 05aead7..1e186d4 100644 --- a/src/main/java/org/torproject/metrics/collector/Main.java +++ b/src/main/java/org/torproject/metrics/collector/Main.java @@ -63,7 +63,7 @@ public class Main { */ public static void main(String[] args) { try { - Path confPath = null; + Path confPath; if (args == null || args.length == 0) { confPath = Paths.get(CONF_FILE); } else if (args.length == 1) { diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java index 9df94d9..abd30ab 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -55,7 +55,7 @@ public class BridgeSnapshotReader { logger.debug("Reading file " + pbdFile.getAbsolutePath() + "..."); try { BufferedReader br = new BufferedReader(new FileReader(pbdFile)); - String line = null; + String line; while ((line = br.readLine()) != null) { parsed.add(line); } @@ -88,7 +88,7 @@ public class BridgeSnapshotReader { try { FileInputStream in = new FileInputStream(pop); if (in.available() > 0) { - TarArchiveInputStream tais = null; + TarArchiveInputStream tais; if (pop.getName().endsWith(".tar.gz")) { GzipCompressorInputStream gcis = new GzipCompressorInputStream(in); @@ -149,7 +149,7 @@ public class BridgeSnapshotReader { String ascii = new String(allData, "US-ASCII"); BufferedReader br3 = new BufferedReader(new StringReader( ascii)); - String firstLine = null; + String firstLine; while ((firstLine = br3.readLine()) != null) { if (firstLine.startsWith("@")) { continue; @@ -171,8 +171,8 @@ public class BridgeSnapshotReader { skippedFiles++; continue; } else { - int start = -1; - int sig = -1; + int start; + int sig; int end = -1; String startToken = firstLine.startsWith("router ") ? "router " : "extra-info "; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index 7c335c9..2bd85ef 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -242,7 +242,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { String addressPart = orAddress.substring(0, orAddress.lastIndexOf(":")); String portPart = orAddress.substring(orAddress.lastIndexOf(":") + 1); - String scrubbedAddressPart = null; + String scrubbedAddressPart; if (addressPart.startsWith("[")) { scrubbedAddressPart = this.scrubIpv6Address(addressPart, fingerprintBytes, published); @@ -340,7 +340,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { } hex.append(hexParts.get(1)); } - byte[] ipBytes = null; + byte[] ipBytes; try { ipBytes = Hex.decodeHex(hex.toString().toCharArray()); } catch (DecoderException e) { @@ -473,7 +473,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { DescriptorBuilder scrubbed = new DescriptorBuilder(); BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); - String line = null; + String line; String mostRecentDescPublished = null; byte[] fingerprintBytes = null; String descPublicationTime = null; @@ -1120,9 +1120,9 @@ public class SanitizedBridgesWriter extends CollecTorMain { try { BufferedReader br = new BufferedReader(new StringReader(new String( data, "US-ASCII"))); - String line = null; + String line; DescriptorBuilder scrubbed = null; - String hashedBridgeIdentity = null; + String hashedBridgeIdentity; String masterKeyEd25519 = null; while ((line = br.readLine()) != null) { diff --git a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java index a346d02..0b7dfad 100644 --- a/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/exitlists/ExitListDownloader.java @@ -70,7 +70,7 @@ public class ExitListDownloader extends CollecTorMain { recentPathName = Paths.get(config.getPath(Key.RecentPath).toString(), EXITLISTS).toString(); Date downloadedDate = new Date(); - String downloadedExitList = null; + String downloadedExitList; logger.debug("Downloading exit list..."); StringBuilder sb = new StringBuilder(); sb.append(Annotation.ExitList.toString()); diff --git a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java index ab7c4f9..f97a4f8 100644 --- a/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/onionperf/OnionPerfDownloader.java @@ -184,8 +184,8 @@ public class OnionPerfDownloader extends CollecTorMain { tpfFileName); return; } - int fileSize = 0; - String date = null; + int fileSize; + String date; try { fileSize = Integer.parseInt( tpfFileNameParts[tpfFileNameParts.length - 4]); diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java index aea169f..74700f7 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -67,7 +67,7 @@ public class ArchiveReader { try { BufferedReader br = new BufferedReader(new FileReader( archivesImportHistoryFile)); - String line = null; + String line; while ((line = br.readLine()) != null) { archivesImportHistory.add(line); } @@ -90,7 +90,7 @@ public class ArchiveReader { Collections.addAll(filesInInputDir, pop.listFiles()); } else { try { - BufferedInputStream bis = null; + BufferedInputStream bis; if (keepImportHistory && archivesImportHistory.contains(pop.getName())) { ignoredFiles++; @@ -140,7 +140,7 @@ public class ArchiveReader { * microdescriptor. However, this breaks functional abstraction * pretty badly. */ try { - BufferedInputStream bis = null; + BufferedInputStream bis; if (pop.getName().endsWith(".bz2")) { FileInputStream fis = new FileInputStream(pop); BZip2CompressorInputStream bcis = @@ -178,7 +178,7 @@ public class ArchiveReader { new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); parseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String ascii = new String(allData, StandardCharsets.US_ASCII); - int start = -1; + int start; int end = -1; String startToken = "onion-key\n"; while (end < ascii.length()) { diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java index ad0f6a5..f64d019 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -110,7 +110,7 @@ public class CachedRelayDescriptorReader { /* Check if directory information is stale. */ BufferedReader br = new BufferedReader(new StringReader( new String(allData, "US-ASCII"))); - String line = null; + String line; while ((line = br.readLine()) != null) { if (line.startsWith("valid-after ")) { dumpStats.append("\n").append(f.getName()).append(": ") @@ -178,8 +178,8 @@ public class CachedRelayDescriptorReader { } else if (f.getName().startsWith("cached-descriptors") || f.getName().startsWith("cached-extrainfo")) { String ascii = new String(allData, "US-ASCII"); - int start = -1; - int sig = -1; + int start; + int sig; int end = -1; String startToken = f.getName().startsWith("cached-descriptors") diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java index 8becbe1..f876319 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorDownloader.java @@ -898,8 +898,8 @@ public class RelayDescriptorDownloader { this.currentTimestamp); } String ascii = new String(allData, StandardCharsets.US_ASCII); - int start = -1; - int sig = -1; + int start; + int sig; int end = -1; String startToken = resource.startsWith("/tor/server/") ? "router " : "extra-info "; @@ -935,7 +935,7 @@ public class RelayDescriptorDownloader { new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); parseFormat.setTimeZone(TimeZone.getTimeZone("UTC")); String ascii = new String(allData, StandardCharsets.US_ASCII); - int start = -1; + int start; int end = -1; String startToken = "onion-key\n"; while (end < ascii.length()) {

1 0

[collector/release] Simplify expression.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit ca4ec0c161c6fb9a6a78a96f9b44438938af190c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:05:16 2018 +0200 Simplify expression. --- .../java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java index 1e13d6d..ac3f5e3 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveWriter.java @@ -834,7 +834,7 @@ public class ArchiveWriter extends CollecTorMain { try { for (int i = 0; i < outputFiles.length; i++) { File outputFile = outputFiles[i]; - boolean appendToFile = append == null ? false : append[i]; + boolean appendToFile = append != null && append[i]; outputFile.getParentFile().mkdirs(); BufferedOutputStream bos = new BufferedOutputStream( new FileOutputStream(outputFile, appendToFile));

1 0

[collector/release] Remove redundant cast.
by karsten＠torproject.org 15 Oct '18

15 Oct '18

commit be14c1f065b9c17dde4c1ba9de6943aec4a2299d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:55:15 2018 +0200 Remove redundant cast. --- .../java/org/torproject/metrics/collector/cron/CollecTorMain.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java index 95f7445..87cb304 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/metrics/collector/cron/CollecTorMain.java @@ -138,9 +138,9 @@ public abstract class CollecTorMain extends SyncManager */ public static void checkAvailableSpace(Path location) { try { - long megaBytes = (long) (Files.getFileStore(location.toFile() + long megaBytes = Files.getFileStore(location.toFile() .getAbsoluteFile().toPath().getRoot()).getUsableSpace() - / 1024 / 1024); + / 1024 / 1024; if (megaBytes < LIMIT_MB) { logger.warn("Available storage critical for {}; only {} MiB left.", location, megaBytes);

1 0