Skip to content

Commit fcedd1f

Browse files
committed
feat: Remove Strings.escapeToJson method
1 parent edb4a4d commit fcedd1f

File tree

2 files changed

+2
-93
lines changed

2 files changed

+2
-93
lines changed

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

Lines changed: 2 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16,70 +16,6 @@ public final class Strings {
1616
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
1717
};
1818

19-
public static String escapeToJson(String string) {
20-
if (string == null || string.isEmpty()) {
21-
return "";
22-
}
23-
24-
final StringBuilder sb = new StringBuilder();
25-
int sz = string.length();
26-
for (int i = 0; i < sz; ++i) {
27-
char ch = string.charAt(i);
28-
if (ch > 4095) {
29-
sb.append("\\u").append(hex(ch));
30-
} else if (ch > 255) {
31-
sb.append("\\u0").append(hex(ch));
32-
} else if (ch > 127) {
33-
sb.append("\\u00").append(hex(ch));
34-
} else if (ch < ' ') {
35-
switch (ch) {
36-
case '\b':
37-
sb.append((char) 92).append((char) 98);
38-
break;
39-
case '\t':
40-
sb.append((char) 92).append((char) 116);
41-
break;
42-
case '\n':
43-
sb.append((char) 92).append((char) 110);
44-
break;
45-
case '\u000b':
46-
default:
47-
if (ch > 15) {
48-
sb.append("\\u00").append(hex(ch));
49-
} else {
50-
sb.append("\\u000").append(hex(ch));
51-
}
52-
break;
53-
case '\f':
54-
sb.append((char) 92).append((char) 102);
55-
break;
56-
case '\r':
57-
sb.append((char) 92).append((char) 114);
58-
break;
59-
}
60-
} else {
61-
switch (ch) {
62-
case '"':
63-
sb.append((char) 92).append((char) 34);
64-
break;
65-
case '\'':
66-
sb.append((char) 92).append((char) 39);
67-
break;
68-
case '/':
69-
sb.append((char) 92).append((char) 47);
70-
break;
71-
case '\\':
72-
sb.append((char) 92).append((char) 92);
73-
break;
74-
default:
75-
sb.append(ch);
76-
}
77-
}
78-
}
79-
80-
return sb.toString();
81-
}
82-
8319
public static String toEnvVar(String string) {
8420
return string.replace('.', '_').replace('-', '_').toUpperCase();
8521
}
@@ -255,8 +191,8 @@ public static String sha256(String input) throws NoSuchAlgorithmException {
255191
MessageDigest digest = MessageDigest.getInstance("SHA-256");
256192
byte[] hash = digest.digest(input.getBytes(StandardCharsets.UTF_8));
257193
StringBuilder hexString = new StringBuilder(2 * hash.length);
258-
for (int i = 0; i < hash.length; i++) {
259-
String hex = Integer.toHexString(0xFF & hash[i]);
194+
for (byte b : hash) {
195+
String hex = Integer.toHexString(0xFF & b);
260196
if (hex.length() == 1) {
261197
hexString.append('0');
262198
}

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,33 +102,6 @@ class StringsTest extends DDSpecification {
102102
// spotless:on
103103
}
104104

105-
def "test escape javascript"() {
106-
when:
107-
String escaped = Strings.escapeToJson(string)
108-
109-
then:
110-
escaped == expected
111-
112-
where:
113-
string | expected
114-
null | ""
115-
"" | ""
116-
((char) 4096).toString() | '\\u1000'
117-
((char) 256).toString() | '\\u0100'
118-
((char) 128).toString() | '\\u0080'
119-
"\b" | "\\b"
120-
"\t" | "\\t"
121-
"\n" | "\\n"
122-
"\f" | "\\f"
123-
"\r" | "\\r"
124-
'"' | '\\"'
125-
'\'' | '\\\''
126-
'/' | '\\/'
127-
'\\' | '\\\\'
128-
"\u000b" | "\\u000B"
129-
"a" | "a"
130-
}
131-
132105
def "test sha256"() {
133106
when:
134107
String sha256 = Strings.sha256(input)

0 commit comments

Comments
 (0)