tor-commits September 2018

tor-commits@lists.torproject.org

17 participants
3230 discussions

[metrics-lib/release] Use more powerful Map methods.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 27fe727b7c830195d41deb1840165227ca01ba97 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:20:45 2018 +0200 Use more powerful Map methods. --- src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java index 2e7b0f9..70fe7c6 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorImpl.java @@ -354,11 +354,7 @@ public abstract class DescriptorImpl implements Descriptor { } protected int getKeyCount(Key key) { - if (!this.parsedKeys.containsKey(key)) { - return 0; - } else { - return this.parsedKeys.get(key); - } + return this.parsedKeys.getOrDefault(key, 0); } protected void clearParsedKeys() {

1 0

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

26 Sep '18

commit 1335a527a7ba745177a08ce9e5c3f86d19ae88fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:00:36 2018 +0200 Remove unnecessary boxing. --- .../org/torproject/descriptor/DescriptorTest.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/DescriptorTest.java b/src/test/java/org/torproject/descriptor/DescriptorTest.java index 85ea813..9e32ac9 100644 --- a/src/test/java/org/torproject/descriptor/DescriptorTest.java +++ b/src/test/java/org/torproject/descriptor/DescriptorTest.java @@ -29,58 +29,58 @@ public class DescriptorTest { {"other/2017-07-17-17-02-00", // test-filename in src/test/resources ExitList.class, // descriptor type, i.e., the most specific interface new String[] {"@type tordnsel 1.0"}, // all annotations - Integer.valueOf(1)}, // expected descriptor count in descriptor file + 1}, // expected descriptor count in descriptor file {"other/op-nl-5242880-2017-07-17.tpf", TorperfResult.class, new String[] {"@type torperf 1.1"}, - Integer.valueOf(4)}, + 4}, {"relay/2017-07-17-17-00-00-consensus", RelayNetworkStatusConsensus.class, new String[] {"@type network-status-consensus-3 1.0"}, - Integer.valueOf(1)}, + 1}, {"relay/2017-07-17-17-00-00-consensus-microdesc", RelayNetworkStatusConsensus.class, new String[] {"@type network-status-microdesc-consensus-3 1.0"}, - Integer.valueOf(1)}, + 1}, {"relay/2017-07-17-17-00-00-vote-0232AF901C31A04EE9848595AF9BB" + "7620D4C5B2E-6C2F5B0D52DFB3E4CA3DDEEAD690CC563CAF0601", RelayNetworkStatusVote.class, new String[] {"@type network-status-vote-3 1.0"}, - Integer.valueOf(1)}, + 1}, {"relay/2017-07-17-17-20-00-extra-infos", RelayExtraInfoDescriptor.class, new String[] {"@type extra-info 1.0"}, - Integer.valueOf(6)}, + 6}, {"relay/2017-07-17-17-20-00-micro", Microdescriptor.class, new String[] {"@type microdescriptor 1.0"}, - Integer.valueOf(14)}, + 14}, {"relay/2017-07-17-17-20-00-server-descriptors", RelayServerDescriptor.class, new String[] {"@type server-descriptor 1.0"}, - Integer.valueOf(4)}, + 4}, {"bridge/20170717-170645-1D8F3A91C37C5D1C4C19B1AD1D0CFBE8BF72D8E1", BridgeNetworkStatus.class, new String[] {"@type bridge-network-status 1.2"}, - Integer.valueOf(1)}, + 1}, {"bridge/2017-07-17-17-09-00-extra-infos", BridgeExtraInfoDescriptor.class, new String[] {"@type bridge-extra-info 1.3"}, - Integer.valueOf(6)}, + 6}, {"bridge/2017-07-17-17-09-00-server-descriptors", BridgeServerDescriptor.class, new String[] {"@type bridge-server-descriptor 1.2"}, - Integer.valueOf(13)} + 13} }); }

1 0

[metrics-lib/release] Avoid manual array copies.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 438c8ee334f3ec16ec83fcc81ec72c39d971cab6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:42:09 2018 +0200 Avoid manual array copies. --- .../torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java | 4 +--- .../java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java | 4 +--- .../org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index bb14c28..904dc35 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -285,9 +285,7 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl + "'."); } String[] knownFlags = new String[parts.length - 1]; - for (int i = 1; i < parts.length; i++) { - knownFlags[i - 1] = parts[i]; - } + System.arraycopy(parts, 1, knownFlags, 0, parts.length - 1); this.knownFlags = knownFlags; } diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java index 93c66de..11cc631 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusImpl.java @@ -223,9 +223,7 @@ public class RelayNetworkStatusImpl extends NetworkStatusImpl private void parseDirOptionsLine(String[] parts) { String[] dirOptions = new String[parts.length - 1]; - for (int i = 1; i < parts.length; i++) { - dirOptions[i - 1] = parts[i]; - } + System.arraycopy(parts, 1, dirOptions, 0, parts.length - 1); this.dirOptions = dirOptions; } diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java index d686fa5..bb71842 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusVoteImpl.java @@ -355,9 +355,7 @@ public class RelayNetworkStatusVoteImpl extends NetworkStatusImpl + "'."); } String[] knownFlags = new String[parts.length - 1]; - for (int i = 1; i < parts.length; i++) { - knownFlags[i - 1] = parts[i]; - } + System.arraycopy(parts, 1, knownFlags, 0, parts.length - 1); this.knownFlags = knownFlags; }

1 0

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

26 Sep '18

commit d15ef8018b560e9054dbf926bedccdaa51711682 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 15:52:48 2018 +0200 Remove redundant casts. --- .../descriptor/impl/ServerDescriptorImplTest.java | 56 +++++++++++----------- .../descriptor/impl/TorperfResultImplTest.java | 12 ++--- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java index b81c3fb..977a16e 100644 --- a/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ServerDescriptorImplTest.java @@ -464,22 +464,22 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = db.buildDescriptor(); assertEquals("saberrider2008", descriptor.getNickname()); assertEquals("94.134.192.243", descriptor.getAddress()); - assertEquals(9001, (int) descriptor.getOrPort()); - assertEquals(0, (int) descriptor.getSocksPort()); - assertEquals(0, (int) descriptor.getDirPort()); + assertEquals(9001, descriptor.getOrPort()); + assertEquals(0, descriptor.getSocksPort()); + assertEquals(0, descriptor.getDirPort()); assertEquals("Tor 0.2.2.35 (git-b04388f9e7546a9f) on Linux i686", descriptor.getPlatform()); - assertEquals(new TreeSet<Long>(Arrays.asList( - new Long[] { 1L, 2L, 3L, 4L })), descriptor.getProtocols().get("Link")); - assertEquals(new TreeSet<Long>(Arrays.asList( - new Long[] { 1L })), descriptor.getProtocols().get("LinkAuth")); + assertEquals(new TreeSet<>(Arrays.asList( + new Long[]{1L, 2L, 3L, 4L})), descriptor.getProtocols().get("Link")); + assertEquals(new TreeSet<>(Arrays.asList( + new Long[]{1L})), descriptor.getProtocols().get("LinkAuth")); assertEquals(1325390599000L, descriptor.getPublishedMillis()); assertEquals("D8733048FC8EC9102466AD8F3098622BF1BF71FD", descriptor.getFingerprint()); assertEquals(48, descriptor.getUptime().longValue()); - assertEquals(51200, (int) descriptor.getBandwidthRate()); - assertEquals(51200, (int) descriptor.getBandwidthBurst()); - assertEquals(53470, (int) descriptor.getBandwidthObserved()); + assertEquals(51200, descriptor.getBandwidthRate()); + assertEquals(51200, descriptor.getBandwidthBurst()); + assertEquals(53470, descriptor.getBandwidthObserved()); assertEquals("1469D1550738A25B1E7B47CDDBCD7B2899F51B74", descriptor.getExtraInfoDigestSha1Hex()); assertTrue(descriptor.isHiddenServiceDir()); @@ -516,9 +516,9 @@ public class ServerDescriptorImplTest { + "94.134.192.243 9001 0 0"); assertEquals("saberrider2008", descriptor.getNickname()); assertEquals("94.134.192.243", descriptor.getAddress()); - assertEquals(9001, (int) descriptor.getOrPort()); - assertEquals(0, (int) descriptor.getSocksPort()); - assertEquals(0, (int) descriptor.getDirPort()); + assertEquals(9001, descriptor.getOrPort()); + assertEquals(0, descriptor.getSocksPort()); + assertEquals(0, descriptor.getDirPort()); } @Test @@ -710,9 +710,9 @@ public class ServerDescriptorImplTest { public void testProtoGreenPurple() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithProtoLine("proto Green=23 Purple=42"); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 23L })), + assertEquals(new TreeSet<>(Arrays.asList(new Long[]{23L})), descriptor.getProtocols().get("Green")); - assertEquals(new TreeSet<Long>(Arrays.asList(new Long[] { 42L })), + assertEquals(new TreeSet<>(Arrays.asList(new Long[]{42L})), descriptor.getProtocols().get("Purple")); } @@ -876,9 +876,9 @@ public class ServerDescriptorImplTest { public void testBandwidthOpt() throws DescriptorParseException { ServerDescriptor descriptor = DescriptorBuilder .createWithBandwidthLine("opt bandwidth 51200 51200 53470"); - assertEquals(51200, (int) descriptor.getBandwidthRate()); - assertEquals(51200, (int) descriptor.getBandwidthBurst()); - assertEquals(53470, (int) descriptor.getBandwidthObserved()); + assertEquals(51200, descriptor.getBandwidthRate()); + assertEquals(51200, descriptor.getBandwidthBurst()); + assertEquals(53470, descriptor.getBandwidthObserved()); } @Test @@ -904,9 +904,9 @@ public class ServerDescriptorImplTest { * value. */ ServerDescriptor descriptor = DescriptorBuilder .createWithBandwidthLine("bandwidth 51200 51200"); - assertEquals(51200, (int) descriptor.getBandwidthRate()); - assertEquals(51200, (int) descriptor.getBandwidthBurst()); - assertEquals(-1, (int) descriptor.getBandwidthObserved()); + assertEquals(51200, descriptor.getBandwidthRate()); + assertEquals(51200, descriptor.getBandwidthBurst()); + assertEquals(-1, descriptor.getBandwidthObserved()); } @Test @@ -1298,9 +1298,9 @@ public class ServerDescriptorImplTest { assertNotNull(descriptor.getWriteHistory()); BandwidthHistory parsedWriteHistory = descriptor.getWriteHistory(); assertEquals(writeHistoryLine, parsedWriteHistory.getLine()); - assertEquals(1325389904000L, (long) parsedWriteHistory + assertEquals(1325389904000L, parsedWriteHistory .getHistoryEndMillis()); - assertEquals(900L, (long) parsedWriteHistory.getIntervalLength()); + assertEquals(900L, parsedWriteHistory.getIntervalLength()); SortedMap<Long, Long> bandwidthValues = parsedWriteHistory .getBandwidthValues(); assertEquals(4345856L, (long) bandwidthValues.remove(1325387204000L)); @@ -1386,7 +1386,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithWriteHistoryLine("write-history 2012-01-01 03:51:44 " + "(900 s) "); - assertEquals(900, (long) descriptor.getWriteHistory() + assertEquals(900, descriptor.getWriteHistory() .getIntervalLength()); assertTrue(descriptor.getWriteHistory().getBandwidthValues() .isEmpty()); @@ -1398,7 +1398,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithWriteHistoryLine("write-history 2012-01-01 03:51:44 " + "(900 s)"); - assertEquals(900, (long) descriptor.getWriteHistory() + assertEquals(900, descriptor.getWriteHistory() .getIntervalLength()); assertTrue(descriptor.getWriteHistory().getBandwidthValues() .isEmpty()); @@ -1426,7 +1426,7 @@ public class ServerDescriptorImplTest { ServerDescriptor descriptor = DescriptorBuilder .createWithWriteHistoryLine("write-history 2012-01-01 03:51:44 " + "(1800 s) 4345856"); - assertEquals(1800L, (long) descriptor.getWriteHistory() + assertEquals(1800L, descriptor.getWriteHistory() .getIntervalLength()); } @@ -1439,9 +1439,9 @@ public class ServerDescriptorImplTest { assertNotNull(descriptor.getReadHistory()); BandwidthHistory parsedReadHistory = descriptor.getReadHistory(); assertEquals(readHistoryLine, parsedReadHistory.getLine()); - assertEquals(1325389904000L, (long) parsedReadHistory + assertEquals(1325389904000L, parsedReadHistory .getHistoryEndMillis()); - assertEquals(900L, (long) parsedReadHistory.getIntervalLength()); + assertEquals(900L, parsedReadHistory.getIntervalLength()); SortedMap<Long, Long> bandwidthValues = parsedReadHistory .getBandwidthValues(); assertEquals(4268032L, (long) bandwidthValues.remove(1325387204000L)); diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index 7bc689e..2af458f 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -41,12 +41,12 @@ public class TorperfResultImplTest { List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(0))).getAnnotations().size()); + result.get(0).getAnnotations().size()); assertEquals(3, result.size()); assertEquals("Expected zero annotations.", 0, - ((TorperfResultImpl)(result.get(1))).getAnnotations().size()); + result.get(1).getAnnotations().size()); assertEquals("Expected zero annotations.", 0, - ((TorperfResultImpl)(result.get(2))).getAnnotations().size()); + result.get(2).getAnnotations().size()); } @Test @@ -57,12 +57,12 @@ public class TorperfResultImplTest { List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(0))).getAnnotations().size()); + result.get(0).getAnnotations().size()); assertEquals(3, result.size()); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(1))).getAnnotations().size()); + result.get(1).getAnnotations().size()); assertEquals("Expected one annotation.", 1, - ((TorperfResultImpl)(result.get(2))).getAnnotations().size()); + result.get(2).getAnnotations().size()); } @Test

1 0

[metrics-lib/release] Remove unnecessary null check.
by karsten＠torproject.org 26 Sep '18

26 Sep '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

[metrics-lib/release] Use Arrays.asList with varargs.
by karsten＠torproject.org 26 Sep '18

26 Sep '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/release] Simplify stream chain.
by karsten＠torproject.org 26 Sep '18

26 Sep '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/release] Remove redundant initializers.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 9cb9b78d945a78c90d12a3874c50f69bba7736b6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 16:29:47 2018 +0200 Remove redundant initializers. --- .../java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/Key.java | 2 +- .../java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java | 2 +- src/main/java/org/torproject/descriptor/impl/ParseHelper.java | 2 +- src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java | 2 +- .../org/torproject/descriptor/index/DescriptorIndexCollector.java | 4 ++-- src/main/java/org/torproject/descriptor/internal/FileType.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index a8a7790..8b0c64c 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -178,7 +178,7 @@ public class DescriptorReaderImpl implements DescriptorReader { if (historyFile == null || !historyFile.exists()) { return; } - List<String> lines = null; + List<String> lines; try { lines = Files.readAllLines(historyFile.toPath(), StandardCharsets.UTF_8); diff --git a/src/main/java/org/torproject/descriptor/impl/Key.java b/src/main/java/org/torproject/descriptor/impl/Key.java index 763ecbf..602df09 100644 --- a/src/main/java/org/torproject/descriptor/impl/Key.java +++ b/src/main/java/org/torproject/descriptor/impl/Key.java @@ -163,7 +163,7 @@ public enum Key { /** Retrieve a Key for a keyword. * Returns Key.INVALID for non-existing keywords. */ public static Key get(String keyword) { - Key res = INVALID; + Key res; try { res = keywordMap.get(keyword); } catch (Throwable th) { diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 3c0c1af..9ebedbd 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -77,7 +77,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { * this.parent.length as bounds, which is not what we want! */ Scanner scanner = this.parent.newScanner(this.offset, this.length) .useDelimiter(NL); - String line = null; + String line; if (!scanner.hasNext() || !(line = scanner.next()).startsWith("r ")) { throw new DescriptorParseException("Status entry must start with " + "an r line."); diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index 60a9ff3..0694aff 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -116,7 +116,7 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { protected String[] parseClientOrServerVersions(String line, String[] parts) throws DescriptorParseException { - String[] result = null; + String[] result; switch (parts.length) { case 1: result = new String[0]; diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 93ad610..1bba92e 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -77,7 +77,7 @@ public class ParseHelper { protected static int parsePort(String line, String portString) throws DescriptorParseException { - int port = -1; + int port; try { port = Integer.parseInt(portString); } catch (NumberFormatException e) { diff --git a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java index 5a8ec66..47de53f 100644 --- a/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/TorperfResultImpl.java @@ -300,7 +300,7 @@ public class TorperfResultImpl extends DescriptorImpl String line) throws DescriptorParseException { String key = keyValue.substring(0, keyValue.indexOf("=")); String percentileString = key.substring("DATAPERC".length()); - int percentile = -1; + int percentile; try { percentile = Integer.parseInt(percentileString); } catch (NumberFormatException e) { diff --git a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java index 48bb40c..774708f 100644 --- a/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java +++ b/src/main/java/org/torproject/descriptor/index/DescriptorIndexCollector.java @@ -62,8 +62,8 @@ public class DescriptorIndexCollector implements DescriptorCollector { } log.info("Indexing local directory {}.", localDirectory.getAbsolutePath()); SortedMap<String, Long> localFiles = statLocalDirectory(localDirectory); - SortedMap<String, FileNode> remoteFiles = null; - IndexNode index = null; + SortedMap<String, FileNode> remoteFiles; + IndexNode index; String indexUrlString = ""; try { URL indexUrl = new URL(collecTorIndexUrlString); diff --git a/src/main/java/org/torproject/descriptor/internal/FileType.java b/src/main/java/org/torproject/descriptor/internal/FileType.java index 2c07df6..95acf2f 100644 --- a/src/main/java/org/torproject/descriptor/internal/FileType.java +++ b/src/main/java/org/torproject/descriptor/internal/FileType.java @@ -49,7 +49,7 @@ public enum FileType { * @since 2.1.0 */ public static FileType findType(String ext) { - FileType res = null; + FileType res; try { res = FileType.valueOf(ext.toUpperCase()); return res;

1 0

[metrics-lib/release] Remove unused attribute.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit ccd8bbaedfb619d07fabcb2aee4cf4ab51f7a9a1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 19:57:06 2018 +0200 Remove unused attribute. --- .../java/org/torproject/descriptor/impl/DescriptorReaderImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java index 8b0c64c..5ce99e1 100644 --- a/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -125,8 +125,6 @@ public class DescriptorReaderImpl implements DescriptorReader { private BlockingIteratorImpl<Descriptor> descriptorQueue; - private File autoSaveHistoryFile; - private File manualSaveHistoryFile; private List<File> tarballs = new ArrayList<>(); @@ -146,7 +144,6 @@ public class DescriptorReaderImpl implements DescriptorReader { File manualSaveHistoryFile, SortedMap<String, Long> excludedFiles) { this.descriptorFiles = descriptorFiles; this.descriptorQueue = descriptorQueue; - this.autoSaveHistoryFile = autoSaveHistoryFile; this.manualSaveHistoryFile = manualSaveHistoryFile; if (excludedFiles != null) { this.excludedFilesBefore = excludedFiles; @@ -156,7 +153,6 @@ public class DescriptorReaderImpl implements DescriptorReader { public void run() { try { - this.readOldHistory(this.autoSaveHistoryFile); this.readOldHistory(this.manualSaveHistoryFile); this.readDescriptorFiles(); this.readTarballs(); @@ -169,9 +165,6 @@ public class DescriptorReaderImpl implements DescriptorReader { this.descriptorQueue.setOutOfDescriptors(); } } - if (this.hasFinishedReading) { - this.writeNewHistory(this.autoSaveHistoryFile); - } } private void readOldHistory(File historyFile) {

1 0

[metrics-lib/release] Delete methods that only call their super.
by karsten＠torproject.org 26 Sep '18

26 Sep '18

commit 014917d377662c3cf3bb345a0435797e98115c1d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Aug 20 20:16:31 2018 +0200 Delete methods that only call their super. --- .../org/torproject/descriptor/impl/ParseHelper.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java index 1bba92e..f196b2f 100644 --- a/src/main/java/org/torproject/descriptor/impl/ParseHelper.java +++ b/src/main/java/org/torproject/descriptor/impl/ParseHelper.java @@ -154,24 +154,7 @@ public class ParseHelper { } private static ThreadLocal<Map<String, DateFormat>> dateFormats = - new ThreadLocal<Map<String, DateFormat>>() { - - public Map<String, DateFormat> get() { - return super.get(); - } - - protected Map<String, DateFormat> initialValue() { - return new HashMap<>(); - } - - public void remove() { - super.remove(); - } - - public void set(Map<String, DateFormat> value) { - super.set(value); - } - }; + ThreadLocal.withInitial(HashMap::new); static DateFormat getDateFormat(String format) { Map<String, DateFormat> threadDateFormats = dateFormats.get();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2018