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

[collector/master] Collapse identical catch blocks.
by karsten＠torproject.org 27 Aug '18

27 Aug '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/master] Replace anonymous types with lambdas.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 20742f46907e0085592aebe917acabe8f77ed0c7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:11:13 2018 +0200 Replace anonymous types with lambdas. --- .../metrics/collector/conf/Configuration.java | 30 ++++++++++------------ .../metrics/collector/conf/ConfigurationTest.java | 14 ++-------- 2 files changed, 16 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java index 6f38c45..f797947 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Configuration.java @@ -60,23 +60,21 @@ public class Configuration extends Observable implements Cloneable { if (this.getBool(Key.RunOnce)) { // no need to watch return; } - this.scheduler.scheduleAtFixedRate(new Runnable() { - public void run() { - logger.trace("Check configuration file."); - try { - FileTime ftNow = Files.getLastModifiedTime(confPath); - if (ft.compareTo(ftNow) < 0) { - logger.info("Configuration file was changed."); - reload(); - setChanged(); - notifyObservers(null); - } - ft = ftNow; - } catch (Throwable th) { // Catch all and keep running. - logger.error("Cannot reload configuration file.", th); - } + this.scheduler.scheduleAtFixedRate(() -> { + logger.trace("Check configuration file."); + try { + FileTime ftNow = Files.getLastModifiedTime(confPath); + if (ft.compareTo(ftNow) < 0) { + logger.info("Configuration file was changed."); + reload(); + setChanged(); + notifyObservers(null); } - }, 5, 5, TimeUnit.SECONDS); + ft = ftNow; + } catch (Throwable th) { // Catch all and keep running. + logger.error("Cannot reload configuration file.", th); + } + }, 5, 5, TimeUnit.SECONDS); } private final void reload() throws IOException { diff --git a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java index f6172bf..4ac623e 100644 --- a/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java +++ b/src/test/java/org/torproject/metrics/collector/conf/ConfigurationTest.java @@ -23,8 +23,6 @@ import java.net.URL; import java.nio.file.Files; import java.nio.file.Paths; import java.util.Arrays; -import java.util.Observable; -import java.util.Observer; import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; @@ -186,11 +184,7 @@ public class ConfigurationTest { public void testConfigChange() throws Exception { Configuration conf = new Configuration(); final AtomicBoolean called = new AtomicBoolean(false); - conf.addObserver(new Observer() { - public void update(Observable obs, Object obj) { - called.set(true); - } - }); + conf.addObserver((obs, obj) -> called.set(true)); File confFile = tmpf.newFile("empty"); Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true") .getBytes()); @@ -208,11 +202,7 @@ public class ConfigurationTest { public void testConfigUnreadable() throws Exception { Configuration conf = new Configuration(); final AtomicBoolean called = new AtomicBoolean(false); - conf.addObserver(new Observer() { - public void update(Observable obs, Object obj) { - called.set(true); - } - }); + conf.addObserver((obs, obj) -> called.set(true)); File confFile = tmpf.newFile("empty"); Files.write(confFile.toPath(), (Key.RelaydescsActivated.name() + "=true") .getBytes());

1 0

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

27 Aug '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/master] Use more powerful Map methods.
by karsten＠torproject.org 27 Aug '18

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

27 Aug '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

[collector/master] Avoid manual array copies.
by karsten＠torproject.org 27 Aug '18

27 Aug '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/master] Replace Option.ifPresent() with functional style.
by karsten＠torproject.org 27 Aug '18

27 Aug '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

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

27 Aug '18

commit b515520fd41f14ebdd0e570b83c10749a3b6efb0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:17:59 2018 +0200 Use Arrays.asList with varargs. --- .../impl/RelayNetworkStatusConsensusImplTest.java | 10 ++--- .../impl/RelayNetworkStatusVoteImplTest.java | 8 ++-- .../descriptor/impl/ServerDescriptorImplTest.java | 45 +++++++++++----------- .../torproject/descriptor/index/IndexNodeTest.java | 16 ++++---- 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index ca8c8e3..53d79c7 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -796,7 +796,7 @@ public class RelayNetworkStatusConsensusImplTest { RelayNetworkStatusConsensus consensus = ConsensusBuilder .createWithRecommendedClientProtocolsLine( "recommended-client-protocols Cons=1,2,3"); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 1L, 2L, 3L })), + assertEquals(new TreeSet<>(Arrays.asList(1L, 2L, 3L)), consensus.getRecommendedClientProtocols().get("Cons")); } @@ -806,7 +806,7 @@ public class RelayNetworkStatusConsensusImplTest { RelayNetworkStatusConsensus consensus = ConsensusBuilder .createWithRecommendedRelayProtocolsLine( "recommended-relay-protocols Cons=1,3-4"); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 1L, 3L, 4L })), + assertEquals(new TreeSet<>(Arrays.asList(1L, 3L, 4L)), consensus.getRecommendedRelayProtocols().get("Cons")); } @@ -816,8 +816,8 @@ public class RelayNetworkStatusConsensusImplTest { RelayNetworkStatusConsensus consensus = ConsensusBuilder .createWithRequiredClientProtocolsLine( "required-client-protocols Cons=1-3,2-4"); - assertEquals(new TreeSet<Long>(Arrays.asList( - new Long[] { 1L, 2L, 3L, 4L })), + assertEquals(new TreeSet<>(Arrays.asList( + 1L, 2L, 3L, 4L)), consensus.getRequiredClientProtocols().get("Cons")); } @@ -827,7 +827,7 @@ public class RelayNetworkStatusConsensusImplTest { RelayNetworkStatusConsensus consensus = ConsensusBuilder .createWithRequiredRelayProtocolsLine( "required-relay-protocols Cons=1-1,1-1"); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 1L })), + assertEquals(new TreeSet<>(Arrays.asList(1L)), consensus.getRequiredRelayProtocols().get("Cons")); } diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java index be6567c..9418a9c 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImplTest.java @@ -267,13 +267,13 @@ public class RelayNetworkStatusVoteImplTest { return vb.buildVote(); } - private List<String> sharedRandCommitLines = Arrays.asList(new String[] { + private List<String> sharedRandCommitLines = Arrays.asList( "shared-rand-commit 1 sha3-256 " + "0232AF901C31A04EE9848595AF9BB7620D4C5B2E " + "AAAAAFieVABh3Aauk2h31FVKaW0xIm28T7VPDkzP5nHwoMItxp7iQg==", "shared-rand-commit 1 sha3-256 " + "14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " - + "AAAAAFieVAA26LuAu9z2UhalmV7zuczWauSkqp1c/bsPA3AkH85iGw==" }); + + "AAAAAFieVAA26LuAu9z2UhalmV7zuczWauSkqp1c/bsPA3AkH85iGw=="); private static RelayNetworkStatusVote createWithSharedRandCommitLines( List<String> lines) throws DescriptorParseException { @@ -701,7 +701,7 @@ public class RelayNetworkStatusVoteImplTest { RelayNetworkStatusVote vote = vb.buildVote(); assertEquals(3, vote.getNetworkStatusVersion()); List<Integer> consensusMethods = Arrays.asList( - new Integer[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}); + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); assertEquals(vote.getConsensusMethods(), consensusMethods); assertEquals(1322643001000L, vote.getPublishedMillis()); assertEquals(1322643600000L, vote.getValidAfterMillis()); @@ -1127,7 +1127,7 @@ public class RelayNetworkStatusVoteImplTest { RelayNetworkStatusVote vote = VoteBuilder.createWithRecommendedRelayProtocolsLine( "recommended-relay-protocols Cons=0"); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 0L })), + assertEquals(new TreeSet<>(Arrays.asList(0L)), vote.getRecommendedRelayProtocols().get("Cons")); } diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index 977a16e..cd0b5dd 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -470,9 +470,9 @@ public class ServerDescriptorImplTest { assertEquals("Tor 0.2.2.35 (git-b04388f9e7546a9f) on Linux i686", descriptor.getPlatform()); assertEquals(new TreeSet<>(Arrays.asList( - new Long[]{1L, 2L, 3L, 4L})), descriptor.getProtocols().get("Link")); + 1L, 2L, 3L, 4L)), descriptor.getProtocols().get("Link")); assertEquals(new TreeSet<>(Arrays.asList( - new Long[]{1L})), descriptor.getProtocols().get("LinkAuth")); + 1L)), descriptor.getProtocols().get("LinkAuth")); assertEquals(1325390599000L, descriptor.getPublishedMillis()); assertEquals("D8733048FC8EC9102466AD8F3098622BF1BF71FD", descriptor.getFingerprint()); @@ -485,7 +485,7 @@ public class ServerDescriptorImplTest { assertTrue(descriptor.isHiddenServiceDir()); assertEquals("Random Person <nobody AT example dot com>", descriptor.getContact()); - assertEquals(Arrays.asList(new String[] {"reject *:*"}), + assertEquals(Arrays.asList("reject *:*"), descriptor.getExitPolicyLines()); assertFalse(descriptor.isHibernating()); assertNull(descriptor.getFamilyEntries()); @@ -673,9 +673,9 @@ public class ServerDescriptorImplTest { public void testProtocolsOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithProtocolsLine("opt protocols Link 1 2 Circuit 1"); - assertEquals(Arrays.asList(new Integer[] {1, 2}), + assertEquals(Arrays.asList(1, 2), descriptor.getLinkProtocolVersions()); - assertEquals(Arrays.asList(new Integer[] {1}), + assertEquals(Arrays.asList(1), descriptor.getCircuitProtocolVersions()); } @@ -683,9 +683,9 @@ public class ServerDescriptorImplTest { public void testProtocolsNoOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithProtocolsLine("protocols Link 1 2 Circuit 1"); - assertEquals(Arrays.asList(new Integer[] {1, 2}), + assertEquals(Arrays.asList(1, 2), descriptor.getLinkProtocolVersions()); - assertEquals(Arrays.asList(new Integer[] {1}), + assertEquals(Arrays.asList(1), descriptor.getCircuitProtocolVersions()); } @@ -710,9 +710,9 @@ public class ServerDescriptorImplTest { public void testProtoGreenPurple() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithProtoLine("proto Green=23 Purple=42"); - assertEquals(new TreeSet<>(Arrays.asList(new Long[]{23L})), + assertEquals(new TreeSet<>(Arrays.asList(23L)), descriptor.getProtocols().get("Green")); - assertEquals(new TreeSet<>(Arrays.asList(new Long[]{42L})), + assertEquals(new TreeSet<>(Arrays.asList(42L)), descriptor.getProtocols().get("Purple")); } @@ -1082,7 +1082,7 @@ public class ServerDescriptorImplTest { throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithExitPolicyLines("reject *:*\naccept *:*"); - assertEquals(Arrays.asList(new String[] {"reject *:*", "accept *:*"}), + assertEquals(Arrays.asList("reject *:*", "accept *:*"), descriptor.getExitPolicyLines()); } @@ -1090,7 +1090,7 @@ public class ServerDescriptorImplTest { public void testExitPolicyOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithExitPolicyLines("opt reject *:*"); - assertEquals(Arrays.asList(new String[] {"reject *:*"}), + assertEquals(Arrays.asList("reject *:*"), descriptor.getExitPolicyLines()); } @@ -1107,8 +1107,8 @@ public class ServerDescriptorImplTest { throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithExitPolicyLines("accept *:80\nreject *:*"); - assertEquals(Arrays.asList(new String[] {"accept *:80", - "reject *:*"}), descriptor.getExitPolicyLines()); + assertEquals(Arrays.asList("accept *:80", + "reject *:*"), descriptor.getExitPolicyLines()); } @Test @@ -1150,8 +1150,8 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithExitPolicyLines("reject 192.168.0.0/16:*\n" + "reject 94.134.192.243/255.255.255.0:*"); - assertEquals(Arrays.asList(new String[] { "reject 192.168.0.0/16:*", - "reject 94.134.192.243/255.255.255.0:*"}), + assertEquals(Arrays.asList("reject 192.168.0.0/16:*", + "reject 94.134.192.243/255.255.255.0:*"), descriptor.getExitPolicyLines()); } @@ -1218,7 +1218,7 @@ public class ServerDescriptorImplTest { public void testFamilyOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithFamilyLine("opt family saberrider2008"); - assertEquals(Arrays.asList(new String[] {"saberrider2008"}), + assertEquals(Arrays.asList("saberrider2008"), descriptor.getFamilyEntries()); } @@ -1227,8 +1227,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithFamilyLine("family " + "$D8733048FC8EC9102466AD8F3098622BF1BF71FD"); - assertEquals(Arrays.asList(new String[] { - "$D8733048FC8EC9102466AD8F3098622BF1BF71FD"}), + assertEquals(Arrays.asList("$D8733048FC8EC9102466AD8F3098622BF1BF71FD"), descriptor.getFamilyEntries()); } @@ -1236,7 +1235,7 @@ public class ServerDescriptorImplTest { public void testFamilyNickname() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithFamilyLine("family saberrider2008"); - assertEquals(Arrays.asList(new String[] {"saberrider2008"}), + assertEquals(Arrays.asList("saberrider2008"), descriptor.getFamilyEntries()); } @@ -1273,8 +1272,8 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithFamilyLine("family " + "$D8733048FC8EC9102466AD8F3098622BF1BF71FD=saberrider2008"); - assertEquals(Arrays.asList(new String[] - { "$D8733048FC8EC9102466AD8F3098622BF1BF71FD=saberrider2008" }), + assertEquals(Arrays.asList( + "$D8733048FC8EC9102466AD8F3098622BF1BF71FD=saberrider2008"), descriptor.getFamilyEntries()); } @@ -1284,8 +1283,8 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithFamilyLine("family " + "$D8733048FC8EC9102466AD8F3098622BF1BF71FD~saberrider2008"); - assertEquals(Arrays.asList(new String[] - { "$D8733048FC8EC9102466AD8F3098622BF1BF71FD~saberrider2008" }), + assertEquals(Arrays.asList( + "$D8733048FC8EC9102466AD8F3098622BF1BF71FD~saberrider2008"), descriptor.getFamilyEntries()); } diff --git a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java index b5c01e3..6695018 100644 --- a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java @@ -95,17 +95,17 @@ public class IndexNodeTest { assertTrue(index.retrieveFilesIn(new String[]{"b2"}).isEmpty()); assertTrue(index.retrieveFilesIn(new String[]{"a1"}).isEmpty()); SortedMap<String, FileNode> oneFile - = index.retrieveFilesIn(new String[]{"a1/p2"}); + = index.retrieveFilesIn("a1/p2"); assertFalse(oneFile.isEmpty()); assertEquals(1330787700_000L, oneFile.get("a1/p2/file3").lastModifiedMillis()); SortedMap<String, FileNode> twoFiles - = index.retrieveFilesIn(new String[]{"y", "a1/x", "a1/p1"}); + = index.retrieveFilesIn("y", "a1/x", "a1/p1"); assertEquals(2, twoFiles.size()); assertEquals(1328192040_000L, twoFiles.get("a1/p1/file2").lastModifiedMillis()); SortedMap<String, FileNode> someFile - = index.retrieveFilesIn(new String[]{"a1"}); + = index.retrieveFilesIn("a1"); assertTrue(someFile.isEmpty()); } @@ -126,17 +126,17 @@ public class IndexNodeTest { public void testRetrieveEmpty() throws Exception { URL indexUrl = getClass().getClassLoader().getResource("index1.json"); IndexNode index = IndexNode.fetchIndex(indexUrl.toString()); - Map<String, FileNode> map = index.retrieveFilesIn(new String[]{}); + Map<String, FileNode> map = index.retrieveFilesIn(); assertTrue("map was " + map, map.isEmpty()); - map = index.retrieveFilesIn(new String[]{}); + map = index.retrieveFilesIn(); assertTrue("map was " + map, map.isEmpty()); - map = index.retrieveFilesIn(new String[]{"/", null, ""}); + map = index.retrieveFilesIn("/", null, ""); assertTrue("map was " + map, map.isEmpty()); indexUrl = getClass().getClassLoader().getResource("index3.json"); index = IndexNode.fetchIndex(indexUrl.toString()); - map = index.retrieveFilesIn(new String[]{"a1/p1"}); + map = index.retrieveFilesIn("a1/p1"); assertTrue("map was " + map, map.isEmpty()); - map = index.retrieveFilesIn(new String[]{"a1/p3"}); + map = index.retrieveFilesIn("a1/p3"); assertTrue("map was " + map, map.isEmpty()); } }

1 0

[metrics-lib/master] Simplify stream chain.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit e3d2556d9c70f8cb3c5aa78e6812639deae8748c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:06:34 2018 +0200 Simplify stream chain. --- src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java index c5cf6e5..8108720 100644 --- a/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java +++ b/src/test/java/org/torproject/descriptor/log/WebServerModuleTest.java @@ -90,7 +90,7 @@ public class WebServerModuleTest { + "/server-status HTTP/1.1\" 200 1201" }; - private static String logText = Arrays.asList(logLines).stream() + private static String logText = Arrays.stream(logLines) .map((String line) -> line + (" some content")) .collect(Collectors.joining("\n"));

1 0

[metrics-lib/master] Remove unnecessary null check.
by karsten＠torproject.org 27 Aug '18

27 Aug '18

commit 880d1437872d80c5e086a3a5814a57f39632b31c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:05:46 2018 +0200 Remove unnecessary null check. --- src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java index 8a17230..a4acc5f 100644 --- a/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java +++ b/src/main/java/org/torproject/descriptor/log/WebServerAccessLogLine.java @@ -166,7 +166,7 @@ public class WebServerAccessLogLine implements WebServerAccessLog.Line { @Override public boolean equals(Object other) { - if (null != other && other instanceof WebServerAccessLogLine) { + if (other instanceof WebServerAccessLogLine) { return this.toLogString() .equals(((WebServerAccessLogLine)other).toLogString()); }

1 0