diff --git a/util/src/main/java/io/kubernetes/client/Exec.java b/util/src/main/java/io/kubernetes/client/Exec.java index 0e4e7618d9..31201ff22f 100644 --- a/util/src/main/java/io/kubernetes/client/Exec.java +++ b/util/src/main/java/io/kubernetes/client/Exec.java @@ -35,6 +35,7 @@ import java.io.UnsupportedEncodingException; import java.lang.reflect.Type; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -437,11 +438,7 @@ public ExecutionBuilder setOnUnhandledError(Consumer onUnhandledError private String makePath() { String[] encodedCommand = new String[command.length]; for (int i = 0; i < command.length; i++) { - try { - encodedCommand[i] = URLEncoder.encode(command[i], "UTF-8"); - } catch (UnsupportedEncodingException ex) { - throw new RuntimeException("some thing wrong happend: " + ex.getMessage()); - } + encodedCommand[i] = URLEncoder.encode(command[i], StandardCharsets.UTF_8); } return "/api/v1/namespaces/" + namespace @@ -614,7 +611,7 @@ public OutputStream getResizeStream() { public void resize(int width, int height) throws IOException { OutputStream resizeStream = getResizeStream(); String resize = "{ \"width\": " + width + ", \"height\": " + height + " }\n"; - resizeStream.write(resize.getBytes("UTF-8")); + resizeStream.write(resize.getBytes(StandardCharsets.UTF_8)); resizeStream.flush(); } diff --git a/util/src/main/java/io/kubernetes/client/util/ModelMapper.java b/util/src/main/java/io/kubernetes/client/util/ModelMapper.java index 25ba91607a..bbfc462370 100644 --- a/util/src/main/java/io/kubernetes/client/util/ModelMapper.java +++ b/util/src/main/java/io/kubernetes/client/util/ModelMapper.java @@ -27,6 +27,7 @@ import java.net.URI; import java.net.URL; import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.ArrayList; import java.util.Enumeration; @@ -491,7 +492,7 @@ private static List getClassNamesFromPackage(ClassLoader classLoader, St } private static void processJarPackage(URL packageURL, String packageName, String pkg, ArrayList names) throws IOException { - String jarFileName = URLDecoder.decode(packageURL.getFile(), "UTF-8"); + String jarFileName = URLDecoder.decode(packageURL.getFile(), StandardCharsets.UTF_8); JarFile jf = null; // jar: client in repository; nested: client in a fat jar if (jarFileName.startsWith("jar:") || jarFileName.startsWith("nested:")) { diff --git a/util/src/main/java/io/kubernetes/client/util/authenticators/OpenIDConnectAuthenticator.java b/util/src/main/java/io/kubernetes/client/util/authenticators/OpenIDConnectAuthenticator.java index 2eb0e79bc7..6fa79a96a2 100644 --- a/util/src/main/java/io/kubernetes/client/util/authenticators/OpenIDConnectAuthenticator.java +++ b/util/src/main/java/io/kubernetes/client/util/authenticators/OpenIDConnectAuthenticator.java @@ -216,7 +216,7 @@ private JSONObject refreshOidcToken( String urlData = new StringBuilder() .append("refresh_token=") - .append(URLEncoder.encode(refreshToken, "UTF-8")) + .append(URLEncoder.encode(refreshToken, StandardCharsets.UTF_8)) .append("&grant_type=refresh_token") .toString(); OutputStream ou = https.getOutputStream(); diff --git a/util/src/test/java/io/kubernetes/client/ExecTest.java b/util/src/test/java/io/kubernetes/client/ExecTest.java index e50e4a3c12..3353b57f88 100644 --- a/util/src/test/java/io/kubernetes/client/ExecTest.java +++ b/util/src/test/java/io/kubernetes/client/ExecTest.java @@ -172,7 +172,7 @@ void terminalResize() throws IOException, InterruptedException { process.resize(100, 100); process.destroy(); - String out = bos.toString("UTF-8"); + String out = bos.toString(StandardCharsets.UTF_8); assertThat(out).isEqualTo("{ \"width\": 100, \"height\": 100 }\n"); } diff --git a/util/src/test/java/io/kubernetes/client/WebsocketStreamHandlerTest.java b/util/src/test/java/io/kubernetes/client/WebsocketStreamHandlerTest.java index dbac7aed14..61448c9c6c 100644 --- a/util/src/test/java/io/kubernetes/client/WebsocketStreamHandlerTest.java +++ b/util/src/test/java/io/kubernetes/client/WebsocketStreamHandlerTest.java @@ -21,6 +21,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import okhttp3.Request; import okhttp3.WebSocket; import okio.ByteString; @@ -68,7 +69,7 @@ void handlerSendingData() throws IOException { OutputStream outputStream = handler.getOutputStream(testStreamId); - byte[] bytes = "This is a test string".getBytes("UTF-8"); + byte[] bytes = "This is a test string".getBytes(StandardCharsets.UTF_8); byte[] output = new byte[bytes.length + 1]; output[0] = 0; for (int i = 0; i < bytes.length; i++) {