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

[metrics-lib/release] Use parameterized log statements.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 53857805b626184461c572559ecbab42fc74ee1a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 10:22:58 2018 +0200 Use parameterized log statements. --- .../java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 5ce99e1..46d17ef 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -158,8 +158,8 @@ public class DescriptorReaderImpl implements DescriptorReader { this.readTarballs(); this.hasFinishedReading = true; } catch (Throwable t) { - log.error("Bug: uncaught exception or error while " - + "reading descriptors: " + t.getMessage(), t); + log.error("Bug: uncaught exception or error while reading descriptors.", + t); } finally { if (null != this.descriptorQueue) { this.descriptorQueue.setOutOfDescriptors();

1 0

[metrics-lib/release] Remove redundant string operation.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit a1b07be29685426e13911771b45210f0f6ae33e0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 12:07:50 2018 +0200 Remove redundant string operation. --- src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index 5eb5b6f..6370e87 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -264,7 +264,7 @@ public class RelayDirectoryImpl extends DescriptorImpl sb.append("-----BEGIN RSA PUBLIC KEY-----\n"); String keyString = partsNoOpt[1]; while (keyString.length() > 64) { - sb.append(keyString.substring(0, 64)).append(NL); + sb.append(keyString, 0, 64).append(NL); keyString = keyString.substring(64); } if (keyString.length() > 0) {

1 0

[metrics-lib/release] Remove unnecessary modifiers and semicolons.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit f82e5e587817cf631e6cfcacb687cc49ea196931 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 09:23:25 2018 +0200 Remove unnecessary modifiers and semicolons. --- src/main/java/org/torproject/descriptor/Method.java | 2 +- src/main/java/org/torproject/descriptor/impl/Key.java | 2 +- .../org/torproject/descriptor/impl/RelayDirectoryImpl.java | 2 +- .../torproject/descriptor/log/InternalLogDescriptor.java | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/Method.java b/src/main/java/org/torproject/descriptor/Method.java index 9135fe2..771fb10 100644 --- a/src/main/java/org/torproject/descriptor/Method.java +++ b/src/main/java/org/torproject/descriptor/Method.java @@ -5,5 +5,5 @@ package org.torproject.descriptor; /** Enum for web server access log methods. */ public enum Method { - GET, HEAD, POST; + GET, HEAD, POST } diff --git a/src/main/java/org/torproject/descriptor/impl/Key.java b/src/main/java/org/torproject/descriptor/impl/Key.java index 602df09..f7b613f 100644 --- a/src/main/java/org/torproject/descriptor/impl/Key.java +++ b/src/main/java/org/torproject/descriptor/impl/Key.java @@ -156,7 +156,7 @@ public enum Key { keywordMap.remove(EMPTY.keyword); } - private Key(String keyword) { + Key(String keyword) { this.keyword = keyword; } diff --git a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java index d87b962..5eb5b6f 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayDirectoryImpl.java @@ -357,7 +357,7 @@ public class RelayDirectoryImpl extends DescriptorImpl } else { isLive = true; fingerprint = ParseHelper.parseTwentyByteHexString( - debugLine, part.substring(1));; + debugLine, part.substring(1)); } entry = new RouterStatusEntryImpl(fingerprint, nickname, isLive, isVerified); diff --git a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java index 3c0039b..f77536e 100644 --- a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java @@ -14,14 +14,14 @@ import org.torproject.descriptor.LogDescriptor; public interface InternalLogDescriptor extends LogDescriptor { /** Logfile name parts separator. */ - public static final String SEP = "_"; + String SEP = "_"; /** * Validate log lines. * * @since 2.2.0 */ - public void validate() throws DescriptorParseException; + void validate() throws DescriptorParseException; /** * Set the <code>Validator</code> that will perform the validation on log @@ -31,31 +31,31 @@ public interface InternalLogDescriptor extends LogDescriptor { * * @since 2.2.0 */ - public void setValidator(Validator validator); + void setValidator(Validator validator); /** * Set the descriptor's bytes. * * @since 2.2.0 */ - public void setRawDescriptorBytes(byte[] bytes); + void setRawDescriptorBytes(byte[] bytes); /** Return the descriptor's preferred compression. */ - public String getCompressionType(); + String getCompressionType(); /** * Provides a single function for validating a single log line. * * @since 2.2.0 */ - public interface Validator { + interface Validator { /** * Verifies a log line. * * @since 2.2.0 */ - public boolean validate(String line); + boolean validate(String line); }

1 0

[metrics-lib/release] Access static method via class.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 5ec75a50c87e364920c9547fd2f81f63283d32ca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 19:53:00 2018 +0200 Access static method via class. --- .../org/torproject/descriptor/index/DescriptorIndexCollectorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java index 6e4978b..2ac3359 100644 --- a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java +++ b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java @@ -131,7 +131,7 @@ public class DescriptorIndexCollectorTest { IndexNode in = new IndexNode("2016-01-01 01:01", remoteDirectory, null, dm); File indexFile = tmpf.newFile(name); - in.writeIndex(indexFile.toPath(), in); + IndexNode.writeIndex(indexFile.toPath(), in); return indexFile; }

1 0

[metrics-lib/release] Use diamond operator in a few more places.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 7fcc7e79c8cc4ce007030cdd9cddf5c559d0784b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 09:43:48 2018 +0200 Use diamond operator in a few more places. --- src/main/java/org/torproject/descriptor/index/IndexNode.java | 2 +- .../java/org/torproject/descriptor/index/DirectoryNodeTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 6852681..b6855e3 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -48,7 +48,7 @@ public class IndexNode { /** An empty node, which is not added to JSON output. */ public static final IndexNode emptyNode = new IndexNode("", "", - new TreeSet<FileNode>(), new TreeSet<DirectoryNode>()); + new TreeSet<>(), new TreeSet<>()); private static ObjectMapper objectMapper = new ObjectMapper() .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) diff --git a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java index fc545f6..eff1edf 100644 --- a/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/DirectoryNodeTest.java @@ -17,10 +17,10 @@ public class DirectoryNodeTest { public void testCompare() { DirectoryNode dn1 = new DirectoryNode("a1", null, null); DirectoryNode dn2 = new DirectoryNode("a2", null, - new TreeSet<DirectoryNode>()); + new TreeSet<>()); assertEquals(-1, dn1.compareTo(dn2)); - DirectoryNode dn3 = new DirectoryNode("a1", new TreeSet<FileNode>(), - new TreeSet<DirectoryNode>()); + DirectoryNode dn3 = new DirectoryNode("a1", new TreeSet<>(), + new TreeSet<>()); assertEquals(0, dn1.compareTo(dn3)); assertEquals(1, dn2.compareTo(dn3)); }

1 0

[metrics-lib/release] Avoid string concatenation in a loop.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 273f3c2e13bbf7021b0758ddc52c0e8be071dd4c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:27:24 2018 +0200 Avoid string concatenation in a loop. --- src/main/java/org/torproject/descriptor/index/IndexNode.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 02b5972..6852681 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -137,13 +137,13 @@ public class IndexNode { if (null == currentDir) { continue; } - String currentPath = dirs[0] + "/"; + StringBuilder currentPath = new StringBuilder(dirs[0] + "/"); for (int k = 1; k < dirs.length; k++) { DirectoryNode dn = findPathIn(dirs[k], currentDir.directories); if (null == dn) { break; } else { - currentPath += dirs[k] + "/"; + currentPath.append(dirs[k]).append("/"); currentDir = dn; } } @@ -152,7 +152,7 @@ public class IndexNode { } for (FileNode file : currentDir.files) { if (file.lastModifiedMillis() > 0) { // only add valid files - map.put(currentPath + file.path, file); + map.put(currentPath.toString() + file.path, file); } } }

1 0

[metrics-lib/release] Remove redundant escape in regular expressions.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 18c5864591410eddf30a594fa7508cc7edb26ef4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:51:19 2018 +0200 Remove redundant escape in regular expressions. Turns out that characters inside square brackets don't need to be escaped. In fact, "^[0-9\\.]{7,15}$" does not only match valid IPv4 addresses but also strings like "1\2\3\4". --- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index f196b2f..514bea8 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -44,7 +44,7 @@ public class ParseHelper { return keyword; } - private static Pattern ipv4Pattern = Pattern.compile("^[0-9\\.]{7,15}$"); + private static Pattern ipv4Pattern = Pattern.compile("^[0-9.]{7,15}$"); protected static String parseIpv4Address(String line, String address) throws DescriptorParseException {

1 0

[metrics-lib/release] Make a couple JavaDoc fixes.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 8b4dacfbc061499de0eff2ba7706478574db1fd4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 09:52:26 2018 +0200 Make a couple JavaDoc fixes. --- .../descriptor/DescriptorSourceFactory.java | 4 ++-- .../torproject/descriptor/ExtraInfoDescriptor.java | 2 +- .../org/torproject/descriptor/LogDescriptor.java | 4 ++-- .../descriptor/RelayNetworkStatusConsensus.java | 4 ++-- .../descriptor/RelayNetworkStatusVote.java | 4 ++-- .../org/torproject/descriptor/TorperfResult.java | 26 +++++++++++----------- .../torproject/descriptor/impl/DescriptorImpl.java | 14 ++++++------ .../descriptor/index/DescriptorIndexCollector.java | 6 ++--- .../torproject/descriptor/internal/FileType.java | 2 +- .../descriptor/log/InternalLogDescriptor.java | 2 +- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index 495968c..e755e42 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -31,10 +31,10 @@ import org.slf4j.LoggerFactory; * the following is an example for using a different implementation of the * descriptor downloader: * - * <code> + * {@code * java -Ddescriptor.downloader=my.special.descriptorimpl.Downloader \ * my.app.Mainclass - * </code> + * } * * @since 1.0.0 */ diff --git a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java index 1ffb418..812d6aa 100644 --- a/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java +++ b/src/main/java/org/torproject/descriptor/ExtraInfoDescriptor.java @@ -619,7 +619,7 @@ public interface ExtraInfoDescriptor extends Descriptor { long getPaddingCountsStatsIntervalLength(); /** - * Return padding-counts statistics, or <code>null</code> if no such + * Return padding-counts statistics, or {@code null} if no such * statistics are included. * * @since 1.7.0 diff --git a/src/main/java/org/torproject/descriptor/LogDescriptor.java b/src/main/java/org/torproject/descriptor/LogDescriptor.java index a8448f6..5828441 100644 --- a/src/main/java/org/torproject/descriptor/LogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/LogDescriptor.java @@ -13,7 +13,8 @@ import java.util.stream.Stream; * Unlike other descriptors, logs can get very large and are typically stored * on disk in compressed form. Access to log contents through this * interface and its subinterfaces is made available in compressed and - * decompressed form: + * decompressed form: + * * <ul> * <li>The raw descriptor bytes are compressed, because logs contain * often redundant information that can achieve high compression rates. @@ -21,7 +22,6 @@ import java.util.stream.Stream; * <li>The uncompressed log contents can be accessed as a stream of bytes.</li> * <li>A list of log lines (decompressed) can be retrieved.</li> * </ul> - * * * @since 2.2.0 */ diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java index e03f40b..e8ec89f 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusConsensus.java @@ -150,8 +150,8 @@ public interface RelayNetworkStatusConsensus extends Descriptor { /** * Return a list of software packages and their versions together with a - * URL and one or more digests in the format <code>PackageName Version - * URL DIGESTS</code> that are known by at least three directory + * URL and one or more digests in the format {@code PackageName Version + * URL DIGESTS} that are known by at least three directory * authorities and agreed upon by the majority of directory authorities, * or null if the consensus does not contain package information. * diff --git a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java index a507d8c..9514765 100644 --- a/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java +++ b/src/main/java/org/torproject/descriptor/RelayNetworkStatusVote.java @@ -138,8 +138,8 @@ public interface RelayNetworkStatusVote extends Descriptor { /** * Return a list of software packages and their versions together with a - * URL and one or more digests in the format <code>PackageName Version - * URL DIGESTS</code> that are known by this directory authority, or + * URL and one or more digests in the format {@code PackageName Version + * URL DIGESTS} that are known by this directory authority, or * null if this descriptor does not contain package information. * * @since 1.3.0 diff --git a/src/main/java/org/torproject/descriptor/TorperfResult.java b/src/main/java/org/torproject/descriptor/TorperfResult.java index c92ae78..add36ff 100644 --- a/src/main/java/org/torproject/descriptor/TorperfResult.java +++ b/src/main/java/org/torproject/descriptor/TorperfResult.java @@ -215,8 +215,8 @@ public interface TorperfResult extends Descriptor { /** * Return the hostname, IP address, and port that the TGen client used to * connect to the local tor SOCKS port, formatted as - * <code>hostname:ip:port</code>, which may be <code>"NULL:0.0.0.0:0"</code> - * if TGen was not able to find this information or <code>null</code> if the + * {@code hostname:ip:port}, which may be {@code "NULL:0.0.0.0:0"} + * if TGen was not able to find this information or {@code null} if the * OnionPerf line didn't contain this information. * * @since 1.7.0 @@ -226,8 +226,8 @@ public interface TorperfResult extends Descriptor { /** * Return the hostname, IP address, and port that the TGen client used to * connect to the SOCKS proxy server that tor runs, formatted as - * <code>hostname:ip:port</code>, which may be <code>"NULL:0.0.0.0:0"</code> - * if TGen was not able to find this information or <code>null</code> if the + * {@code hostname:ip:port}, which may be {@code "NULL:0.0.0.0:0"} + * if TGen was not able to find this information or {@code null} if the * OnionPerf line didn't contain this information. * * @since 1.7.0 @@ -236,9 +236,9 @@ public interface TorperfResult extends Descriptor { /** * Return the hostname, IP address, and port that the TGen client used to - * connect to the remote server, formatted as <code>hostname:ip:port</code>, - * which may be <code>"NULL:0.0.0.0:0"</code> if TGen was not able to find - * this information or <code>null</code> if the OnionPerf line didn't contain + * connect to the remote server, formatted as {@code hostname:ip:port}, + * which may be {@code "NULL:0.0.0.0:0"} if TGen was not able to find + * this information or {@code null} if the OnionPerf line didn't contain * this information. * * @since 1.7.0 @@ -246,8 +246,8 @@ public interface TorperfResult extends Descriptor { String getEndpointRemote(); /** - * Return the client machine hostname, which may be <code>"(NULL)"</code> if - * the TGen client was not able to find this information or <code>null</code> + * Return the client machine hostname, which may be {@code "(NULL)"} if + * the TGen client was not able to find this information or {@code null} * if the OnionPerf line didn't contain this information. * * @since 1.7.0 @@ -255,8 +255,8 @@ public interface TorperfResult extends Descriptor { String getHostnameLocal(); /** - * Return the server machine hostname, which may be <code>"(NULL)"</code> if - * the TGen server was not able to find this information or <code>null</code> + * Return the server machine hostname, which may be {@code "(NULL)"} if + * the TGen server was not able to find this information or {@code null} * if the OnionPerf line didn't contain this information. * * @since 1.7.0 @@ -266,8 +266,8 @@ public interface TorperfResult extends Descriptor { /** * Return the public IP address of the OnionPerf host obtained by connecting * to well-known servers and finding the IP address in the result, which may - * be <code>"unknown"</code> if OnionPerf was not able to find this - * information or <code>null</code> if the OnionPerf line didn't contain this + * be {@code "unknown"} if OnionPerf was not able to find this + * information or {@code null} if the OnionPerf line didn't contain this * information. * * @since 1.7.0 diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 70fe7c6..1ae85d6 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -60,7 +60,7 @@ public abstract class DescriptorImpl implements Descriptor { } /** - * Returns a <emph>copy</emph> of the full raw descriptor bytes. + * Returns a copy of the full raw descriptor bytes. * * If possible, subclasses should avoid retrieving raw descriptor bytes and * converting them to a String themselves and instead rely on @@ -74,8 +74,8 @@ public abstract class DescriptorImpl implements Descriptor { } /** - * Returns a <emph>copy</emph> of raw descriptor bytes starting at - * <code>offset</code> and containing <code>length</code> bytes. + * Returns a copy of raw descriptor bytes starting at + * {@code offset} and containing {@code length} bytes. * * If possible, subclasses should avoid retrieving raw descriptor bytes and * converting them to a String themselves and instead rely on @@ -109,7 +109,7 @@ public abstract class DescriptorImpl implements Descriptor { /** * Returns a new {@link Scanner} for parsing the raw descriptor starting at - * byte <code>offset</code> containing <code>length</code> bytes using UTF-8 + * byte {@code offset} containing {@code length} bytes using UTF-8 * as charset. * * @param offset The index of the first byte to parse. @@ -123,7 +123,7 @@ public abstract class DescriptorImpl implements Descriptor { /** * Returns the index within the raw descriptor of the first occurrence of the - * given <code>key</code>, or <code>-1</code> if the key is not contained. + * given {@code key}, or {@code -1} if the key is not contained. * * @param key Key to search for. * @return Index of the first occurrence, or -1. @@ -148,8 +148,8 @@ public abstract class DescriptorImpl implements Descriptor { /** * Returns a list of two-element arrays containing offsets and lengths of - * descriptors starting with the given <code>key</code> in the raw descriptor - * starting at byte <code>offset</code> containing <code>length</code> bytes. + * descriptors starting with the given {@code key} in the raw descriptor + * starting at byte {@code offset} containing {@code length} bytes. * * @param key Key to search for. * @param offset The index of the first byte to split. diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index 774708f..9e053dc 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -34,11 +34,11 @@ public class DescriptorIndexCollector implements DescriptorCollector { .getLogger(DescriptorIndexCollector.class); /** - * If <code>collecTorIndexUrlString</code> contains just the + * If {@code collecTorIndexUrlString} contains just the * base url, e.g. https://some.host.org, the path - * <code>/index/index.json</code> will be appended. + * {@code /index/index.json} will be appended. * If a path is given (even just a final slash, e.g. https://some.host.org/) - * the <code>collecTorIndexUrlString</code> will be used as is. + * the {@code collecTorIndexUrlString} will be used as is. */ @Override public void collectDescriptors(String collecTorIndexUrlString, diff --git a/src/main/java/org/torproject/descriptor/internal/FileType.java b/src/main/java/org/torproject/descriptor/internal/FileType.java index 95acf2f..8f42624 100644 --- a/src/main/java/org/torproject/descriptor/internal/FileType.java +++ b/src/main/java/org/torproject/descriptor/internal/FileType.java @@ -43,7 +43,7 @@ public enum FileType { } /** - * Returns <code>valueOf</code> or the default enum {@link #PLAIN}, i.e., + * Returns {@code valueOf} or the default enum {@link #PLAIN}, i.e., * this method doesn't throw any exceptions and allways returns a valid enum. * * @since 2.1.0 diff --git a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java index f77536e..558f02a 100644 --- a/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java +++ b/src/main/java/org/torproject/descriptor/log/InternalLogDescriptor.java @@ -24,7 +24,7 @@ public interface InternalLogDescriptor extends LogDescriptor { void validate() throws DescriptorParseException; /** - * Set the <code>Validator</code> that will perform the validation on log + * Set the {@code Validator} that will perform the validation on log * lines. * * Usually set by the implementing class.

1 0

[metrics-lib/release] Use Map.putIfAbsent and Map.getOrDefault where possible.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 7c26323811d733643f9042611c55cdaeec4e3cc4 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 15:05:26 2018 +0200 Use Map.putIfAbsent and Map.getOrDefault where possible. --- .../org/torproject/descriptor/impl/DescriptorImpl.java | 17 +++++------------ .../descriptor/impl/DescriptorReaderImpl.java | 3 +-- .../descriptor/impl/NetworkStatusEntryImpl.java | 4 +--- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 1ae85d6..b6dbf74 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -279,11 +279,7 @@ public abstract class DescriptorImpl implements Descriptor { this.firstKey = key; } lastKey = key; - if (parsedKeys.containsKey(key)) { - parsedKeys.put(key, parsedKeys.get(key) + 1); - } else { - parsedKeys.put(key, 1); - } + parsedKeys.put(key, parsedKeys.getOrDefault(key, 0) + 1); } } } @@ -307,10 +303,7 @@ public abstract class DescriptorImpl implements Descriptor { protected void checkExactlyOnceKeys(Set<Key> keys) throws DescriptorParseException { for (Key key : keys) { - int contained = 0; - if (this.parsedKeys.containsKey(key)) { - contained = this.parsedKeys.get(key); - } + int contained = this.parsedKeys.getOrDefault(key, 0); if (contained != 1) { throw new DescriptorParseException("Keyword '" + key.keyword + "' is " + "contained " + contained + " times, but must be contained " @@ -332,10 +325,10 @@ public abstract class DescriptorImpl implements Descriptor { protected void checkAtMostOnceKeys(Set<Key> keys) throws DescriptorParseException { for (Key key : keys) { - if (this.parsedKeys.containsKey(key) - && this.parsedKeys.get(key) > 1) { + int contained = this.parsedKeys.getOrDefault(key, 0); + if (contained > 1) { throw new DescriptorParseException("Keyword '" + key.keyword + "' is " - + "contained " + this.parsedKeys.get(key) + " times, " + + "contained " + contained + " times, " + "but must be contained at most once."); } } diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index bbe467e..b8eb191 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -229,8 +229,7 @@ public class DescriptorReaderImpl implements DescriptorReader { try { String absolutePath = file.getAbsolutePath(); long lastModifiedMillis = file.lastModified(); - if (this.excludedFilesBefore.containsKey(absolutePath) - && this.excludedFilesBefore.get(absolutePath) + if (this.excludedFilesBefore.getOrDefault(absolutePath, 0L) == lastModifiedMillis) { this.excludedFilesAfter.put(absolutePath, lastModifiedMillis); continue; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 9ebedbd..2ddaaa0 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -217,9 +217,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { if (pairs.containsKey("Unmeasured")) { this.unmeasured = pairs.remove("Unmeasured") == 1L; } - if (!pairs.isEmpty()) { - /* Ignore unknown key-value pair. */ - } + /* Ignore unknown key-value pair. */ } private void parsePLine(String line, String[] parts)

1 0

[metrics-lib/release] Inline redundant local variables.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 4a1c02c61a9853fc93a087f51cbf020fe315447c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 14:10:29 2018 +0200 Inline redundant local variables. --- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 4 +--- .../descriptor/impl/RelayNetworkStatusConsensusImplTest.java | 9 +++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 514bea8..dcb365e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -477,9 +477,7 @@ public class ParseHelper { masterKeyEd25519, 0, masterKeyEd25519.length); String masterKeyEd25519Base64 = Base64.encodeBase64String(masterKeyEd25519).replaceAll("=", ""); - String masterKeyEd25519Base64NoTrailingEqualSigns = - masterKeyEd25519Base64.replaceAll("=", ""); - return masterKeyEd25519Base64NoTrailingEqualSigns; + return masterKeyEd25519Base64.replaceAll("=", ""); } extensionStart += 4 + extensionLength; } diff --git a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java index 53d79c7..b4c7d8a 100644 --- a/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImplTest.java @@ -141,9 +141,8 @@ public class RelayNetworkStatusConsensusImplTest { sb.append(this.voteDigestLine).append("\n"); } String dirSourceWithTrailingNewLine = sb.toString(); - String dirSource = dirSourceWithTrailingNewLine.substring(0, + return dirSourceWithTrailingNewLine.substring(0, dirSourceWithTrailingNewLine.length() - 1); - return dirSource; } } @@ -299,9 +298,8 @@ public class RelayNetworkStatusConsensusImplTest { sb.append(this.pLine).append("\n"); } String statusEntryWithTrailingNewLine = sb.toString(); - String statusEntry = statusEntryWithTrailingNewLine.substring(0, + return statusEntryWithTrailingNewLine.substring(0, statusEntryWithTrailingNewLine.length() - 1); - return statusEntry; } } @@ -339,7 +337,7 @@ public class RelayNetworkStatusConsensusImplTest { } private String buildDirectorySignature() { - String directorySignature = "directory-signature " + identity + " " + return "directory-signature " + identity + " " + signingKey + "\n" + "-----BEGIN SIGNATURE-----\n" + "gE64+/4BH43v1+7jS9FK1tu2+94at8xhVSPn4O/PpOx7b0Yb+S1hac1QHAiS" @@ -348,7 +346,6 @@ public class RelayNetworkStatusConsensusImplTest { + "P3JG\n" + "z89A+wrsN17I5490y66AEvws54BYZMbgRfp8HXn/0Ss=\n" + "-----END SIGNATURE-----"; - return directorySignature; } }

1 0