aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-02 11:14:55 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2023-01-02 11:14:55 +0100
commit7e498dcf760406a554fd330504414c624e2a656d (patch)
treec4b57afc5e1724927bb9d56b9e6a5e605be812a9
parent511829756d97ff029e39e3d3ceedb6517ff5d5d9 (diff)
Use recommended and most efficient way to create a string from a byte array outputstream
-rw-r--r--vespajlib/src/main/java/com/yahoo/text/StringUtilities.java19
1 files changed, 9 insertions, 10 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/text/StringUtilities.java b/vespajlib/src/main/java/com/yahoo/text/StringUtilities.java
index a177b07256b..1ab06954b39 100644
--- a/vespajlib/src/main/java/com/yahoo/text/StringUtilities.java
+++ b/vespajlib/src/main/java/com/yahoo/text/StringUtilities.java
@@ -86,7 +86,7 @@ public class StringUtilities {
result.write(replacementCharacters.replacement2[val]);
}
}
- return new String(result.toByteArray(), UTF8);
+ return result.toString(UTF8);
}
public static String unescape(String source) {
@@ -101,14 +101,13 @@ public class StringUtilities {
if (bytes[i + 1] != (byte) 'x') {
switch (bytes[i + 1]) {
- case '\\': result.write('\\'); break;
- case '"': result.write('"'); break;
- case 't': result.write('\t'); break;
- case 'n': result.write('\n'); break;
- case 'r': result.write('\r'); break;
- case 'f': result.write('\f'); break;
- default:
- throw new IllegalArgumentException("Illegal escape sequence \\" + ((char) bytes[i+1]) + " found");
+ case '\\' -> result.write('\\');
+ case '"' -> result.write('"');
+ case 't' -> result.write('\t');
+ case 'n' -> result.write('\n');
+ case 'r' -> result.write('\r');
+ case 'f' -> result.write('\f');
+ default -> throw new IllegalArgumentException("Illegal escape sequence \\" + ((char) bytes[i + 1]) + " found");
}
++i;
continue;
@@ -120,7 +119,7 @@ public class StringUtilities {
result.write((byte) Integer.parseInt(hexdigits, 16));
i += 3;
}
- return new String(result.toByteArray(), UTF8);
+ return result.toString(UTF8);
}
/**