November 2019 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit eae86058cd98622614cd5325bf5cb4c856db6e67 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 11:52:03 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd index 260fc7af9..c12f8b6da 100644 --- a/nl/torbutton.dtd +++ b/nl/torbutton.dtd @@ -1,5 +1,5 @@ <!ENTITY torbutton.context_menu.new_identity "Nieuwe identiteit"> -<!ENTITY torbutton.context_menu.new_identity_key "i"> +<!ENTITY torbutton.context_menu.new_identity_key "d"> <!ENTITY torbutton.context_menu.new_circuit "Nieuw Tor-circuit voor deze website"> <!ENTITY torbutton.context_menu.new_circuit_key "c"> <!ENTITY torbutton.context_menu.networksettings "Tor-netwerkinstellingen…">

1 0

[translation/torbutton-torbuttonproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit b590c7e5299d22ed5374242e88fbcdf53ec5b44b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 11:51:56 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.properties | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nl/torbutton.properties b/nl/torbutton.properties index 92ed111d8..d83cae0cc 100644 --- a/nl/torbutton.properties +++ b/nl/torbutton.properties @@ -58,3 +58,13 @@ # .Onion Page Info prompt. Strings are kept here for ease of translation. # pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) # pageInfo_OnionEncryption=Connection Encrypted (Onion Service) + +# Onion services strings. Strings are kept here for ease of translation. +# LOCALIZATION NOTE: %S will be replaced with the .onion address. +# onionServices.clientAuthMissing=Tor onion service missing client authorization +# onionServices.authPrompt.description=%S is requesting your private key. +# onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +# onionServices.authPrompt.done=Done +# onionServices.authPrompt.doneAccessKey=d +# onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +# onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 20 Nov '19

20 Nov '19

commit 2528b21963eb821412cd3de822033c0f591babc3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 20 11:51:49 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nl/torbutton.properties b/nl/torbutton.properties index 5883d9117..60ca984af 100644 --- a/nl/torbutton.properties +++ b/nl/torbutton.properties @@ -56,15 +56,15 @@ profileMigrationFailed=Migratie van uw bestaande %S-profiel is mislukt.\nEr word updateDownloadingPanelUILabel=%S-update downloaden # .Onion Page Info prompt. Strings are kept here for ease of translation. -pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Onion-dienst, %1$S, %2$S bits sleutels, %3$S) -pageInfo_OnionEncryption=Verbinding versleuteld (Onion-dienst) +pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Onion-service, %1$S, %2$S-bits sleutels, %3$S) +pageInfo_OnionEncryption=Verbinding versleuteld (Onion-service) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.clientAuthMissing=Tor-onion-service mist clientautorisatie +onionServices.authPrompt.description=%S vraagt om uw privésleutel. +onionServices.authPrompt.keyPlaceholder=Voer uw privésleutel voor deze onion-service in onionServices.authPrompt.done=Gereed -onionServices.authPrompt.doneAccessKey=u -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.doneAccessKey=G +onionServices.authPrompt.invalidKey=Voer een geldige sleutel in (52 base32-tekens of 44 base64-tekens) +onionServices.authPrompt.failedToSetKey=Kan Tor niet configureren met uw sleutel

1 0

[collector/master] Fix logging bug.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit e25b39757cc464e0450f88e3779b9c987d003d58 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:54:46 2019 +0100 Fix logging bug. --- src/main/java/org/torproject/metrics/collector/cron/Scheduler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java index db10205..054f03f 100644 --- a/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java +++ b/src/main/java/org/torproject/metrics/collector/cron/Scheduler.java @@ -58,7 +58,7 @@ public final class Scheduler implements ThreadFactory { try { gracePeriodMinutes = conf.getLong(Key.ShutdownGraceWaitMinutes); } catch (ConfigurationException ce) { - logger.warn("Cannot read grace period: {}", ce); + logger.warn("Cannot read grace period.", ce); gracePeriodMinutes = 10L; } List<Callable<Object>> runOnceMains = new ArrayList<>();

1 0

[collector/master] Fix two JavaDocs issues with package-info.java.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 3bbc4db433979867cfcbac08eb7a698d4259a009 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:53:11 2019 +0100 Fix two JavaDocs issues with package-info.java. --- .../java/org/torproject/metrics/collector/persist/package-info.java | 6 +++--- .../java/org/torproject/metrics/collector/sync/package-info.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/persist/package-info.java b/src/main/java/org/torproject/metrics/collector/persist/package-info.java index 11d3939..75ec95e 100644 --- a/src/main/java/org/torproject/metrics/collector/persist/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/persist/package-info.java @@ -1,11 +1,11 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.collector.persist; - -/** This package containes decorating classes for descriptors that +/** This package contains decorating classes for descriptors that * simply determine the two storage paths based on the descriptor * and further parameters like acquisition time. * All special persistence classes extend * {@code DescriptorPersistence}. */ +package org.torproject.metrics.collector.persist; + diff --git a/src/main/java/org/torproject/metrics/collector/sync/package-info.java b/src/main/java/org/torproject/metrics/collector/sync/package-info.java index 08a6cdd..53e64b7 100644 --- a/src/main/java/org/torproject/metrics/collector/sync/package-info.java +++ b/src/main/java/org/torproject/metrics/collector/sync/package-info.java @@ -1,8 +1,6 @@ /* Copyright 2016--2018 The Tor Project * See LICENSE for licensing information */ -package org.torproject.metrics.collector.sync; - /** This package coordinates syncing and merging the fetched data. * The central class for this process is {@code SyncManager}, which * coordinates download from other instances and merging the new data @@ -10,4 +8,5 @@ package org.torproject.metrics.collector.sync; * Storing data to the file system is facilitated by * {@code SyncPersistence}. */ +package org.torproject.metrics.collector.sync;

1 0

[collector/master] Fix minor JavaDoc issue.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 38234a37884b091ac3b06e027bc2a92c019f6f11 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:47:48 2019 +0100 Fix minor JavaDoc issue. --- src/main/java/org/torproject/metrics/collector/conf/Key.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java index d59438b..d0b8a5a 100644 --- a/src/main/java/org/torproject/metrics/collector/conf/Key.java +++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java @@ -89,7 +89,7 @@ public enum Key { private static Set<String> keys; /** - * @param Class of key value. + * @param clazz Class of key value. */ Key(Class clazz) { this.clazz = clazz;

1 0

[collector/master] Tweak DownloaderTest a bit.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 5d5d2eba7fb1c1fda3a0a16fe1cb5daf84f8ec47 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:00:15 2019 +0100 Tweak DownloaderTest a bit. --- .../metrics/collector/downloader/DownloaderTest.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java index 0617940..aef8c0c 100644 --- a/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java +++ b/src/test/java/org/torproject/metrics/collector/downloader/DownloaderTest.java @@ -15,7 +15,6 @@ import org.junit.BeforeClass; import org.junit.Test; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.net.HttpURLConnection; import java.net.SocketTimeoutException; import java.net.URL; @@ -42,21 +41,19 @@ public class DownloaderTest { */ private static class HttpUrlStreamHandler extends URLStreamHandler { - private Map<URL, URLConnection> connections = new HashMap(); + private Map<URL, URLConnection> connections = new HashMap<>(); @Override - protected URLConnection openConnection(URL url) throws IOException { - return connections.get(url); + protected URLConnection openConnection(URL url) { + return this.connections.get(url); } private void resetConnections() { - connections = new HashMap(); + this.connections = new HashMap<>(); } - private HttpUrlStreamHandler addConnection(URL url, - URLConnection urlConnection) { - connections.put(url, urlConnection); - return this; + private void addConnection(URL url, URLConnection urlConnection) { + this.connections.put(url, urlConnection); } }

1 0

[collector/master] Use StandardCharsets.US_ASCII instead of "US-ASCII".
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 7338d79d1abcfd04857a10818d076d6a7917649b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 11:49:54 2019 +0100 Use StandardCharsets.US_ASCII instead of "US-ASCII". --- .../collector/bridgedescs/BridgeDescriptorParser.java | 3 ++- .../collector/bridgedescs/BridgeSnapshotReader.java | 3 ++- .../collector/bridgedescs/SanitizedBridgesWriter.java | 6 +++--- .../metrics/collector/relaydescs/ArchiveReader.java | 2 +- .../relaydescs/CachedRelayDescriptorReader.java | 7 ++++--- .../collector/relaydescs/RelayDescriptorParser.java | 9 +++++---- .../collector/relaydescs/ReferenceCheckerTest.java | 16 ++++++++-------- 7 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java index 04460c8..778d187 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; public class BridgeDescriptorParser { @@ -33,7 +34,7 @@ public class BridgeDescriptorParser { String authorityFingerprint) { try { BufferedReader br = new BufferedReader(new StringReader( - new String(allData, "US-ASCII"))); + new String(allData, StandardCharsets.US_ASCII))); String line = br.readLine(); if (line == null) { return; 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 68ee28b..041807e 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java @@ -20,6 +20,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -139,7 +140,7 @@ public class BridgeSnapshotReader { } String fileDigest = Hex.encodeHexString(DigestUtils.sha1( allData)); - String ascii = new String(allData, "US-ASCII"); + String ascii = new String(allData, StandardCharsets.US_ASCII); BufferedReader br3 = new BufferedReader(new StringReader( ascii)); String firstLine; diff --git a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java index 921396c..45f2a1a 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java @@ -470,7 +470,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { try { DescriptorBuilder scrubbed = new DescriptorBuilder(); BufferedReader br = new BufferedReader(new StringReader(new String( - data, "US-ASCII"))); + data, StandardCharsets.US_ASCII))); String line; String mostRecentDescPublished = null; byte[] fingerprintBytes = null; @@ -682,7 +682,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { String masterKeyEd25519FromIdentityEd25519 = null; DescriptorBuilder scrubbed = new DescriptorBuilder(); try (BufferedReader br = new BufferedReader(new StringReader( - new String(data, "US-ASCII")))) { + new String(data, StandardCharsets.US_ASCII)))) { scrubbed.append(Annotation.BridgeServer.toString()); String line; String masterKeyEd25519 = null; @@ -1112,7 +1112,7 @@ public class SanitizedBridgesWriter extends CollecTorMain { String masterKeyEd25519FromIdentityEd25519 = null; try { BufferedReader br = new BufferedReader(new StringReader(new String( - data, "US-ASCII"))); + data, StandardCharsets.US_ASCII))); String line; DescriptorBuilder scrubbed = null; String hashedBridgeIdentity; 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 fee46c9..3326833 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java @@ -184,7 +184,7 @@ public class ArchiveReader { bis.close(); byte[] allData = baos.toByteArray(); BufferedReader br = new BufferedReader(new StringReader( - new String(allData, "US-ASCII"))); + new String(allData, StandardCharsets.US_ASCII))); String line; do { line = br.readLine(); 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 0308f05..0a8012a 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java @@ -18,6 +18,7 @@ import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -130,7 +131,7 @@ public class CachedRelayDescriptorReader { if (f.getName().equals("cached-consensus")) { /* Check if directory information is stale. */ BufferedReader br = new BufferedReader(new StringReader( - new String(allData, "US-ASCII"))); + new String(allData, StandardCharsets.US_ASCII))); String line; while ((line = br.readLine()) != null) { if (line.startsWith("valid-after ")) { @@ -166,7 +167,7 @@ public class CachedRelayDescriptorReader { } else if (f.getName().equals("v3-status-votes")) { int parsedNum = 0; int skippedNum = 0; - String ascii = new String(allData, "US-ASCII"); + String ascii = new String(allData, StandardCharsets.US_ASCII); String startToken = "network-status-version "; int end = ascii.length(); int start = ascii.indexOf(startToken); @@ -197,7 +198,7 @@ public class CachedRelayDescriptorReader { .append(" votes"); } else if (f.getName().startsWith("cached-descriptors") || f.getName().startsWith("cached-extrainfo")) { - String ascii = new String(allData, "US-ASCII"); + String ascii = new String(allData, StandardCharsets.US_ASCII); int start; int sig; int end = -1; 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 a610ed9..abbd777 100644 --- a/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java +++ b/src/main/java/org/torproject/metrics/collector/relaydescs/RelayDescriptorParser.java @@ -13,6 +13,7 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; @@ -83,7 +84,7 @@ public class RelayDescriptorParser { * the non-ASCII chars, but we don't care about them for parsing * anyway. */ BufferedReader br = new BufferedReader(new StringReader(new String( - data, "US-ASCII"))); + data, StandardCharsets.US_ASCII))); String line; do { line = br.readLine(); @@ -209,7 +210,7 @@ public class RelayDescriptorParser { break; default: if (this.aw != null || this.rdd != null) { - String ascii = new String(data, "US-ASCII"); + String ascii = new String(data, StandardCharsets.US_ASCII); String startToken = "network-status-version "; String sigToken = "directory-signature "; int start = ascii.indexOf(startToken); @@ -260,7 +261,7 @@ public class RelayDescriptorParser { : line.split(" ")[1].toLowerCase(); } } - String ascii = new String(data, "US-ASCII"); + String ascii = new String(data, StandardCharsets.US_ASCII); String startToken = "router "; String sigToken = "\nrouter-signature\n"; int start = ascii.indexOf(startToken); @@ -290,7 +291,7 @@ public class RelayDescriptorParser { published = parseFormat.parse(publishedTime).getTime(); } } - String ascii = new String(data, "US-ASCII"); + String ascii = new String(data, StandardCharsets.US_ASCII); String startToken = "extra-info "; String sigToken = "\nrouter-signature\n"; String digest = null; diff --git a/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java index 19672fc..9489315 100644 --- a/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java +++ b/src/test/java/org/torproject/metrics/collector/relaydescs/ReferenceCheckerTest.java @@ -12,7 +12,7 @@ import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import java.io.File; -import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; public class ReferenceCheckerTest { @@ -36,12 +36,12 @@ public class ReferenceCheckerTest { File histFile = tmpf.newFile(); Files.write(refsFile.toPath(), validReferenceJson.getBytes()); assertEquals(validReferenceJson, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); ReferenceChecker rc = new ReferenceChecker(descDir, refsFile, histFile); rc.check(); assertTrue(refsFile.exists()); assertEquals(validReferenceJson, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); } @Test() @@ -52,12 +52,12 @@ public class ReferenceCheckerTest { String badJson = "[{\"xx\":7]}"; Files.write(refsFile.toPath(), badJson.getBytes()); assertEquals(badJson, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); ReferenceChecker rc = new ReferenceChecker(descDir, refsFile, histFile); rc.check(); assertTrue(refsFile.exists()); assertEquals("[]", Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); } @Test() @@ -70,7 +70,7 @@ public class ReferenceCheckerTest { rc.check(); assertTrue(refsFile.exists()); assertEquals("The file's contents shouldn't have changed, but did.", "[]", - Files.readAllLines(refsFile.toPath(), Charset.forName("US-ASCII")) + Files.readAllLines(refsFile.toPath(), StandardCharsets.US_ASCII) .get(0)); } @@ -87,13 +87,13 @@ public class ReferenceCheckerTest { Files.write(refsFile.toPath(), validEmptyReferencedString.getBytes()); assertEquals(validEmptyReferencedString, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); ReferenceChecker rc = new ReferenceChecker(descDir, refsFile, histFile); rc.check(); assertTrue(refsFile.exists()); assertEquals(validEmptyReferencedString, Files.readAllLines(refsFile.toPath(), - Charset.forName("US-ASCII")).get(0)); + StandardCharsets.US_ASCII).get(0)); } }

1 0

[metrics-lib/master] Remove deprecation warning.
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 25ea064dc8214385f2077706b2635f2da0d530fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 10:34:35 2019 +0100 Remove deprecation warning. Class#newInstance is deprecated in Java 9 and higher, which doesn't affect us yet in Java 8. But the suggested replacement already works in Java 8, so that we can safely switch to that. --- src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java index e755e42..55fbcf3 100644 --- a/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/main/java/org/torproject/descriptor/DescriptorSourceFactory.java @@ -146,10 +146,9 @@ public final class DescriptorSourceFactory { + "."); } object = ClassLoader.getSystemClassLoader().loadClass(clazzName) - .newInstance(); + .getDeclaredConstructor().newInstance(); log.info("Serving implementation {} for {}.", clazzName, type); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException ex) { + } catch (ReflectiveOperationException ex) { throw new RuntimeException("Cannot load class " + clazzName + "for type " + type, ex); }

1 0

[metrics-lib/master] Use StandardCharsets.US_ASCII instead of "US-ASCII".
by karsten＠torproject.org 20 Nov '19

20 Nov '19

commit 75e1d31465aceb31c81f86575dc71abdab77095a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 20 12:04:29 2019 +0100 Use StandardCharsets.US_ASCII instead of "US-ASCII". --- .../java/org/torproject/descriptor/impl/ExitListImplTest.java | 9 +++++---- .../org/torproject/descriptor/impl/TorperfResultImplTest.java | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java index 0b53250..44a868b 100644 --- a/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/ExitListImplTest.java @@ -12,6 +12,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import java.nio.charset.StandardCharsets; import java.util.Map; public class ExitListImplTest { @@ -22,7 +23,7 @@ public class ExitListImplTest { @Test public void testAnnotatedInput() throws Exception { ExitListImpl result = new ExitListImpl((tordnselAnnotation + input) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); assertEquals("Expected one annotation.", 1, result.getAnnotations().size()); assertEquals(tordnselAnnotation.substring(0, 18), @@ -38,7 +39,7 @@ public class ExitListImplTest { public void testMultipleExitAddresses() throws Exception { ExitListImpl result = new ExitListImpl( (tordnselAnnotation + multiExitAddressInput) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); assertTrue("Unrecognized lines: " + result.getUnrecognizedLines(), result.getUnrecognizedLines().isEmpty()); Map<String, Long> map = result.getEntries() @@ -54,7 +55,7 @@ public class ExitListImplTest { this.thrown.expect(DescriptorParseException.class); this.thrown.expectMessage("Missing 'ExitAddress' line in exit list entry."); new ExitListImpl((tordnselAnnotation + insufficientInput[0]) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); } @Test @@ -62,7 +63,7 @@ public class ExitListImplTest { this.thrown.expect(DescriptorParseException.class); this.thrown.expectMessage("Missing 'Published' line in exit list entry."); new ExitListImpl((tordnselAnnotation + insufficientInput[1]) - .getBytes("US-ASCII"), null, fileName); + .getBytes(StandardCharsets.US_ASCII), null, fileName); } private static final String tordnselAnnotation = "@type tordnsel 1.0\n"; diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index 2af458f..b56490a 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -22,7 +22,7 @@ public class TorperfResultImplTest { public void testAnnotatedInput() throws Exception { TorperfResultImpl result = (TorperfResultImpl) (TorperfResultImpl.parseTorperfResults((torperfAnnotation + input) - .getBytes("US-ASCII"), null).get(0)); + .getBytes(StandardCharsets.US_ASCII), null).get(0)); assertEquals("Expected one annotation.", 1, result.getAnnotations().size()); assertEquals(torperfAnnotation.substring(0, 17), @@ -37,7 +37,7 @@ public class TorperfResultImplTest { @Test public void testPartiallyAnnotatedInput() throws Exception { byte[] asciiBytes = (torperfAnnotation - + input + input + input).getBytes("US-ASCII"); + + input + input + input).getBytes(StandardCharsets.US_ASCII); List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, @@ -53,7 +53,7 @@ public class TorperfResultImplTest { public void testAllAnnotatedInput() throws Exception { byte[] asciiBytes = (torperfAnnotation + input + torperfAnnotation + input - + torperfAnnotation + input).getBytes("US-ASCII"); + + torperfAnnotation + input).getBytes(StandardCharsets.US_ASCII); List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); assertEquals("Expected one annotation.", 1, @@ -68,7 +68,7 @@ public class TorperfResultImplTest { @Test public void testTrailingNewlinesRetained() throws Exception { byte[] asciiBytes = (torperfAnnotation + input - + torperfAnnotation + input).getBytes("US-ASCII"); + + torperfAnnotation + input).getBytes(StandardCharsets.US_ASCII); List<Descriptor> result = TorperfResultImpl.parseTorperfResults( asciiBytes, null); for (Descriptor descriptor : result) {

1 0