diff options
Diffstat (limited to 'jetty-servlet/src/test/java/org/eclipse/jetty')
6 files changed, 24 insertions, 18 deletions
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextListenersTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextListenersTest.java index 1df72130ad..f0b4c5eb17 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextListenersTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextListenersTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; +import java.nio.charset.StandardCharsets; import java.util.concurrent.atomic.AtomicInteger; import javax.servlet.AsyncContext; import javax.servlet.AsyncEvent; @@ -109,10 +110,10 @@ public class AsyncContextListenersTest "GET " + path + " HTTP/1.1\r\n" + "Host: localhost\r\n" + "\r\n"; - output.write(request.getBytes("UTF-8")); + output.write(request.getBytes(StandardCharsets.UTF_8)); output.flush(); - BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8")); + BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); SimpleHttpParser parser = new SimpleHttpParser(); SimpleHttpResponse response = parser.readResponse(reader); Assert.assertEquals("200", response.getCode()); @@ -120,7 +121,7 @@ public class AsyncContextListenersTest // Send a second request completes.set(0); - output.write(request.getBytes("UTF-8")); + output.write(request.getBytes(StandardCharsets.UTF_8)); output.flush(); response = parser.readResponse(reader); @@ -180,10 +181,10 @@ public class AsyncContextListenersTest "GET " + path + " HTTP/1.1\r\n" + "Host: localhost\r\n" + "\r\n"; - output.write(request.getBytes("UTF-8")); + output.write(request.getBytes(StandardCharsets.UTF_8)); output.flush(); - BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8")); + BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); SimpleHttpParser parser = new SimpleHttpParser(); SimpleHttpResponse response = parser.readResponse(reader); Assert.assertEquals("200", response.getCode()); @@ -191,7 +192,7 @@ public class AsyncContextListenersTest // Send a second request completes.set(0); - output.write(request.getBytes("UTF-8")); + output.write(request.getBytes(StandardCharsets.UTF_8)); output.flush(); response = parser.readResponse(reader); @@ -258,10 +259,10 @@ public class AsyncContextListenersTest "GET " + path + "/one HTTP/1.1\r\n" + "Host: localhost\r\n" + "\r\n"; - output.write(request.getBytes("UTF-8")); + output.write(request.getBytes(StandardCharsets.UTF_8)); output.flush(); - BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), "UTF-8")); + BufferedReader reader = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8)); SimpleHttpParser parser = new SimpleHttpParser(); SimpleHttpResponse response = parser.readResponse(reader); Assert.assertEquals("200", response.getCode()); @@ -269,7 +270,7 @@ public class AsyncContextListenersTest // Send a second request completes.set(0); - output.write(request.getBytes("UTF-8")); + output.write(request.getBytes(StandardCharsets.UTF_8)); output.flush(); response = parser.readResponse(reader); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletLongPollTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletLongPollTest.java index 2b6174037c..383d059585 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletLongPollTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletLongPollTest.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.Socket; +import java.nio.charset.StandardCharsets; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import javax.servlet.AsyncContext; @@ -122,7 +123,7 @@ public class AsyncServletLongPollTest "Host: localhost:" + connector.getLocalPort() + "\r\n" + "\r\n"; OutputStream output1 = socket1.getOutputStream(); - output1.write(request1.getBytes("UTF-8")); + output1.write(request1.getBytes(StandardCharsets.UTF_8)); output1.flush(); Assert.assertTrue(asyncLatch.await(5, TimeUnit.SECONDS)); @@ -134,18 +135,18 @@ public class AsyncServletLongPollTest "Host: localhost:" + connector.getLocalPort() + "\r\n" + "\r\n"; OutputStream output2 = socket2.getOutputStream(); - output2.write(request2.getBytes("UTF-8")); + output2.write(request2.getBytes(StandardCharsets.UTF_8)); output2.flush(); SimpleHttpParser parser2 = new SimpleHttpParser(); - BufferedReader input2 = new BufferedReader(new InputStreamReader(socket2.getInputStream(), "UTF-8")); + BufferedReader input2 = new BufferedReader(new InputStreamReader(socket2.getInputStream(), StandardCharsets.UTF_8)); SimpleHttpResponse response2 = parser2.readResponse(input2); Assert.assertEquals("200", response2.getCode()); } socket1.setSoTimeout(2 * wait); SimpleHttpParser parser1 = new SimpleHttpParser(); - BufferedReader input1 = new BufferedReader(new InputStreamReader(socket1.getInputStream(), "UTF-8")); + BufferedReader input1 = new BufferedReader(new InputStreamReader(socket1.getInputStream(), StandardCharsets.UTF_8)); SimpleHttpResponse response1 = parser1.readResponse(input1); Assert.assertEquals(error, response1.getCode()); @@ -154,7 +155,7 @@ public class AsyncServletLongPollTest String request3 = "GET " + uri + " HTTP/1.1\r\n" + "Host: localhost:" + connector.getLocalPort() + "\r\n" + "\r\n"; - output1.write(request3.getBytes("UTF-8")); + output1.write(request3.getBytes(StandardCharsets.UTF_8)); output1.flush(); SimpleHttpResponse response3 = parser1.readResponse(input1); diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java index 8d2e4534a7..6b707fc88f 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletTest.java @@ -21,6 +21,7 @@ package org.eclipse.jetty.servlet; import java.io.IOException; import java.io.InputStream; import java.net.Socket; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import java.util.Timer; @@ -416,7 +417,7 @@ public class AsyncServletTest try (Socket socket = new Socket("localhost",port)) { socket.setSoTimeout(1000000); - socket.getOutputStream().write(request.getBytes("UTF-8")); + socket.getOutputStream().write(request.getBytes(StandardCharsets.UTF_8)); return IO.toString(socket.getInputStream()); } catch(Exception e) diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java index 62a787fe1a..aa0c3664f2 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletRangesTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.charset.StandardCharsets; import org.eclipse.jetty.server.HttpConfiguration; import org.eclipse.jetty.server.LocalConnector; @@ -220,7 +221,7 @@ public class DefaultServletRangesTest try { out = new FileOutputStream(file); - out.write(str.getBytes(StringUtil.__UTF8)); + out.write(str.getBytes(StandardCharsets.UTF_8)); out.flush(); } finally diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java index fae82c6c6b..7c2d2d17fe 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.EnumSet; import java.util.regex.Matcher; @@ -882,7 +883,7 @@ public class DefaultServletTest try { out = new FileOutputStream(file); - out.write(str.getBytes(StringUtil.__UTF8)); + out.write(str.getBytes(StandardCharsets.UTF_8)); out.flush(); } finally diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestHeadersTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestHeadersTest.java index 30109111fc..ae5250ca08 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestHeadersTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/RequestHeadersTest.java @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.HttpURLConnection; import java.net.URI; +import java.nio.charset.StandardCharsets; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -109,7 +110,7 @@ public class RequestHeadersTest try (InputStream in = http.getInputStream()) { - String resp = IO.toString(in, "UTF-8"); + String resp = IO.toString(in, StandardCharsets.UTF_8); Assert.assertThat("Response", resp, is("X-Camel-Type = bactrian")); } } |