Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java')
-rw-r--r--jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java47
1 files changed, 24 insertions, 23 deletions
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
index 1f507272bc..dbd99769da 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/NetworkTrafficListenerTest.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.Socket;
import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
@@ -130,14 +131,14 @@ public class NetworkTrafficListenerTest
@Override
public void incoming(Socket socket, ByteBuffer bytes)
{
- incomingData.set(BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
incomingLatch.countDown();
}
@Override
public void outgoing(Socket socket, ByteBuffer bytes)
{
- outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
outgoingLatch.countDown();
}
});
@@ -155,7 +156,7 @@ public class NetworkTrafficListenerTest
Socket socket = new Socket("localhost", port);
OutputStream output = socket.getOutputStream();
- output.write(request.getBytes("UTF-8"));
+ output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
assertTrue(incomingLatch.await(1, TimeUnit.SECONDS));
@@ -165,7 +166,7 @@ public class NetworkTrafficListenerTest
assertEquals(expectedResponse, outgoingData.get());
byte[] responseBytes = readResponse(socket);
- String response = new String(responseBytes, "UTF-8");
+ String response = new String(responseBytes, StandardCharsets.UTF_8);
assertEquals(expectedResponse, response);
socket.close();
@@ -181,7 +182,7 @@ public class NetworkTrafficListenerTest
{
request.setHandled(true);
ServletOutputStream output = servletResponse.getOutputStream();
- output.write(responseContent.getBytes("UTF-8"));
+ output.write(responseContent.getBytes(StandardCharsets.UTF_8));
output.write(END_OF_CONTENT);
}
});
@@ -194,13 +195,13 @@ public class NetworkTrafficListenerTest
{
public void incoming(Socket socket, ByteBuffer bytes)
{
- incomingData.set(BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
incomingLatch.countDown();
}
public void outgoing(Socket socket, ByteBuffer bytes)
{
- outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
outgoingLatch.countDown();
}
});
@@ -218,7 +219,7 @@ public class NetworkTrafficListenerTest
Socket socket = new Socket("localhost", port);
OutputStream output = socket.getOutputStream();
- output.write(request.getBytes("UTF-8"));
+ output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
assertTrue(incomingLatch.await(1, TimeUnit.SECONDS));
@@ -228,7 +229,7 @@ public class NetworkTrafficListenerTest
assertEquals(expectedResponse, outgoingData.get());
byte[] responseBytes = readResponse(socket);
- String response = new String(responseBytes, "UTF-8");
+ String response = new String(responseBytes, StandardCharsets.UTF_8);
assertEquals(expectedResponse, response);
socket.close();
@@ -246,9 +247,9 @@ public class NetworkTrafficListenerTest
{
request.setHandled(true);
ServletOutputStream output = servletResponse.getOutputStream();
- output.write(responseChunk1.getBytes("UTF-8"));
+ output.write(responseChunk1.getBytes(StandardCharsets.UTF_8));
output.flush();
- output.write(responseChunk2.getBytes("UTF-8"));
+ output.write(responseChunk2.getBytes(StandardCharsets.UTF_8));
output.flush();
}
});
@@ -261,13 +262,13 @@ public class NetworkTrafficListenerTest
{
public void incoming(Socket socket, ByteBuffer bytes)
{
- incomingData.set(BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
incomingLatch.countDown();
}
public void outgoing(Socket socket, ByteBuffer bytes)
{
- outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
outgoingLatch.countDown();
}
});
@@ -290,7 +291,7 @@ public class NetworkTrafficListenerTest
Socket socket = new Socket("localhost", port);
OutputStream output = socket.getOutputStream();
- output.write(request.getBytes("UTF-8"));
+ output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
assertTrue(incomingLatch.await(1, TimeUnit.SECONDS));
@@ -300,7 +301,7 @@ public class NetworkTrafficListenerTest
assertEquals(expectedResponse, outgoingData.get());
byte[] responseBytes = readResponse(socket);
- String response = new String(responseBytes, "UTF-8");
+ String response = new String(responseBytes, StandardCharsets.UTF_8);
assertEquals(expectedResponse, response);
socket.close();
@@ -327,13 +328,13 @@ public class NetworkTrafficListenerTest
{
public void incoming(Socket socket, ByteBuffer bytes)
{
- incomingData.set(BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ incomingData.set(BufferUtil.toString(bytes,StandardCharsets.UTF_8));
incomingLatch.countDown();
}
public void outgoing(Socket socket, ByteBuffer bytes)
{
- outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
outgoingLatch.countDown();
}
});
@@ -355,7 +356,7 @@ public class NetworkTrafficListenerTest
Socket socket = new Socket("localhost", port);
OutputStream output = socket.getOutputStream();
- output.write(request.getBytes("UTF-8"));
+ output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
assertTrue(incomingLatch.await(1, TimeUnit.SECONDS));
@@ -365,7 +366,7 @@ public class NetworkTrafficListenerTest
assertEquals(expectedResponse, outgoingData.get());
byte[] responseBytes = readResponse(socket);
- String response = new String(responseBytes, "UTF-8");
+ String response = new String(responseBytes, StandardCharsets.UTF_8);
assertEquals(expectedResponse, response);
socket.close();
@@ -400,12 +401,12 @@ public class NetworkTrafficListenerTest
{
public void incoming(Socket socket, ByteBuffer bytes)
{
- incomingData.set(incomingData.get() + BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ incomingData.set(incomingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
}
public void outgoing(Socket socket, ByteBuffer bytes)
{
- outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StringUtil.__UTF8_CHARSET));
+ outgoingData.set(outgoingData.get() + BufferUtil.toString(bytes,StandardCharsets.UTF_8));
outgoingLatch.countDown();
}
});
@@ -429,14 +430,14 @@ public class NetworkTrafficListenerTest
Socket socket = new Socket("localhost", port);
OutputStream output = socket.getOutputStream();
- output.write(request.getBytes("UTF-8"));
+ output.write(request.getBytes(StandardCharsets.UTF_8));
output.flush();
assertTrue(outgoingLatch.await(1, TimeUnit.SECONDS));
assertEquals(expectedResponse, outgoingData.get());
byte[] responseBytes = readResponse(socket);
- String response = new String(responseBytes, "UTF-8");
+ String response = new String(responseBytes, StandardCharsets.UTF_8);
assertEquals(expectedResponse, response);
assertEquals(request, incomingData.get());

Back to the top