Merge pull request #42884 from Shadow-Devil/use-standard-charset

Replace charset name argument with StandardCharsets.UTF_8
ballerina-platform · Jun 12, 2024 · 4ac37ad · 4ac37ad
2 parents 04a642d + ecf86bd
commit 4ac37ad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 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
@@ -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/...er/modules/langserver-core/src/main/java/org/ballerinalang/langserver/LSClientLogger.java b/...er/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;
 
 /**
@@ -98,12 +97,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/...ules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java b/...ules/testerina-core/src/main/java/org/ballerinalang/testerina/natives/io/StringUtils.java
@@ -146,14 +146,9 @@ private static Object encode(String key, List<String> 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
@@ -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,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(), 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) {