Commit 7338d79d authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Use StandardCharsets.US_ASCII instead of "US-ASCII".

parent 38234a37

src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeDescriptorParser.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

src/main/java/org/torproject/metrics/collector/bridgedescs/BridgeSnapshotReader.java

+2 −1
Original line number Diff line number Diff line
@@ -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;

src/main/java/org/torproject/metrics/collector/bridgedescs/SanitizedBridgesWriter.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

src/main/java/org/torproject/metrics/collector/relaydescs/ArchiveReader.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

src/main/java/org/torproject/metrics/collector/relaydescs/CachedRelayDescriptorReader.java

+4 −3
Original line number Diff line number Diff line
@@ -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;