From b45afc0cda062240584bd2f61b6c793473986e15 Mon Sep 17 00:00:00 2001 From: Felix Schnabel Date: Fri, 7 Jun 2024 23:13:03 +0200 Subject: [PATCH 1/3] Replace charset name argument with StandardCharsets.UTF_8 --- .../org/ballerinalang/birspec/BIRSpecGenerator.java | 2 +- .../org/ballerinalang/langserver/LSClientLogger.java | 8 ++------ .../testerina/natives/io/StringUtils.java | 11 +++-------- .../org/ballerinalang/test/utils/ResponseReader.java | 4 ++-- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/docs/bir-spec/src/main/java/org/ballerinalang/birspec/BIRSpecGenerator.java b/docs/bir-spec/src/main/java/org/ballerinalang/birspec/BIRSpecGenerator.java index 28085ce3d928..f17c6696b427 100644 --- a/docs/bir-spec/src/main/java/org/ballerinalang/birspec/BIRSpecGenerator.java +++ b/docs/bir-spec/src/main/java/org/ballerinalang/birspec/BIRSpecGenerator.java @@ -66,6 +66,6 @@ private static String readResourceAsString(String uri) throws IOException { while ((length = inputStream.read(buffer)) != -1) { result.write(buffer, 0, length); } - return result.toString(StandardCharsets.UTF_8.name()); + return result.toString(StandardCharsets.UTF_8); } } diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java index ec8c13a5003a..497f9a76c5b9 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java @@ -98,12 +98,8 @@ public void logError(LSOperation operation, String message, Throwable error, Tex String details = getErrorDetails(identifier, error, pos); if (config.isDebugLogEnabled()) { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try { - PrintStream ps = new PrintStream(baos, true, StandardCharsets.UTF_8.name()); - error.printStackTrace(ps); - } catch (UnsupportedEncodingException e1) { - //ignore - } + PrintStream ps = new PrintStream(baos, true, StandardCharsets.UTF_8); + error.printStackTrace(ps); this.languageClient.logMessage( new MessageParams(MessageType.Error, message + " " + details + "\n" + baos)); } diff --git a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java index 3e69a1d54699..524a848ab752 100644 --- a/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java +++ b/misc/testerina/modules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java @@ -146,14 +146,9 @@ private static Object encode(String key, List specialCharacters) { String encodedKey = key; String encodedValue; for (String character : specialCharacters) { - try { - if (encodedKey.contains(character)) { - encodedValue = URLEncoder.encode(character, StandardCharsets.UTF_8.toString()); - encodedKey = encodedKey.replace(character, encodedValue); - } - } catch (UnsupportedEncodingException e) { - return ErrorHelper.getRuntimeException( - ErrorCodes.INCOMPATIBLE_ARGUMENTS, "Error while encoding: " + e.getMessage()); + if (encodedKey.contains(character)) { + encodedValue = URLEncoder.encode(character, StandardCharsets.UTF_8); + encodedKey = encodedKey.replace(character, encodedValue); } } return encodedKey; diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java index 913b93913c03..b69face8a448 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java @@ -26,13 +26,13 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.nio.charset.StandardCharsets; /** * Utility class for managing responses. */ public class ResponseReader { private static final Logger LOG = LoggerFactory.getLogger(ResponseReader.class); - public static final String UTF_8 = "UTF-8"; /** * Get the response value from input stream. @@ -46,7 +46,7 @@ public static String getReturnValue(HttpCarbonMessage response) { final char[] buffer = new char[bufferSize]; final StringBuilder out = new StringBuilder(); try { - reader = new InputStreamReader(new HttpMessageDataStreamer(response).getInputStream(), UTF_8); + reader = new InputStreamReader(new HttpMessageDataStreamer(response).getInputStream(), StandardCharsets.UTF_8); while (true) { int size = reader.read(buffer, 0, buffer.length); if (size < 0) { From 6303ec0496a43f8dad372c7388412b901111365f Mon Sep 17 00:00:00 2001 From: Felix Schnabel Date: Sat, 8 Jun 2024 00:00:17 +0200 Subject: [PATCH 2/3] Fix checkstyle --- .../test/java/org/ballerinalang/test/utils/ResponseReader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java index b69face8a448..4f6160c90be0 100644 --- a/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java +++ b/tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/utils/ResponseReader.java @@ -46,7 +46,8 @@ public static String getReturnValue(HttpCarbonMessage response) { final char[] buffer = new char[bufferSize]; final StringBuilder out = new StringBuilder(); try { - reader = new InputStreamReader(new HttpMessageDataStreamer(response).getInputStream(), StandardCharsets.UTF_8); + reader = new InputStreamReader( + new HttpMessageDataStreamer(response).getInputStream(), StandardCharsets.UTF_8); while (true) { int size = reader.read(buffer, 0, buffer.length); if (size < 0) { From ecf86bd8639f20efb0213b84bf96c66950ede49c Mon Sep 17 00:00:00 2001 From: Felix Schnabel Date: Sat, 8 Jun 2024 01:29:31 +0200 Subject: [PATCH 3/3] Fix checkstyle --- .../main/java/org/ballerinalang/langserver/LSClientLogger.java | 1 - 1 file changed, 1 deletion(-) diff --git a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java index 497f9a76c5b9..3cb726a1a7cc 100644 --- a/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java +++ b/language-server/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java @@ -29,7 +29,6 @@ import java.io.ByteArrayOutputStream; import java.io.PrintStream; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; /**