feat(internal-api): Remove Strings toJson and escapeToJson methods

Author: PerfectSlayer

internal-api/src/main/java/datadog/trace/util/Strings.java

@@ -5,10 +5,6 @@
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.ThreadLocalRandom;
 import javax.annotation.Nonnull;
 
@@ -18,70 +14,6 @@ public final class Strings {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
   };
 
-  public static String escapeToJson(String string) {
-    if (string == null || string.isEmpty()) {
-      return "";
-    }
-
-    final StringBuilder sb = new StringBuilder();
-    int sz = string.length();
-    for (int i = 0; i < sz; ++i) {
-      char ch = string.charAt(i);
-      if (ch > 4095) {
-        sb.append("\\u").append(hex(ch));
-      } else if (ch > 255) {
-        sb.append("\\u0").append(hex(ch));
-      } else if (ch > 127) {
-        sb.append("\\u00").append(hex(ch));
-      } else if (ch < ' ') {
-        switch (ch) {
-          case '\b':
-            sb.append((char) 92).append((char) 98);
-            break;
-          case '\t':
-            sb.append((char) 92).append((char) 116);
-            break;
-          case '\n':
-            sb.append((char) 92).append((char) 110);
-            break;
-          case '\u000b':
-          default:
-            if (ch > 15) {
-              sb.append("\\u00").append(hex(ch));
-            } else {
-              sb.append("\\u000").append(hex(ch));
-            }
-            break;
-          case '\f':
-            sb.append((char) 92).append((char) 102);
-            break;
-          case '\r':
-            sb.append((char) 92).append((char) 114);
-            break;
-        }
-      } else {
-        switch (ch) {
-          case '"':
-            sb.append((char) 92).append((char) 34);
-            break;
-          case '\'':
-            sb.append((char) 92).append((char) 39);
-            break;
-          case '/':
-            sb.append((char) 92).append((char) 47);
-            break;
-          case '\\':
-            sb.append((char) 92).append((char) 92);
-            break;
-          default:
-            sb.append(ch);
-        }
-      }
-    }
-
-    return sb.toString();
-  }
-
   public static String toEnvVar(String string) {
     return string.replace('.', '_').replace('-', '_').toUpperCase();
   }
@@ -209,16 +141,12 @@ public static String trim(final String string) {
     return null == string ? "" : string.trim();
   }
 
-  private static String hex(char ch) {
-    return Integer.toHexString(ch).toUpperCase(Locale.ENGLISH);
-  }
-
   public static String sha256(String input) throws NoSuchAlgorithmException {
     MessageDigest digest = MessageDigest.getInstance("SHA-256");
     byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8));
     StringBuilder hexString = new StringBuilder(2 * hash.length);
-    for (int i = 0; i < hash.length; i++) {
-      String hex = Integer.toHexString(0xFF & hash[i]);
+    for (byte b : hash) {
+      String hex = Integer.toHexString(0xFF & b);
       if (hex.length() == 1) {
         hexString.append('0');
       }
@@ -238,52 +166,6 @@ public static CharSequence truncate(CharSequence input, int limit) {
     return input.subSequence(0, limit);
   }
 
-  public static String toJson(final Map<String, ?> map) {
-    return toJson(map, false);
-  }
-
-  public static String toJson(final Map<String, ?> map, boolean valuesAreJson) {
-    if (map == null || map.isEmpty()) {
-      return "{}";
-    }
-    final StringBuilder sb = new StringBuilder("{");
-    final Iterator<? extends Entry<String, ?>> entriesIter = map.entrySet().iterator();
-    while (entriesIter.hasNext()) {
-      final Entry<String, ?> entry = entriesIter.next();
-
-      sb.append('\"').append(escapeToJson(entry.getKey())).append("\":");
-
-      if (valuesAreJson) {
-        sb.append(entry.getValue());
-      } else {
-        sb.append('\"').append(escapeToJson(String.valueOf(entry.getValue()))).append('\"');
-      }
-
-      if (entriesIter.hasNext()) {
-        sb.append(',');
-      }
-    }
-    sb.append('}');
-    return sb.toString();
-  }
-
-  public static String toJson(final Iterable<String> items) {
-    if (items == null) {
-      return "[]";
-    }
-    StringBuilder json = new StringBuilder("[");
-    Iterator<String> it = items.iterator();
-    while (it.hasNext()) {
-      String item = it.next();
-      json.append('"').append(escapeToJson(item)).append('"');
-      if (it.hasNext()) {
-        json.append(',');
-      }
-    }
-    json.append(']');
-    return json.toString();
-  }
-
   /**
    * Checks that a string is not blank, i.e. contains at least one character that is not a
    * whitespace

internal-api/src/test/groovy/datadog/trace/util/StringsTest.groovy

@@ -88,33 +88,6 @@ class StringsTest extends DDSpecification {
     // spotless:on
   }
 
-  def "test escape javascript"() {
-    when:
-    String escaped = Strings.escapeToJson(string)
-
-    then:
-    escaped == expected
-
-    where:
-    string                   | expected
-    null                     | ""
-    ""                       | ""
-    ((char) 4096).toString() | '\\u1000'
-    ((char) 256).toString()  | '\\u0100'
-    ((char) 128).toString()  | '\\u0080'
-    "\b"                     | "\\b"
-    "\t"                     | "\\t"
-    "\n"                     | "\\n"
-    "\f"                     | "\\f"
-    "\r"                     | "\\r"
-    '"'                      | '\\"'
-    '\''                     | '\\\''
-    '/'                      | '\\/'
-    '\\'                     | '\\\\'
-    "\u000b"                 | "\\u000B"
-    "a"                      | "a"
-  }
-
   def "test sha256"() {
     when:
     String sha256 = Strings.sha256(input)
@@ -144,38 +117,6 @@ class StringsTest extends DDSpecification {
     "hélló wórld" | 5     | "hélló"
   }
 
-  def "test map toJson: #input"() {
-    when:
-    String json = Strings.toJson((Map) input)
-
-    then:
-    json == expected
-
-    where:
-    input                                   | expected
-    null                                    | "{}"
-    new HashMap<>()                         | "{}"
-    ['key1': 'value1']                      | "{\"key1\":\"value1\"}"
-    ['key1': 'value1', 'key2': 'value2']    | "{\"key1\":\"value1\",\"key2\":\"value2\"}"
-    ['key1': 'va"lu"e1', 'ke"y2': 'value2'] | "{\"key1\":\"va\\\"lu\\\"e1\",\"ke\\\"y2\":\"value2\"}"
-  }
-
-  def "test iterable toJson: #input"() {
-    when:
-    String json = Strings.toJson((Iterable) input)
-
-    then:
-    json == expected
-
-    where:
-    input                  | expected
-    null                   | "[]"
-    new ArrayList<>()      | "[]"
-    ['value1']             | "[\"value1\"]"
-    ['value1', 'value2']   | "[\"value1\",\"value2\"]"
-    ['va"lu"e1', 'value2'] | "[\"va\\\"lu\\\"e1\",\"value2\"]"
-  }
-
   def "test isNotBlank: #input"() {
     when:
     def notBlank = Strings.isNotBlank(input)