diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-02-21 14:41:50 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-02-21 14:41:50 +0100 |
commit | e5852de9c3fcfd5714aa20512014e1524338c844 (patch) | |
tree | 9b09189f6258bec37174ea90b0ef97930232d014 /config-lib/src | |
parent | afe876252b56b5a30735865047d7392958835f6a (diff) |
Non-functional changes only
Diffstat (limited to 'config-lib/src')
-rw-r--r-- | config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java | 6 | ||||
-rw-r--r-- | config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java | 24 |
2 files changed, 17 insertions, 13 deletions
diff --git a/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java b/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java index b536f99490e..a21f36cdbe9 100644 --- a/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java +++ b/config-lib/src/main/java/com/yahoo/config/ChangesRequiringRestart.java @@ -8,11 +8,12 @@ import java.util.Map; import static java.util.stream.Collectors.joining; /** - * @author <a href="mailto:magnarn@yahoo-inc.com">Magnar Nedland</a> - * * This class aggregates information about config changes that causes a restart to be required. + * + * @author Magnar Nedland */ public class ChangesRequiringRestart { + static class ReportLine { private String name; private final Node from; @@ -159,4 +160,5 @@ public class ChangesRequiringRestart { public boolean needsRestart() { return !report.isEmpty(); } + } diff --git a/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java b/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java index afbf722766f..4fbe55b4978 100644 --- a/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java +++ b/config-lib/src/main/java/com/yahoo/config/text/StringUtilities.java @@ -3,23 +3,26 @@ package com.yahoo.config.text; import java.nio.charset.Charset; import java.io.ByteArrayOutputStream; +import java.nio.charset.StandardCharsets; /** * Escapes strings into and out of a format where they only contain printable characters. * * Need to duplicate escape / unescape of strings as we have in C++ for java version of system states. * - * @author <a href="mailto:humbe@yahoo-inc.com">Haakon Humberset</a> + * @author Haakon Humberset */ public class StringUtilities { - private static Charset UTF8 = Charset.forName("utf8"); + + private static final Charset UTF8 = StandardCharsets.UTF_8; private static byte toHex(int val) { return (byte) (val < 10 ? '0' + val : 'a' + (val - 10)); } private static class ReplacementCharacters { - public byte needEscape[] = new byte[256]; - public byte replacement1[] = new byte[256]; - public byte replacement2[] = new byte[256]; + + public byte[] needEscape = new byte[256]; + public byte[] replacement1 = new byte[256]; + public byte[] replacement2 = new byte[256]; public ReplacementCharacters() { for (int i=0; i<256; ++i) { @@ -55,12 +58,12 @@ public class StringUtilities { /** * Escapes strings into a format with only printable ASCII characters. * - * @param source The string to escape - * @param delimiter Escape this character too, even if it is printable. - * @return The escaped string + * @param source the string to escape + * @param delimiter escape this character too, even if it is printable + * @return the escaped string */ public static String escape(String source, char delimiter) { - byte bytes[] = source.getBytes(UTF8); + byte[] bytes = source.getBytes(UTF8); ByteArrayOutputStream result = new ByteArrayOutputStream(); for (byte b : bytes) { int val = b; @@ -81,8 +84,7 @@ public class StringUtilities { result.write(replacementCharacters.replacement2[val]); } } - return new String(result.toByteArray(), UTF8); + return result.toString(UTF8); } - } |