This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0c7815ddb2 Code clean-up. Formatting. No functional change.
0c7815ddb2 is described below
commit 0c7815ddb244eb3899b30e88cc75402d1eb63143
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Mar 8 18:30:29 2023 +0000
Code clean-up. Formatting. No functional change.
---
.../tomcat/websocket/TestConnectionLimit.java | 9 +-
.../tomcat/websocket/TestPerMessageDeflate.java | 18 ++-
test/org/apache/tomcat/websocket/TestUtil.java | 82 ++++-------
.../tomcat/websocket/TestWebSocketFrameClient.java | 41 +++---
.../websocket/TestWebSocketFrameClientSSL.java | 47 +++----
test/org/apache/tomcat/websocket/TestWsFrame.java | 6 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 19 +--
.../tomcat/websocket/TestWsRemoteEndpoint.java | 18 +--
.../websocket/TestWsSessionSuspendResume.java | 6 +-
.../tomcat/websocket/TestWsSubprotocols.java | 28 ++--
.../tomcat/websocket/TestWsWebSocketContainer.java | 150 ++++++++-------------
.../TestWsWebSocketContainerGetOpenSessions.java | 23 ++--
...WsWebSocketContainerSessionExpiryContainer.java | 19 +--
...stWsWebSocketContainerSessionExpirySession.java | 16 +--
.../TestWsWebSocketContainerTimeoutClient.java | 16 +--
.../TestWsWebSocketContainerTimeoutServer.java | 38 ++----
.../TestWsWebSocketContainerWithProxy.java | 2 +-
.../apache/tomcat/websocket/TesterAsyncTiming.java | 4 +-
.../tomcat/websocket/TesterBlockWebSocketSCI.java | 13 +-
.../apache/tomcat/websocket/TesterEchoServer.java | 8 +-
.../tomcat/websocket/TesterFirehoseServer.java | 7 +-
.../tomcat/websocket/TesterMessageCountClient.java | 13 +-
.../websocket/TesterWebSocketClientProxy.java | 7 +-
.../tomcat/websocket/TesterWsClientAutobahn.java | 24 ++--
.../apache/tomcat/websocket/WebSocketBaseTest.java | 4 +-
.../websocket/WsWebSocketContainerBaseTest.java | 7 +-
.../websocket/pojo/TestEncodingDecoding.java | 128 +++++++++---------
.../websocket/pojo/TestPojoEndpointBase.java | 11 +-
.../websocket/pojo/TestPojoMethodMapping.java | 23 ++--
.../apache/tomcat/websocket/pojo/TesterUtil.java | 3 +-
.../tomcat/websocket/server/TestAsyncMessages.java | 21 +--
.../tomcat/websocket/server/TestClassLoader.java | 7 +-
.../apache/tomcat/websocket/server/TestClose.java | 2 +-
.../tomcat/websocket/server/TestCloseBug58624.java | 13 +-
.../tomcat/websocket/server/TestShutdown.java | 14 +-
.../tomcat/websocket/server/TestSlowClient.java | 3 +-
.../tomcat/websocket/server/TestUriTemplate.java | 54 ++++----
.../server/TestWsRemoteEndpointImplServer.java | 28 ++--
.../websocket/server/TestWsServerContainer.java | 75 ++++-------
.../websocket/server/TesterEndpointConfig.java | 4 +-
.../tomcat/websocket/server/TesterWsClient.java | 17 +--
41 files changed, 407 insertions(+), 621 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index e4eb14d57e..f1ec95dcdb 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -38,8 +38,7 @@ import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEn
public class TestConnectionLimit extends TomcatBaseTest {
/*
- * Simple test to see how many outgoing connections can be created on a
- * single machine.
+ * Simple test to see how many outgoing connections can be created on a
single machine.
*/
@Test
public void testSingleMachine() throws Exception {
@@ -54,8 +53,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
tomcat.start();
- URI uri = new URI("ws://localhost:" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC);
+ URI uri = new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_ASYNC);
AtomicInteger counter = new AtomicInteger(0);
int threadCount = 50;
@@ -87,8 +85,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
@Override
public void run() {
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
int count = 0;
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index 4538eba976..d1676b6c96 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -93,17 +93,16 @@ public class TestPerMessageDeflate {
ByteBuffer received = ByteBuffer.allocate(8192);
- TransformationResult tr = perMessageDeflateRx.getMoreData(
- compressedPart.getOpCode(), compressedPart.isFin(),
compressedPart.getRsv(), received);
+ TransformationResult tr =
perMessageDeflateRx.getMoreData(compressedPart.getOpCode(),
compressedPart.isFin(),
+ compressedPart.getRsv(), received);
Assert.assertEquals(8192, received.position());
- Assert.assertEquals(TransformationResult.END_OF_FRAME , tr);
+ Assert.assertEquals(TransformationResult.END_OF_FRAME, tr);
}
/*
- * Minimal implementation to enable other transformations to be tested. It
- * is NOT robust.
+ * Minimal implementation to enable other transformations to be tested. It
is NOT robust.
*/
private static class TesterTransformation implements Transformation {
@@ -121,30 +120,35 @@ public class TestPerMessageDeflate {
public boolean validateRsvBits(int i) {
return false;
}
+
@Override
public boolean validateRsv(int rsv, byte opCode) {
return false;
}
+
@Override
public void setNext(Transformation t) {
}
+
@Override
public List<MessagePart> sendMessagePart(List<MessagePart>
messageParts) {
return messageParts;
}
+
@Override
- public TransformationResult getMoreData(byte opCode, boolean fin, int
rsv, ByteBuffer dest)
- throws IOException {
+ public TransformationResult getMoreData(byte opCode, boolean fin, int
rsv, ByteBuffer dest) throws IOException {
if (data == null) {
return TransformationResult.UNDERFLOW;
}
dest.put(data);
return TransformationResult.END_OF_FRAME;
}
+
@Override
public Extension getExtensionResponse() {
return null;
}
+
@Override
public void close() {
}
diff --git a/test/org/apache/tomcat/websocket/TestUtil.java
b/test/org/apache/tomcat/websocket/TestUtil.java
index c5d309b0c7..8771ab380a 100644
--- a/test/org/apache/tomcat/websocket/TestUtil.java
+++ b/test/org/apache/tomcat/websocket/TestUtil.java
@@ -38,97 +38,83 @@ public class TestUtil {
@Test
public void testGetMessageTypeSimple() {
- Assert.assertEquals(
- String.class, Util.getMessageType(new SimpleMessageHandler()));
+ Assert.assertEquals(String.class, Util.getMessageType(new
SimpleMessageHandler()));
}
@Test
public void testGetMessageTypeSubclass() {
- Assert.assertEquals(String.class,
- Util.getMessageType(new SubSimpleMessageHandler()));
+ Assert.assertEquals(String.class, Util.getMessageType(new
SubSimpleMessageHandler()));
}
@Test
public void testGetMessageTypeGenericSubclass() {
- Assert.assertEquals(String.class,
- Util.getMessageType(new GenericSubMessageHandler()));
+ Assert.assertEquals(String.class, Util.getMessageType(new
GenericSubMessageHandler()));
}
@Test
public void testGetMessageTypeGenericMultipleSubclass() {
- Assert.assertEquals(String.class,
- Util.getMessageType(new
GenericMultipleSubSubMessageHandler()));
+ Assert.assertEquals(String.class, Util.getMessageType(new
GenericMultipleSubSubMessageHandler()));
}
@Test
public void testGetMessageTypeGenericMultipleSubclassSwap() {
- Assert.assertEquals(String.class,
- Util.getMessageType(new
GenericMultipleSubSubSwapMessageHandler()));
+ Assert.assertEquals(String.class, Util.getMessageType(new
GenericMultipleSubSubSwapMessageHandler()));
}
@Test
public void testGetEncoderTypeSimple() {
- Assert.assertEquals(
- String.class, Util.getEncoderType(SimpleEncoder.class));
+ Assert.assertEquals(String.class,
Util.getEncoderType(SimpleEncoder.class));
}
@Test
public void testGetEncoderTypeSubclass() {
- Assert.assertEquals(String.class,
- Util.getEncoderType(SubSimpleEncoder.class));
+ Assert.assertEquals(String.class,
Util.getEncoderType(SubSimpleEncoder.class));
}
@Test
public void testGetEncoderTypeGenericSubclass() {
- Assert.assertEquals(String.class,
- Util.getEncoderType(GenericSubEncoder.class));
+ Assert.assertEquals(String.class,
Util.getEncoderType(GenericSubEncoder.class));
}
@Test
public void testGetEncoderTypeGenericMultipleSubclass() {
- Assert.assertEquals(String.class,
- Util.getEncoderType(GenericMultipleSubSubEncoder.class));
+ Assert.assertEquals(String.class,
Util.getEncoderType(GenericMultipleSubSubEncoder.class));
}
@Test
public void testGetEncoderTypeGenericMultipleSubclassSwap() {
- Assert.assertEquals(String.class,
- Util.getEncoderType(GenericMultipleSubSubSwapEncoder.class));
+ Assert.assertEquals(String.class,
Util.getEncoderType(GenericMultipleSubSubSwapEncoder.class));
}
@Test
public void testGetEncoderTypeSimpleWithGenericType() {
- Assert.assertEquals(List.class,
- Util.getEncoderType(SimpleEncoderWithGenericType.class));
+ Assert.assertEquals(List.class,
Util.getEncoderType(SimpleEncoderWithGenericType.class));
}
@Test
public void testGenericArrayEncoderString() {
- Assert.assertEquals(String[].class,
- Util.getEncoderType(GenericArrayEncoderString.class));
+ Assert.assertEquals(String[].class,
Util.getEncoderType(GenericArrayEncoderString.class));
}
@Test
public void testGenericArraySubEncoderString() {
- Assert.assertEquals(String[][].class,
- Util.getEncoderType(GenericArraySubEncoderString.class));
+ Assert.assertEquals(String[][].class,
Util.getEncoderType(GenericArraySubEncoderString.class));
}
- private static class SimpleMessageHandler
- implements MessageHandler.Whole<String> {
+ private static class SimpleMessageHandler implements
MessageHandler.Whole<String> {
@Override
public void onMessage(String message) {
// NO-OP
@@ -157,18 +143,15 @@ public class TestUtil {
}
- private abstract static class GenericMultipleMessageHandler<A,B>
- implements MessageHandler.Whole<A>, Foo<B> {
+ private abstract static class GenericMultipleMessageHandler<A, B>
implements MessageHandler.Whole<A>, Foo<B> {
}
- private abstract static class GenericMultipleSubMessageHandler<X,Y>
- extends GenericMultipleMessageHandler<X,Y> {
+ private abstract static class GenericMultipleSubMessageHandler<X, Y>
extends GenericMultipleMessageHandler<X, Y> {
}
- private static class GenericMultipleSubSubMessageHandler
- extends GenericMultipleSubMessageHandler<String,Boolean> {
+ private static class GenericMultipleSubSubMessageHandler extends
GenericMultipleSubMessageHandler<String, Boolean> {
@Override
public void onMessage(String message) {
@@ -182,13 +165,13 @@ public class TestUtil {
}
- private abstract static class GenericMultipleSubSwapMessageHandler<Y,X>
- extends GenericMultipleMessageHandler<X,Y> {
+ private abstract static class GenericMultipleSubSwapMessageHandler<Y, X>
+ extends GenericMultipleMessageHandler<X, Y> {
}
private static class GenericMultipleSubSubSwapMessageHandler
- extends GenericMultipleSubSwapMessageHandler<Boolean,String> {
+ extends GenericMultipleSubSwapMessageHandler<Boolean, String> {
@Override
public void onMessage(String message) {
@@ -249,8 +232,7 @@ public class TestUtil {
}
- private abstract static class GenericMultipleEncoder<A,B>
- implements Encoder.Text<A>, Foo<B> {
+ private abstract static class GenericMultipleEncoder<A, B> implements
Encoder.Text<A>, Foo<B> {
@Override
public void init(EndpointConfig endpointConfig) {
@@ -264,13 +246,11 @@ public class TestUtil {
}
- private abstract static class GenericMultipleSubEncoder<X,Y>
- extends GenericMultipleEncoder<X,Y> {
+ private abstract static class GenericMultipleSubEncoder<X, Y> extends
GenericMultipleEncoder<X, Y> {
}
- private static class GenericMultipleSubSubEncoder
- extends GenericMultipleSubEncoder<String,Boolean> {
+ private static class GenericMultipleSubSubEncoder extends
GenericMultipleSubEncoder<String, Boolean> {
@Override
public String encode(String object) throws EncodeException {
@@ -285,13 +265,11 @@ public class TestUtil {
}
- private abstract static class GenericMultipleSubSwapEncoder<Y,X>
- extends GenericMultipleEncoder<X,Y> {
+ private abstract static class GenericMultipleSubSwapEncoder<Y, X> extends
GenericMultipleEncoder<X, Y> {
}
- private static class GenericMultipleSubSubSwapEncoder
- extends GenericMultipleSubSwapEncoder<Boolean,String> {
+ private static class GenericMultipleSubSubSwapEncoder extends
GenericMultipleSubSwapEncoder<Boolean, String> {
@Override
public String encode(String object) throws EncodeException {
@@ -305,8 +283,7 @@ public class TestUtil {
}
- private static class SimpleEncoderWithGenericType
- implements Encoder.Text<List<String>> {
+ private static class SimpleEncoderWithGenericType implements
Encoder.Text<List<String>> {
@Override
public void init(EndpointConfig endpointConfig) {
@@ -418,8 +395,7 @@ public class TestUtil {
@Test
public void testParseExtensionHeaderMultiple02() {
- doTestParseExtensionHeaderMultiple(
- " ext ; a = 1 ; b = 2 , ext2 ; c ; d = xyz , ext3 ");
+ doTestParseExtensionHeaderMultiple(" ext ; a = 1 ; b = 2 , ext2 ; c ;
d = xyz , ext3 ");
}
private void doTestParseExtensionHeaderMultiple(String header) {
@@ -457,12 +433,12 @@ public class TestUtil {
Assert.assertEquals(0, params3.size());
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testParseExtensionHeaderInvalid01() {
Util.parseExtensionHeader(new ArrayList<>(), "ext;a=\"1;b=2");
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testParseExtensionHeaderInvalid02() {
Util.parseExtensionHeader(new ArrayList<>(), "ext;a=1\";b=2");
}
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
index ee67b49d38..f7cfd9c38f 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java
@@ -64,23 +64,19 @@ public class TestWebSocketFrameClient extends
WebSocketBaseTest {
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
// BZ 62596
- ClientEndpointConfig clientEndpointConfig =
- ClientEndpointConfig.Builder.create().configurator(new
Configurator() {
+ ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create()
+ .configurator(new Configurator() {
@Override
public void beforeRequest(Map<String, List<String>>
headers) {
- headers.put("Dummy", Collections.singletonList(
- String.join("", Collections.nCopies(4000,
"A"))));
+ headers.put("Dummy",
+ Collections.singletonList(String.join("",
Collections.nCopies(4000, "A"))));
super.beforeRequest(headers);
}
}).build();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
- new URI("ws://localhost:" + getPort() +
- TesterFirehoseServer.PATH));
- CountDownLatch latch =
- new CountDownLatch(TesterFirehoseServer.MESSAGE_COUNT);
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
+ new URI("ws://localhost:" + getPort() +
TesterFirehoseServer.PATH));
+ CountDownLatch latch = new
CountDownLatch(TesterFirehoseServer.MESSAGE_COUNT);
BasicText handler = new BasicText(latch);
wsSession.addMessageHandler(handler);
wsSession.getBasicRemote().sendText("Hello");
@@ -89,12 +85,10 @@ public class TestWebSocketFrameClient extends
WebSocketBaseTest {
// Ignore the latch result as the message count test below will tell us
// if the right number of messages arrived
- handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
- TimeUnit.MILLISECONDS);
+ handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
TimeUnit.MILLISECONDS);
Queue<String> messages = handler.getMessages();
- Assert.assertEquals(
- TesterFirehoseServer.MESSAGE_COUNT, messages.size());
+ Assert.assertEquals(TesterFirehoseServer.MESSAGE_COUNT,
messages.size());
for (String message : messages) {
Assert.assertEquals(TesterFirehoseServer.MESSAGE, message);
}
@@ -115,15 +109,14 @@ public class TestWebSocketFrameClient extends
WebSocketBaseTest {
tomcat.start();
- echoTester("",null);
- echoTester("/",null);
+ echoTester("", null);
+ echoTester("/", null);
// This will trigger a redirect so there will be 5 requests logged
- echoTester("/foo",null);
- echoTester("/foo/",null);
+ echoTester("/foo", null);
+ echoTester("/foo/", null);
}
- public void echoTester(String path, ClientEndpointConfig
clientEndpointConfig)
- throws Exception {
+ public void echoTester(String path, ClientEndpointConfig
clientEndpointConfig) throws Exception {
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
if (clientEndpointConfig == null) {
@@ -133,8 +126,8 @@ public class TestWebSocketFrameClient extends
WebSocketBaseTest {
// CI systems.
clientEndpointConfig.getUserProperties().put(Constants.IO_TIMEOUT_MS_PROPERTY,
"10000");
- Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
- clientEndpointConfig, new URI("ws://localhost:" + getPort() +
path));
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
+ new URI("ws://localhost:" + getPort() + path));
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
wsSession.addMessageHandler(handler);
@@ -220,7 +213,7 @@ public class TestWebSocketFrameClient extends
WebSocketBaseTest {
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_USER_NAME,
USER);
-
clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_PASSWORD,PWD);
+
clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_PASSWORD,
PWD);
echoTester(URI_PROTECTED, clientEndpointConfig);
}
diff --git a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
index 9094e16f47..55a1197f38 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -53,20 +53,12 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
- ClientEndpointConfig clientEndpointConfig =
- ClientEndpointConfig.Builder.create().build();
- clientEndpointConfig.getUserProperties().put(
- Constants.SSL_TRUSTSTORE_PROPERTY,
- TesterSupport.CA_JKS);
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
- new URI("wss://localhost:" + getPort() +
- TesterFirehoseServer.PATH));
- CountDownLatch latch =
- new CountDownLatch(TesterFirehoseServer.MESSAGE_COUNT);
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
+
clientEndpointConfig.getUserProperties().put(Constants.SSL_TRUSTSTORE_PROPERTY,
TesterSupport.CA_JKS);
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
+ new URI("wss://localhost:" + getPort() +
TesterFirehoseServer.PATH));
+ CountDownLatch latch = new
CountDownLatch(TesterFirehoseServer.MESSAGE_COUNT);
BasicText handler = new BasicText(latch);
wsSession.addMessageHandler(handler);
wsSession.getBasicRemote().sendText("Hello");
@@ -75,12 +67,10 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
// Ignore the latch result as the message count test below will tell us
// if the right number of messages arrived
- handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
- TimeUnit.MILLISECONDS);
+ handler.getLatch().await(TesterFirehoseServer.WAIT_TIME_MILLIS,
TimeUnit.MILLISECONDS);
Queue<String> messages = handler.getMessages();
- Assert.assertEquals(
- TesterFirehoseServer.MESSAGE_COUNT, messages.size());
+ Assert.assertEquals(TesterFirehoseServer.MESSAGE_COUNT,
messages.size());
for (String message : messages) {
Assert.assertEquals(TesterFirehoseServer.MESSAGE, message);
}
@@ -100,18 +90,11 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
- ClientEndpointConfig clientEndpointConfig =
- ClientEndpointConfig.Builder.create().build();
- clientEndpointConfig.getUserProperties().put(
- Constants.SSL_TRUSTSTORE_PROPERTY,
- TesterSupport.CA_JKS);
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
- new URI("wss://localhost:" + getPort() +
- TesterFirehoseServer.PATH));
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
+
clientEndpointConfig.getUserProperties().put(Constants.SSL_TRUSTSTORE_PROPERTY,
TesterSupport.CA_JKS);
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
+ new URI("wss://localhost:" + getPort() +
TesterFirehoseServer.PATH));
// Process incoming messages very slowly
MessageHandler handler = new SleepingText(5000);
@@ -125,7 +108,7 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
System.out.println("Waiting for server to report an error");
while (TesterFirehoseServer.Endpoint.getErrorCount() == 0 && count <
limit) {
Thread.sleep(100);
- count ++;
+ count++;
}
if (TesterFirehoseServer.Endpoint.getErrorCount() == 0) {
@@ -139,7 +122,7 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
limit = TesterFirehoseServer.WAIT_TIME_MILLIS / 100;
while (TesterFirehoseServer.Endpoint.getOpenConnectionCount() != 0 &&
count < limit) {
Thread.sleep(100);
- count ++;
+ count++;
}
int openConnectionCount =
TesterFirehoseServer.Endpoint.getOpenConnectionCount();
diff --git a/test/org/apache/tomcat/websocket/TestWsFrame.java
b/test/org/apache/tomcat/websocket/TestWsFrame.java
index d6afce0cfd..c14386d68e 100644
--- a/test/org/apache/tomcat/websocket/TestWsFrame.java
+++ b/test/org/apache/tomcat/websocket/TestWsFrame.java
@@ -37,8 +37,7 @@ public class TestWsFrame {
WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1,
-1, -1 }, 0, 7));
Assert.assertEquals(0x7FFFFFFFFFFFFFFFL,
WsFrameBase.byteArrayToLong(new byte[] { 127, -1, -1, -1, -1,
-1, -1, -1 }, 0, 8));
- Assert.assertEquals(-1,
- WsFrameBase.byteArrayToLong(new byte[] { -1, -1, -1, -1, -1,
-1, -1, -1 }, 0, 8));
+ Assert.assertEquals(-1, WsFrameBase.byteArrayToLong(new byte[] { -1,
-1, -1, -1, -1, -1, -1, -1 }, 0, 8));
}
@@ -57,7 +56,6 @@ public class TestWsFrame {
WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1,
-1, -1, -1 }, 1, 7));
Assert.assertEquals(0x7FFFFFFFFFFFFFFFL,
WsFrameBase.byteArrayToLong(new byte[] { 20, 127, -1, -1, -1,
-1, -1, -1, -1 }, 1, 8));
- Assert.assertEquals(-1,
- WsFrameBase.byteArrayToLong(new byte[] { 20, -1, -1, -1, -1,
-1, -1, -1, -1 }, 1, 8));
+ Assert.assertEquals(-1, WsFrameBase.byteArrayToLong(new byte[] { 20,
-1, -1, -1, -1, -1, -1, -1, -1 }, 1, 8));
}
}
diff --git a/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
b/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
index 6ed5483e9d..5b400151c4 100644
--- a/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
+++ b/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java
@@ -54,17 +54,14 @@ public class TestWsPingPongMessages extends
WebSocketBaseTest {
tomcat.start();
- WebSocketContainer wsContainer = ContainerProvider
- .getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class, ClientEndpointConfig.Builder
- .create().build(), new URI("ws://localhost:"
- + getPort() + TesterEchoServer.Config.PATH_ASYNC));
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
+ ClientEndpointConfig.Builder.create().build(),
+ new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(1);
- TesterEndpoint tep = (TesterEndpoint) wsSession.getUserProperties()
- .get("endpoint");
+ TesterEndpoint tep = (TesterEndpoint)
wsSession.getUserProperties().get("endpoint");
tep.setLatch(latch);
PongMessageHandler handler = new PongMessageHandler(latch);
@@ -73,12 +70,10 @@ public class TestWsPingPongMessages extends
WebSocketBaseTest {
boolean latchResult = handler.getLatch().await(10, TimeUnit.SECONDS);
Assert.assertTrue(latchResult);
- Assert.assertArrayEquals(applicationData.array(),
- (handler.getMessages().peek()).getApplicationData().array());
+ Assert.assertArrayEquals(applicationData.array(),
(handler.getMessages().peek()).getApplicationData().array());
}
- public static class PongMessageHandler extends
- TesterMessageCountClient.BasicHandler<PongMessage> {
+ public static class PongMessageHandler extends
TesterMessageCountClient.BasicHandler<PongMessage> {
public PongMessageHandler(CountDownLatch latch) {
super(latch);
}
diff --git a/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
b/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
index 8c01d1af7b..88e5bd9908 100644
--- a/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
+++ b/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
@@ -97,27 +97,22 @@ public class TestWsRemoteEndpoint extends WebSocketBaseTest
{
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
Session wsSession;
- URI uri = new URI("ws://localhost:" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC);
+ URI uri = new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_ASYNC);
if (Endpoint.class.isAssignableFrom(clazz)) {
@SuppressWarnings("unchecked")
- Class<? extends Endpoint> endpointClazz =
- (Class<? extends Endpoint>) clazz;
- wsSession = wsContainer.connectToServer(endpointClazz,
- Builder.create().build(), uri);
+ Class<? extends Endpoint> endpointClazz = (Class<? extends
Endpoint>) clazz;
+ wsSession = wsContainer.connectToServer(endpointClazz,
Builder.create().build(), uri);
} else {
wsSession = wsContainer.connectToServer(clazz, uri);
}
CountDownLatch latch = new CountDownLatch(1);
- TesterEndpoint tep =
- (TesterEndpoint) wsSession.getUserProperties().get("endpoint");
+ TesterEndpoint tep = (TesterEndpoint)
wsSession.getUserProperties().get("endpoint");
tep.setLatch(latch);
AsyncHandler<?> handler;
if (useWriter) {
@@ -175,8 +170,7 @@ public class TestWsRemoteEndpoint extends WebSocketBaseTest
{
Assert.assertEquals(0, result.length());
} else {
// First may be a fragment
- Assert.assertEquals(SEQUENCE.substring(offset, S_LEN),
- result.substring(0, S_LEN - offset));
+ Assert.assertEquals(SEQUENCE.substring(offset, S_LEN),
result.substring(0, S_LEN - offset));
i = S_LEN - offset;
while (i + S_LEN < result.length()) {
if (!SEQUENCE.equals(result.substring(i, i + S_LEN))) {
diff --git a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
index 41d8d7217f..4e6fcdf7ef 100644
--- a/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
+++ b/test/org/apache/tomcat/websocket/TestWsSessionSuspendResume.java
@@ -58,9 +58,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
new URI("ws://localhost:" + getPort() + Config.PATH));
CountDownLatch latch = new CountDownLatch(2);
@@ -97,7 +95,7 @@ public class TestWsSessionSuspendResume extends
WebSocketBaseTest {
public static final class SuspendResumeEndpoint extends Endpoint {
@Override
- public void onOpen(Session session, EndpointConfig epc) {
+ public void onOpen(Session session, EndpointConfig epc) {
MessageProcessor processor = new MessageProcessor(session, 3);
session.addMessageHandler(String.class, message ->
processor.addMessage(message));
}
diff --git a/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
b/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
index ea31a5b5ea..4584a0fc15 100644
--- a/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
+++ b/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
@@ -53,16 +53,13 @@ public class TestWsSubprotocols extends WebSocketBaseTest {
tomcat.start();
- WebSocketContainer wsContainer = ContainerProvider
- .getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class, ClientEndpointConfig.Builder
- .create().preferredSubprotocols(Arrays.asList("sp3"))
- .build(), new URI("ws://localhost:" + getPort()
- + SubProtocolsEndpoint.PATH_BASIC));
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
+
ClientEndpointConfig.Builder.create().preferredSubprotocols(Arrays.asList("sp3")).build(),
+ new URI("ws://localhost:" + getPort() +
SubProtocolsEndpoint.PATH_BASIC));
Assert.assertTrue(wsSession.isOpen());
if (wsSession.getNegotiatedSubprotocol() != null) {
@@ -71,11 +68,9 @@ public class TestWsSubprotocols extends WebSocketBaseTest {
wsSession.close();
SubProtocolsEndpoint.recycle();
- wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class, ClientEndpointConfig.Builder
- .create().preferredSubprotocols(Arrays.asList("sp2"))
- .build(), new URI("ws://localhost:" + getPort()
- + SubProtocolsEndpoint.PATH_BASIC));
+ wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
+
ClientEndpointConfig.Builder.create().preferredSubprotocols(Arrays.asList("sp2")).build(),
+ new URI("ws://localhost:" + getPort() +
SubProtocolsEndpoint.PATH_BASIC));
Assert.assertTrue(wsSession.isOpen());
Assert.assertEquals("sp2", wsSession.getNegotiatedSubprotocol());
@@ -87,21 +82,20 @@ public class TestWsSubprotocols extends WebSocketBaseTest {
Thread.sleep(100);
}
Assert.assertNotNull(SubProtocolsEndpoint.subprotocols);
- Assert.assertArrayEquals(new String[]{"sp1","sp2"},
+ Assert.assertArrayEquals(new String[] { "sp1", "sp2" },
SubProtocolsEndpoint.subprotocols.toArray(new String[0]));
wsSession.close();
SubProtocolsEndpoint.recycle();
}
- @ServerEndpoint(value = "/echo", subprotocols = {"sp1","sp2"})
+ @ServerEndpoint(value = "/echo", subprotocols = { "sp1", "sp2" })
public static class SubProtocolsEndpoint {
public static final String PATH_BASIC = "/echo";
public static volatile List<String> subprotocols;
@OnOpen
- public void processOpen(@SuppressWarnings("unused") Session session,
- EndpointConfig epc) {
- subprotocols = ((ServerEndpointConfig)epc).getSubprotocols();
+ public void processOpen(@SuppressWarnings("unused") Session session,
EndpointConfig epc) {
+ subprotocols = ((ServerEndpointConfig) epc).getSubprotocols();
}
public static void recycle() {
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
index 7e3ace4a10..5087396b5a 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
@@ -83,16 +83,13 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
// Set this artificially small to trigger
// https://bz.apache.org/bugzilla/show_bug.cgi?id=57054
wsContainer.setDefaultMaxBinaryMessageBufferSize(64);
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("ws://" + getHostName() + ":" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC));
+ new URI("ws://" + getHostName() + ":" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
wsSession.addMessageHandler(handler);
@@ -110,7 +107,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testConnectToServerEndpointInvalidScheme() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -119,16 +116,13 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
- wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
- ClientEndpointConfig.Builder.create().build(),
- new URI("ftp://"; + getHostName() + ":" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC));
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
+ new URI("ftp://"; + getHostName() + ":" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testConnectToServerEndpointNoHost() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -137,10 +131,8 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
- wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
- ClientEndpointConfig.Builder.create().build(),
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://" + TesterEchoServer.Config.PATH_ASYNC));
}
@@ -193,8 +185,8 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
}
- private void doBufferTest(boolean isTextBuffer, boolean isServerBuffer,
- boolean isTextMessage, boolean pass) throws Exception {
+ private void doBufferTest(boolean isTextBuffer, boolean isServerBuffer,
boolean isTextMessage, boolean pass)
+ throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -203,19 +195,16 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
if (isServerBuffer) {
if (isTextBuffer) {
ctx.addParameter(
- org.apache.tomcat.websocket.server.Constants.
- TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM,
+
org.apache.tomcat.websocket.server.Constants.TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM,
"1024");
} else {
ctx.addParameter(
- org.apache.tomcat.websocket.server.Constants.
- BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM,
+
org.apache.tomcat.websocket.server.Constants.BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM,
"1024");
}
} else {
@@ -228,15 +217,12 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("ws://" + getHostName() + ":" + getPort() +
- TesterEchoServer.Config.PATH_BASIC));
+ new URI("ws://" + getHostName() + ":" + getPort() +
TesterEchoServer.Config.PATH_BASIC));
BasicHandler<?> handler;
CountDownLatch latch = new CountDownLatch(1);
- TesterEndpoint tep =
- (TesterEndpoint) wsSession.getUserProperties().get("endpoint");
+ TesterEndpoint tep = (TesterEndpoint)
wsSession.getUserProperties().get("endpoint");
tep.setLatch(latch);
if (isTextMessage) {
handler = new BasicText(latch);
@@ -249,8 +235,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
if (isTextMessage) {
wsSession.getBasicRemote().sendText(MESSAGE_TEXT_4K);
} else {
- wsSession.getBasicRemote().sendBinary(
- ByteBuffer.wrap(MESSAGE_BINARY_4K));
+
wsSession.getBasicRemote().sendBinary(ByteBuffer.wrap(MESSAGE_BINARY_4K));
}
} catch (IOException ioe) {
// Some messages sends are expected to fail. Assertions further on
@@ -268,8 +253,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
if (isTextMessage) {
Assert.assertEquals(MESSAGE_TEXT_4K, messages.peek());
} else {
- Assert.assertEquals(ByteBuffer.wrap(MESSAGE_BINARY_4K),
- messages.peek());
+ Assert.assertEquals(ByteBuffer.wrap(MESSAGE_BINARY_4K),
messages.peek());
}
} else {
// When the message exceeds the buffer size, the WebSocket is
@@ -296,9 +280,8 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
@Override
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc =
- (ServerContainer) sce.getServletContext().getAttribute(
-
org.apache.tomcat.websocket.server.Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer)
sce.getServletContext().getAttribute(
+
org.apache.tomcat.websocket.server.Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
// Reset blocking state
BlockingPojo.resetBlock();
@@ -332,6 +315,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
block = true;
}
}
+
@SuppressWarnings("unused")
@OnMessage
public void echoTextMessage(Session session, String msg, boolean last)
{
@@ -349,8 +333,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
@SuppressWarnings("unused")
@OnMessage
- public void echoBinaryMessage(Session session, ByteBuffer msg,
- boolean last) {
+ public void echoBinaryMessage(Session session, ByteBuffer msg, boolean
last) {
try {
synchronized (monitor) {
while (block) {
@@ -364,8 +347,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
}
- public static class BlockingBinaryHandler
- implements MessageHandler.Partial<ByteBuffer> {
+ public static class BlockingBinaryHandler implements
MessageHandler.Partial<ByteBuffer> {
@Override
public void onMessage(ByteBuffer messagePart, boolean last) {
@@ -389,22 +371,16 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
EndpointA endpointA = new EndpointA();
- Session s1a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
- Session s2a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
- Session s3a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
+ Session s1a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+ Session s2a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+ Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
EndpointB endpointB = new EndpointB();
- Session s1b = connectToEchoServer(wsContainer, endpointB,
- TesterEchoServer.Config.PATH_BASIC);
- Session s2b = connectToEchoServer(wsContainer, endpointB,
- TesterEchoServer.Config.PATH_BASIC);
+ Session s1b = connectToEchoServer(wsContainer, endpointB,
TesterEchoServer.Config.PATH_BASIC);
+ Session s2b = connectToEchoServer(wsContainer, endpointB,
TesterEchoServer.Config.PATH_BASIC);
Set<Session> setA = s3a.getOpenSessions();
Assert.assertEquals(3, setA.size());
@@ -467,7 +443,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
// but that is still well under the 90s configured for the session.
int count = 0;
while (count < 300 && s1a.isOpen()) {
- count ++;
+ count++;
Thread.sleep(100);
}
Assert.assertFalse(s1a.isOpen());
@@ -507,7 +483,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
// but that is still well under the 90s configured for the session.
int count = 0;
while (count < 300 && s1a.isOpen()) {
- count ++;
+ count++;
Thread.sleep(100);
}
Assert.assertFalse(s1a.isOpen());
@@ -546,18 +522,12 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
- ClientEndpointConfig clientEndpointConfig =
- ClientEndpointConfig.Builder.create().build();
- clientEndpointConfig.getUserProperties().put(
- org.apache.tomcat.websocket.Constants.SSL_TRUSTSTORE_PROPERTY,
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
+
clientEndpointConfig.getUserProperties().put(org.apache.tomcat.websocket.Constants.SSL_TRUSTSTORE_PROPERTY,
TesterSupport.CA_JKS);
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
- new URI("wss://" + getHostName() + ":" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC));
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
+ new URI("wss://" + getHostName() + ":" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
wsSession.addMessageHandler(handler);
@@ -575,48 +545,45 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
@Test
public void testMaxMessageSize01() throws Exception {
- doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_LOW,
- TesterEchoServer.BasicLimitLow.MAX_SIZE - 1, true);
+ doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_LOW,
TesterEchoServer.BasicLimitLow.MAX_SIZE - 1,
+ true);
}
@Test
public void testMaxMessageSize02() throws Exception {
- doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_LOW,
- TesterEchoServer.BasicLimitLow.MAX_SIZE, true);
+ doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_LOW,
TesterEchoServer.BasicLimitLow.MAX_SIZE, true);
}
@Test
public void testMaxMessageSize03() throws Exception {
- doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_LOW,
- TesterEchoServer.BasicLimitLow.MAX_SIZE + 1, false);
+ doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_LOW,
TesterEchoServer.BasicLimitLow.MAX_SIZE + 1,
+ false);
}
@Test
public void testMaxMessageSize04() throws Exception {
- doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_HIGH,
- TesterEchoServer.BasicLimitHigh.MAX_SIZE - 1, true);
+ doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_HIGH,
TesterEchoServer.BasicLimitHigh.MAX_SIZE - 1,
+ true);
}
@Test
public void testMaxMessageSize05() throws Exception {
- doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_HIGH,
- TesterEchoServer.BasicLimitHigh.MAX_SIZE, true);
+ doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_HIGH,
TesterEchoServer.BasicLimitHigh.MAX_SIZE, true);
}
@Test
public void testMaxMessageSize06() throws Exception {
- doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_HIGH,
- TesterEchoServer.BasicLimitHigh.MAX_SIZE + 1, false);
+ doMaxMessageSize(TesterEchoServer.Config.PATH_BASIC_LIMIT_HIGH,
TesterEchoServer.BasicLimitHigh.MAX_SIZE + 1,
+ false);
}
- private void doMaxMessageSize(String path, long size, boolean expectOpen)
- throws Exception {
+ private void doMaxMessageSize(String path, long size, boolean expectOpen)
throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -627,8 +594,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
tomcat.start();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
Session s = connectToEchoServer(wsContainer, new EndpointA(), path);
@@ -651,8 +617,7 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
open = s.isOpen();
}
- Assert.assertEquals(Boolean.valueOf(expectOpen),
- Boolean.valueOf(s.isOpen()));
+ Assert.assertEquals(Boolean.valueOf(expectOpen),
Boolean.valueOf(s.isOpen()));
// Close the session if it is expected to be open
if (expectOpen) {
@@ -715,16 +680,11 @@ public class TestWsWebSocketContainer extends
WsWebSocketContainerBaseTest {
List<Extension> extensions = new ArrayList<>(1);
extensions.add(perMessageDeflate);
- ClientEndpointConfig clientConfig =
-
ClientEndpointConfig.Builder.create().extensions(extensions).build();
+ ClientEndpointConfig clientConfig =
ClientEndpointConfig.Builder.create().extensions(extensions).build();
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientConfig,
- new URI("ws://" + getHostName() + ":" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC));
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class, clientConfig,
+ new URI("ws://" + getHostName() + ":" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(count);
BasicText handler = new BasicText(latch, msg);
wsSession.addMessageHandler(handler);
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
index 033ee6367e..022c49d75f 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerGetOpenSessions.java
@@ -164,8 +164,8 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
- private void doTest(Endpoint client1, Endpoint client2, String server1,
String server2,
- int client1Count, int client2Count, int server1Count, int
server2Count) throws Exception {
+ private void doTest(Endpoint client1, Endpoint client2, String server1,
String server2, int client1Count,
+ int client2Count, int server1Count, int server2Count) throws
Exception {
Tracker.reset();
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -205,12 +205,10 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
- private Session createSession(WebSocketContainer wsContainer, Endpoint
client,
- String clientName, String server)
+ private Session createSession(WebSocketContainer wsContainer, Endpoint
client, String clientName, String server)
throws DeploymentException, IOException, URISyntaxException {
- Session s = wsContainer.connectToServer(client,
- ClientEndpointConfig.Builder.create().build(),
+ Session s = wsContainer.connectToServer(client,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://localhost:" + getPort() + server));
Tracker.addRecord(clientName, s.getOpenSessions().size());
s.getBasicRemote().sendText("X");
@@ -223,17 +221,14 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
@Override
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc =
- (ServerContainer) sce.getServletContext().getAttribute(
-
Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer) sce.getServletContext()
+
.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
sc.addEndpoint(PojoEndpointA.class);
sc.addEndpoint(PojoEndpointB.class);
- sc.addEndpoint(ServerEndpointConfig.Builder.create(
- ServerEndpointA.class, "/progA").build());
- sc.addEndpoint(ServerEndpointConfig.Builder.create(
- ServerEndpointB.class, "/progB").build());
+
sc.addEndpoint(ServerEndpointConfig.Builder.create(ServerEndpointA.class,
"/progA").build());
+
sc.addEndpoint(ServerEndpointConfig.Builder.create(ServerEndpointB.class,
"/progB").build());
} catch (DeploymentException e) {
throw new IllegalStateException(e);
}
@@ -272,7 +267,7 @@ public class TestWsWebSocketContainerGetOpenSessions
extends WebSocketBaseTest {
}
- public abstract static class ServerEndpointBase extends Endpoint{
+ public abstract static class ServerEndpointBase extends Endpoint {
@Override
public void onOpen(Session session, EndpointConfig config) {
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
index 4359856867..5eed76adc1 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpiryContainer.java
@@ -35,7 +35,7 @@ import
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerSessionExpiryContainer extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpiryContainer extends
WsWebSocketContainerBaseTest {
@Test
public void testSessionExpiryContainer() throws Exception {
@@ -50,20 +50,16 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocket
tomcat.start();
// Need access to implementation methods for configuring unit tests
- WsWebSocketContainer wsContainer = (WsWebSocketContainer)
- ContainerProvider.getWebSocketContainer();
+ WsWebSocketContainer wsContainer = (WsWebSocketContainer)
ContainerProvider.getWebSocketContainer();
// 5 second timeout
wsContainer.setDefaultMaxSessionIdleTimeout(5000);
wsContainer.setProcessPeriod(1);
EndpointA endpointA = new EndpointA();
- connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
- connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
- Session s3a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
+ connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+ connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
+ Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
// Check all three sessions are open
Set<Session> setA = s3a.getOpenSessions();
@@ -72,7 +68,7 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocket
int count = 0;
boolean isOpen = true;
while (isOpen && count < 8) {
- count ++;
+ count++;
Thread.sleep(1000);
isOpen = false;
for (Session session : setA) {
@@ -86,8 +82,7 @@ public class TestWsWebSocketContainerSessionExpiryContainer
extends WsWebSocket
if (isOpen) {
for (Session session : setA) {
if (session.isOpen()) {
- System.err.println("Session with ID [" + session.getId() +
- "] is open");
+ System.err.println("Session with ID [" + session.getId() +
"] is open");
}
}
Assert.fail("There were open sessions");
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpirySession.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpirySession.java
index d00e06324a..8ec230e02b 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpirySession.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSessionExpirySession.java
@@ -35,7 +35,7 @@ import
org.apache.tomcat.websocket.TestWsWebSocketContainer.EndpointA;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerSessionExpirySession extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerSessionExpirySession extends
WsWebSocketContainerBaseTest {
@Test
public void testSessionExpirySession() throws Exception {
@@ -50,22 +50,18 @@ public class TestWsWebSocketContainerSessionExpirySession
extends WsWebSocketCo
tomcat.start();
// Need access to implementation methods for configuring unit tests
- WsWebSocketContainer wsContainer = (WsWebSocketContainer)
- ContainerProvider.getWebSocketContainer();
+ WsWebSocketContainer wsContainer = (WsWebSocketContainer)
ContainerProvider.getWebSocketContainer();
// 5 second timeout
wsContainer.setDefaultMaxSessionIdleTimeout(5000);
wsContainer.setProcessPeriod(1);
EndpointA endpointA = new EndpointA();
- Session s1a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
+ Session s1a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
s1a.setMaxIdleTimeout(3000);
- Session s2a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
+ Session s2a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
s2a.setMaxIdleTimeout(6000);
- Session s3a = connectToEchoServer(wsContainer, endpointA,
- TesterEchoServer.Config.PATH_BASIC);
+ Session s3a = connectToEchoServer(wsContainer, endpointA,
TesterEchoServer.Config.PATH_BASIC);
s3a.setMaxIdleTimeout(9000);
// Check all three sessions are open
@@ -77,7 +73,7 @@ public class TestWsWebSocketContainerSessionExpirySession
extends WsWebSocketCo
int count = 0;
while (getOpenCount(setA) == expected && count < 50) {
- count ++;
+ count++;
Thread.sleep(100);
}
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutClient.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutClient.java
index 69e449d27d..2a8f12d826 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutClient.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutClient.java
@@ -41,7 +41,7 @@ import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEn
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainerBaseTest {
@Test
public void testWriteTimeoutClientContainer() throws Exception {
@@ -55,8 +55,7 @@ public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainer
}
- private void doTestWriteTimeoutClient(boolean setTimeoutOnContainer)
- throws Exception {
+ private void doTestWriteTimeoutClient(boolean setTimeoutOnContainer)
throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
@@ -65,8 +64,7 @@ public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainer
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
// Set the async timeout
if (setTimeoutOnContainer) {
@@ -75,8 +73,7 @@ public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainer
tomcat.start();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://" + getHostName() + ":" + getPort() +
BlockingConfig.PATH));
@@ -92,8 +89,7 @@ public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainer
try {
while (true) {
lastSend = System.currentTimeMillis();
- Future<Void> f = wsSession.getAsyncRemote().sendBinary(
- ByteBuffer.wrap(MESSAGE_BINARY_4K));
+ Future<Void> f =
wsSession.getAsyncRemote().sendBinary(ByteBuffer.wrap(MESSAGE_BINARY_4K));
f.get();
}
} catch (Exception e) {
@@ -113,7 +109,7 @@ public class TestWsWebSocketContainerTimeoutClient extends
WsWebSocketContainer
String msg = "Time out was [" + timeout + "] ms";
// Check correct time passed
- Assert.assertTrue(msg, timeout >= TIMEOUT_MS - MARGIN );
+ Assert.assertTrue(msg, timeout >= TIMEOUT_MS - MARGIN);
// Check the timeout wasn't too long
Assert.assertTrue(msg, timeout < TIMEOUT_MS * 2);
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutServer.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutServer.java
index 5213099aae..c79a6f6bb9 100644
---
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutServer.java
+++
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerTimeoutServer.java
@@ -49,7 +49,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
* significantly extends the length of a test run when using multiple test
* threads.
*/
-public class TestWsWebSocketContainerTimeoutServer extends
WsWebSocketContainerBaseTest {
+public class TestWsWebSocketContainerTimeoutServer extends
WsWebSocketContainerBaseTest {
@Test
public void testWriteTimeoutServerContainer() throws Exception {
@@ -65,13 +65,11 @@ public class TestWsWebSocketContainerTimeoutServer extends
WsWebSocketContainer
private static volatile boolean timeoutOnContainer = false;
- private void doTestWriteTimeoutServer(boolean setTimeoutOnContainer)
- throws Exception {
+ private void doTestWriteTimeoutServer(boolean setTimeoutOnContainer)
throws Exception {
/*
- * Note: There are all sorts of horrible uses of statics in this test
- * because the API uses classes and the tests really need access
- * to the instances which simply isn't possible.
+ * Note: There are all sorts of horrible uses of statics in this test
because the API uses classes and the tests
+ * really need access to the instances which simply isn't possible.
*/
timeoutOnContainer = setTimeoutOnContainer;
@@ -83,16 +81,13 @@ public class TestWsWebSocketContainerTimeoutServer extends
WsWebSocketContainer
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
ClientEndpointConfig.Builder.create().build(),
- new URI("ws://" + getHostName() + ":" + getPort() +
- ConstantTxConfig.PATH));
+ new URI("ws://" + getHostName() + ":" + getPort() +
ConstantTxConfig.PATH));
wsSession.addMessageHandler(new BlockingBinaryHandler());
@@ -111,17 +106,15 @@ public class TestWsWebSocketContainerTimeoutServer
extends WsWebSocketContainer
// Check the right exception was thrown
Assert.assertNotNull(ConstantTxEndpoint.getException());
- Assert.assertEquals(ExecutionException.class,
- ConstantTxEndpoint.getException().getClass());
+ Assert.assertEquals(ExecutionException.class,
ConstantTxEndpoint.getException().getClass());
Assert.assertNotNull(ConstantTxEndpoint.getException().getCause());
- Assert.assertEquals(SocketTimeoutException.class,
- ConstantTxEndpoint.getException().getCause().getClass());
+ Assert.assertEquals(SocketTimeoutException.class,
ConstantTxEndpoint.getException().getCause().getClass());
// Check correct time passed
Assert.assertTrue(ConstantTxEndpoint.getTimeout() >= TIMEOUT_MS);
// Check the timeout wasn't too long
- Assert.assertTrue(ConstantTxEndpoint.getTimeout() < TIMEOUT_MS*2);
+ Assert.assertTrue(ConstantTxEndpoint.getTimeout() < TIMEOUT_MS * 2);
}
@@ -132,12 +125,10 @@ public class TestWsWebSocketContainerTimeoutServer
extends WsWebSocketContainer
@Override
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc =
- (ServerContainer) sce.getServletContext().getAttribute(
-
org.apache.tomcat.websocket.server.Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer)
sce.getServletContext().getAttribute(
+
org.apache.tomcat.websocket.server.Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
- sc.addEndpoint(ServerEndpointConfig.Builder.create(
- ConstantTxEndpoint.class, PATH).build());
+
sc.addEndpoint(ServerEndpointConfig.Builder.create(ConstantTxEndpoint.class,
PATH).build());
if (timeoutOnContainer) {
sc.setAsyncSendTimeout(TIMEOUT_MS);
}
@@ -175,8 +166,7 @@ public class TestWsWebSocketContainerTimeoutServer extends
WsWebSocketContainer
try {
while (true) {
lastSend = System.currentTimeMillis();
- Future<Void> f = session.getAsyncRemote().sendBinary(
- ByteBuffer.wrap(MESSAGE_BINARY_4K));
+ Future<Void> f =
session.getAsyncRemote().sendBinary(ByteBuffer.wrap(MESSAGE_BINARY_4K));
f.get();
}
} catch (ExecutionException | InterruptedException e) {
diff --git
a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
index 64bb5a7547..f7f4c6a03e 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerWithProxy.java
@@ -39,7 +39,7 @@ public class TestWsWebSocketContainerWithProxy extends
TestWsWebSocketContainer
// With httpd 2.2, AllowCONNECT requires fixed ports. From 2.4, a range
// can be used.
getTomcatInstance().getConnector().setPort(8080);
-
Assert.assertTrue(getTomcatInstance().getConnector().setProperty("address","0.0.0.0"));
+
Assert.assertTrue(getTomcatInstance().getConnector().setProperty("address",
"0.0.0.0"));
}
@Override
diff --git a/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
b/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
index e9b7a3a593..07f12f94e0 100644
--- a/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
+++ b/test/org/apache/tomcat/websocket/TesterAsyncTiming.java
@@ -45,8 +45,8 @@ public class TesterAsyncTiming {
@ServerEndpoint(Config.PATH)
public static class Endpoint {
- private static final ByteBuffer LARGE_DATA= ByteBuffer.allocate(16 *
1024);
- private static final ByteBuffer SMALL_DATA= ByteBuffer.allocate(4 *
1024);
+ private static final ByteBuffer LARGE_DATA = ByteBuffer.allocate(16 *
1024);
+ private static final ByteBuffer SMALL_DATA = ByteBuffer.allocate(4 *
1024);
@OnMessage
public void onMessage(Session session, @SuppressWarnings("unused")
String text) {
diff --git a/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
b/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
index 423e01e415..9fa360f795 100644
--- a/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
+++ b/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
@@ -24,18 +24,15 @@ import javax.websocket.server.ServerApplicationConfig;
import javax.websocket.server.ServerEndpointConfig;
/**
- * This configuration blocks any endpoints discovered by the SCI from being
- * deployed. It is intended to prevent testing errors generated when the
- * WebSocket SCI scans the test classes for endpoints as it will discover
- * multiple endpoints mapped to the same path ('/'). The tests all explicitly
- * configure their required endpoints so have no need for SCI based
- * configuration.
+ * This configuration blocks any endpoints discovered by the SCI from being
deployed. It is intended to prevent testing
+ * errors generated when the WebSocket SCI scans the test classes for
endpoints as it will discover multiple endpoints
+ * mapped to the same path ('/'). The tests all explicitly configure their
required endpoints so have no need for SCI
+ * based configuration.
*/
public class TesterBlockWebSocketSCI implements ServerApplicationConfig {
@Override
- public Set<ServerEndpointConfig> getEndpointConfigs(
- Set<Class<? extends Endpoint>> scanned) {
+ public Set<ServerEndpointConfig> getEndpointConfigs(Set<Class<? extends
Endpoint>> scanned) {
return Collections.emptySet();
}
diff --git a/test/org/apache/tomcat/websocket/TesterEchoServer.java
b/test/org/apache/tomcat/websocket/TesterEchoServer.java
index c6712082f3..b5c537e127 100644
--- a/test/org/apache/tomcat/websocket/TesterEchoServer.java
+++ b/test/org/apache/tomcat/websocket/TesterEchoServer.java
@@ -42,9 +42,8 @@ public class TesterEchoServer {
@Override
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc =
- (ServerContainer) sce.getServletContext().getAttribute(
-
Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer) sce.getServletContext()
+
.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
sc.addEndpoint(Async.class);
sc.addEndpoint(Basic.class);
@@ -77,8 +76,7 @@ public class TesterEchoServer {
@OnMessage
- public void echoBinaryMessage(Session session, ByteBuffer msg,
- boolean last) {
+ public void echoBinaryMessage(Session session, ByteBuffer msg, boolean
last) {
try {
session.getBasicRemote().sendBinary(msg, last);
} catch (IOException e) {
diff --git a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
index 851f9fe476..08303e1abb 100644
--- a/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
+++ b/test/org/apache/tomcat/websocket/TesterFirehoseServer.java
@@ -32,8 +32,8 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.websocket.server.TesterEndpointConfig;
/**
- * Sends {@link #MESSAGE_COUNT} messages of size {@link #MESSAGE_SIZE} bytes as
- * quickly as possible after the client sends its first message.
+ * Sends {@link #MESSAGE_COUNT} messages of size {@link #MESSAGE_SIZE} bytes
as quickly as possible after the client
+ * sends its first message.
*/
public class TesterFirehoseServer {
@@ -156,8 +156,7 @@ public class TesterFirehoseServer {
}
public void doRun() throws IOException {
- session.getUserProperties().put(
-
org.apache.tomcat.websocket.Constants.BLOCKING_SEND_TIMEOUT_PROPERTY,
+
session.getUserProperties().put(org.apache.tomcat.websocket.Constants.BLOCKING_SEND_TIMEOUT_PROPERTY,
Long.valueOf(SEND_TIME_OUT_MILLIS));
Basic remote = session.getBasicRemote();
diff --git a/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
b/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
index f340cbb0d7..a18362536d 100644
--- a/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
+++ b/test/org/apache/tomcat/websocket/TesterMessageCountClient.java
@@ -39,8 +39,7 @@ public class TesterMessageCountClient {
void setLatch(CountDownLatch latch);
}
- public static class TesterProgrammaticEndpoint
- extends Endpoint implements TesterEndpoint {
+ public static class TesterProgrammaticEndpoint extends Endpoint implements
TesterEndpoint {
private CountDownLatch latch = null;
@@ -108,8 +107,7 @@ public class TesterMessageCountClient {
}
- public abstract static class BasicHandler<T>
- implements MessageHandler.Whole<T> {
+ public abstract static class BasicHandler<T> implements
MessageHandler.Whole<T> {
private final CountDownLatch latch;
@@ -162,9 +160,7 @@ public class TesterMessageCountClient {
getMessages().add(message);
} else {
if (!expected.equals(message)) {
- throw new IllegalStateException(
- "Expected: [" + expected + "]\r\n" +
- "Was: [" + message + "]");
+ throw new IllegalStateException("Expected: [" + expected +
"]\r\n" + "Was: [" + message + "]");
}
}
if (getLatch() != null) {
@@ -191,8 +187,7 @@ public class TesterMessageCountClient {
}
}
- public abstract static class AsyncHandler<T>
- implements MessageHandler.Partial<T> {
+ public abstract static class AsyncHandler<T> implements
MessageHandler.Partial<T> {
private final CountDownLatch latch;
diff --git a/test/org/apache/tomcat/websocket/TesterWebSocketClientProxy.java
b/test/org/apache/tomcat/websocket/TesterWebSocketClientProxy.java
index c0ff57db95..9e20ed394c 100644
--- a/test/org/apache/tomcat/websocket/TesterWebSocketClientProxy.java
+++ b/test/org/apache/tomcat/websocket/TesterWebSocketClientProxy.java
@@ -171,11 +171,8 @@ public class TesterWebSocketClientProxy extends
WebSocketBaseTest {
clientEndpointConfig.getUserProperties().put(Constants.WS_AUTHENTICATION_PROXY_PASSWORD,
PROXY_PASSWORD);
}
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
- new URI("ws://" + TOMCAT_ADDRESS + ":" + getPort() +
- TesterEchoServer.Config.PATH_ASYNC));
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
+ new URI("ws://" + TOMCAT_ADDRESS + ":" + getPort() +
TesterEchoServer.Config.PATH_ASYNC));
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
wsSession.addMessageHandler(handler);
diff --git a/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
b/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
index 2cc04e9ba8..cdabbfac53 100644
--- a/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
+++ b/test/org/apache/tomcat/websocket/TesterWsClientAutobahn.java
@@ -38,8 +38,7 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.websocket.pojo.PojoEndpointClient;
/**
- * Runs the Autobahn test suite in client mode for testing the WebSocket client
- * implementation.
+ * Runs the Autobahn test suite in client mode for testing the WebSocket
client implementation.
*/
public class TesterWsClientAutobahn {
@@ -73,8 +72,7 @@ public class TesterWsClientAutobahn {
}
- private static int getTestCaseCount(WebSocketContainer wsc)
- throws Exception {
+ private static int getTestCaseCount(WebSocketContainer wsc) throws
Exception {
URI uri = new URI("ws://" + HOST + ":" + PORT + "/getCaseCount");
CaseCountClient caseCountClient = new CaseCountClient();
@@ -83,10 +81,8 @@ public class TesterWsClientAutobahn {
}
- private static void executeTestCase(WebSocketContainer wsc, int testCase)
- throws Exception {
- URI uri = new URI("ws://" + HOST + ":" + PORT + "/runCase?case=" +
- testCase + "&agent=" + USER_AGENT);
+ private static void executeTestCase(WebSocketContainer wsc, int testCase)
throws Exception {
+ URI uri = new URI("ws://" + HOST + ":" + PORT + "/runCase?case=" +
testCase + "&agent=" + USER_AGENT);
TestCaseClient testCaseClient = new TestCaseClient();
Extension permessageDeflate = new WsExtension("permessage-deflate");
@@ -94,8 +90,7 @@ public class TesterWsClientAutobahn {
// Client only supports some values so there will be some failures here
// Note Autobahn returns a 400 response if you provide a value for
// client_max_window_bits
- permessageDeflate.getParameters().add(
- new WsExtensionParameter("client_max_window_bits", null));
+ permessageDeflate.getParameters().add(new
WsExtensionParameter("client_max_window_bits", null));
List<Extension> extensions = new ArrayList<>(1);
extensions.add(permessageDeflate);
@@ -108,11 +103,9 @@ public class TesterWsClientAutobahn {
}
- private static void updateReports(WebSocketContainer wsc)
- throws Exception {
+ private static void updateReports(WebSocketContainer wsc) throws Exception
{
- URI uri = new URI("ws://" + HOST + ":" + PORT +
- "/updateReports?agent=" + USER_AGENT);
+ URI uri = new URI("ws://" + HOST + ":" + PORT +
"/updateReports?agent=" + USER_AGENT);
UpdateReportsClient updateReportsClient = new UpdateReportsClient();
wsc.connectToServer(updateReportsClient, uri);
}
@@ -170,8 +163,7 @@ public class TesterWsClientAutobahn {
}
@OnMessage
- public void echoBinaryMessage(Session session, ByteBuffer bb,
- boolean last) {
+ public void echoBinaryMessage(Session session, ByteBuffer bb, boolean
last) {
try {
if (session.isOpen()) {
session.getBasicRemote().sendBinary(bb, last);
diff --git a/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
b/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
index 3d55c9d161..84b8414fcd 100644
--- a/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
+++ b/test/org/apache/tomcat/websocket/WebSocketBaseTest.java
@@ -28,9 +28,7 @@ import org.apache.tomcat.websocket.server.WsContextListener;
public abstract class WebSocketBaseTest extends TomcatBaseTest {
- protected Tomcat startServer(
- final Class<? extends WsContextListener> configClass)
- throws LifecycleException {
+ protected Tomcat startServer(final Class<? extends WsContextListener>
configClass) throws LifecycleException {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
diff --git a/test/org/apache/tomcat/websocket/WsWebSocketContainerBaseTest.java
b/test/org/apache/tomcat/websocket/WsWebSocketContainerBaseTest.java
index 3efb89fa3e..b9c3641883 100644
--- a/test/org/apache/tomcat/websocket/WsWebSocketContainerBaseTest.java
+++ b/test/org/apache/tomcat/websocket/WsWebSocketContainerBaseTest.java
@@ -39,10 +39,9 @@ public class WsWebSocketContainerBaseTest extends
WebSocketBaseTest {
}
- protected Session connectToEchoServer(WebSocketContainer wsContainer,
- Endpoint endpoint, String path) throws Exception {
- return wsContainer.connectToServer(endpoint,
- ClientEndpointConfig.Builder.create().build(),
+ protected Session connectToEchoServer(WebSocketContainer wsContainer,
Endpoint endpoint, String path)
+ throws Exception {
+ return wsContainer.connectToServer(endpoint,
ClientEndpointConfig.Builder.create().build(),
new URI("ws://" + getHostName() + ":" + getPort() + path));
}
}
diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index 69f899d76c..1aeb2b65f2 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -74,7 +74,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Test
- public void testProgrammaticEndPoints() throws Exception{
+ public void testProgrammaticEndPoints() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -96,8 +96,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
// Should not take very long
int i = 0;
while (i < WAIT_LOOPS) {
- if (MsgStringMessageHandler.received.size() > 0 &&
- client.received.size() > 0) {
+ if (MsgStringMessageHandler.received.size() > 0 &&
client.received.size() > 0) {
break;
}
i++;
@@ -109,10 +108,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Assert.assertEquals(1, client.received.size());
// Check correct messages were received
- Assert.assertEquals(MESSAGE_ONE,
- ((MsgString)
MsgStringMessageHandler.received.peek()).getData());
- Assert.assertEquals(MESSAGE_ONE,
- new String(((MsgByte) client.received.peek()).getData()));
+ Assert.assertEquals(MESSAGE_ONE, ((MsgString)
MsgStringMessageHandler.received.peek()).getData());
+ Assert.assertEquals(MESSAGE_ONE, new String(((MsgByte)
client.received.peek()).getData()));
session.close();
}
@@ -131,8 +128,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -159,21 +155,19 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Assert.assertEquals(1, client.received.size());
// Check correct messages were received
- Assert.assertEquals(MESSAGE_ONE,
- ((MsgString) server.received.peek()).getData());
- Assert.assertEquals(MESSAGE_ONE,
- ((MsgString) client.received.peek()).getData());
+ Assert.assertEquals(MESSAGE_ONE, ((MsgString)
server.received.peek()).getData());
+ Assert.assertEquals(MESSAGE_ONE, ((MsgString)
client.received.peek()).getData());
session.close();
// Should not take very long but some failures have been seen
- i = testEvent(MsgStringEncoder.class.getName()+":init", 0);
- i = testEvent(MsgStringDecoder.class.getName()+":init", i);
- i = testEvent(MsgByteEncoder.class.getName()+":init", i);
- i = testEvent(MsgByteDecoder.class.getName()+":init", i);
- i = testEvent(MsgStringEncoder.class.getName()+":destroy", i);
- i = testEvent(MsgStringDecoder.class.getName()+":destroy", i);
- i = testEvent(MsgByteEncoder.class.getName()+":destroy", i);
- i = testEvent(MsgByteDecoder.class.getName()+":destroy", i);
+ i = testEvent(MsgStringEncoder.class.getName() + ":init", 0);
+ i = testEvent(MsgStringDecoder.class.getName() + ":init", i);
+ i = testEvent(MsgByteEncoder.class.getName() + ":init", i);
+ i = testEvent(MsgByteDecoder.class.getName() + ":init", i);
+ i = testEvent(MsgStringEncoder.class.getName() + ":destroy", i);
+ i = testEvent(MsgStringDecoder.class.getName() + ":destroy", i);
+ i = testEvent(MsgByteEncoder.class.getName() + ":destroy", i);
+ i = testEvent(MsgByteDecoder.class.getName() + ":destroy", i);
}
@@ -191,8 +185,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -240,8 +233,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -287,8 +279,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -334,7 +325,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
- @ClientEndpoint(decoders=ListStringDecoder.class,
encoders=ListStringEncoder.class)
+ @ClientEndpoint(decoders = ListStringDecoder.class, encoders =
ListStringEncoder.class)
public static class GenericsClient {
private final Queue<Object> received = new ConcurrentLinkedQueue<>();
@@ -345,8 +336,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
- @ClientEndpoint(decoders={MsgStringDecoder.class, MsgByteDecoder.class},
- encoders={MsgStringEncoder.class, MsgByteEncoder.class})
+ @ClientEndpoint(decoders = { MsgStringDecoder.class, MsgByteDecoder.class
}, encoders = { MsgStringEncoder.class,
+ MsgByteEncoder.class })
public static class Client {
private final Queue<Object> received = new ConcurrentLinkedQueue<>();
@@ -357,7 +348,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
@OnMessage
- public void rx(MsgByte in) {
+ public void rx(MsgByte in) {
received.add(in);
}
}
@@ -376,10 +367,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
- @ServerEndpoint(value=PATH_GENERICS_EP,
- decoders=ListStringDecoder.class,
- encoders=ListStringEncoder.class,
- configurator=SingletonConfigurator.class)
+ @ServerEndpoint(value = PATH_GENERICS_EP, decoders =
ListStringDecoder.class, encoders = ListStringEncoder.class, configurator =
SingletonConfigurator.class)
public static class GenericsServer {
private final Queue<Object> received = new ConcurrentLinkedQueue<>();
@@ -393,8 +381,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
- @ServerEndpoint(value=PATH_MESSAGES_EP,
- configurator=SingletonConfigurator.class)
+ @ServerEndpoint(value = PATH_MESSAGES_EP, configurator =
SingletonConfigurator.class)
public static class MessagesServer {
private final Queue<String> received = new ConcurrentLinkedQueue<>();
@@ -415,8 +402,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
- @ServerEndpoint(value=PATH_BATCHED_EP,
- configurator=SingletonConfigurator.class)
+ @ServerEndpoint(value = PATH_BATCHED_EP, configurator =
SingletonConfigurator.class)
public static class BatchedServer {
private final Queue<String> received = new ConcurrentLinkedQueue<>();
@@ -438,10 +424,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
}
}
- @ServerEndpoint(value=PATH_ANNOTATED_EP,
- decoders={MsgStringDecoder.class, MsgByteDecoder.class},
- encoders={MsgStringEncoder.class, MsgByteEncoder.class},
- configurator=SingletonConfigurator.class)
+ @ServerEndpoint(value = PATH_ANNOTATED_EP, decoders = {
MsgStringDecoder.class, MsgByteDecoder.class }, encoders = {
+ MsgStringEncoder.class, MsgByteEncoder.class }, configurator =
SingletonConfigurator.class)
public static class Server {
private final Queue<Object> received = new ConcurrentLinkedQueue<>();
@@ -461,19 +445,18 @@ public class TestEncodingDecoding extends TomcatBaseTest {
return in;
}
- public static void addLifeCycleEvent(String event){
+ public static void addLifeCycleEvent(String event) {
lifeCyclesCalled.put(event, Boolean.TRUE);
}
- public static boolean isLifeCycleEventCalled(String event){
+ public static boolean isLifeCycleEventCalled(String event) {
Boolean called = lifeCyclesCalled.get(event);
return called == null ? false : called.booleanValue();
}
}
- public static class MsgByteMessageHandler implements
- MessageHandler.Whole<MsgByte> {
+ public static class MsgByteMessageHandler implements
MessageHandler.Whole<MsgByte> {
public static final Queue<Object> received = new
ConcurrentLinkedQueue<>();
private final Session session;
@@ -521,17 +504,23 @@ public class TestEncodingDecoding extends TomcatBaseTest {
public static class ProgrammaticEndpoint extends Endpoint {
- @Override
- public void onOpen(Session session, EndpointConfig config) {
- session.addMessageHandler(new MsgStringMessageHandler(session));
- }
+ @Override
+ public void onOpen(Session session, EndpointConfig config) {
+ session.addMessageHandler(new MsgStringMessageHandler(session));
+ }
}
public static class MsgString {
private volatile String data;
- public String getData() { return data; }
- public void setData(String data) { this.data = data; }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
}
@@ -582,8 +571,14 @@ public class TestEncodingDecoding extends TomcatBaseTest {
public static class MsgByte {
private volatile byte[] data;
- public byte[] getData() { return data; }
- public void setData(byte[] data) { this.data = data; }
+
+ public byte[] getData() {
+ return data;
+ }
+
+ public void setData(byte[] data) {
+ this.data = data;
+ }
}
@@ -616,7 +611,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Override
public void init(EndpointConfig endpointConfig) {
- Server.addLifeCycleEvent(getClass().getName() + ":init");
+ Server.addLifeCycleEvent(getClass().getName() + ":init");
}
@Override
@@ -661,7 +656,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
public String encode(List<String> str) throws EncodeException {
StringBuffer sbuf = new StringBuffer();
sbuf.append('[');
- for (String s: str){
+ for (String s : str) {
sbuf.append(s).append(',');
}
sbuf.deleteCharAt(sbuf.lastIndexOf(",")).append(']');
@@ -674,7 +669,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Override
public void init(EndpointConfig endpointConfig) {
- Server.addLifeCycleEvent(getClass().getName() + ":init");
+ Server.addLifeCycleEvent(getClass().getName() + ":init");
}
@Override
@@ -685,7 +680,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Override
public List<String> decode(String str) throws DecodeException {
List<String> lst = new ArrayList<>(1);
- str = str.substring(1,str.length()-1);
+ str = str.substring(1, str.length() - 1);
String[] strings = str.split(",");
lst.addAll(Arrays.asList(strings));
return lst;
@@ -703,16 +698,15 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Override
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc =
- (ServerContainer) sce.getServletContext().getAttribute(
- org.apache.tomcat.websocket.server.Constants.
- SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer)
sce.getServletContext().getAttribute(
+
org.apache.tomcat.websocket.server.Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
sc.addEndpoint(new ServerEndpointConfig() {
@Override
public Map<String, Object> getUserProperties() {
return Collections.emptyMap();
}
+
@Override
public List<Class<? extends Encoder>> getEncoders() {
List<Class<? extends Encoder>> encoders = new
ArrayList<>(2);
@@ -720,6 +714,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
encoders.add(MsgByteEncoder.class);
return encoders;
}
+
@Override
public List<Class<? extends Decoder>> getDecoders() {
List<Class<? extends Decoder>> decoders = new
ArrayList<>(2);
@@ -727,22 +722,27 @@ public class TestEncodingDecoding extends TomcatBaseTest {
decoders.add(MsgByteDecoder.class);
return decoders;
}
+
@Override
public List<String> getSubprotocols() {
return Collections.emptyList();
}
+
@Override
public String getPath() {
return PATH_PROGRAMMATIC_EP;
}
+
@Override
public List<Extension> getExtensions() {
return Collections.emptyList();
}
+
@Override
public Class<?> getEndpointClass() {
return ProgrammaticEndpoint.class;
}
+
@Override
public Configurator getConfigurator() {
return new ServerEndpointConfig.Configurator() {
@@ -757,7 +757,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Test
- public void testUnsupportedObject() throws Exception{
+ public void testUnsupportedObject() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
diff --git a/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
b/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
index b98cdcdb3a..dfc47c84db 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java
@@ -58,8 +58,7 @@ public class TestPojoEndpointBase extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -89,8 +88,7 @@ public class TestPojoEndpointBase extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -109,15 +107,14 @@ public class TestPojoEndpointBase extends TomcatBaseTest {
public static class OnOpenServerEndpoint {
@OnOpen
- public void onOpen(@SuppressWarnings("unused") Session session,
- EndpointConfig config) {
+ public void onOpen(@SuppressWarnings("unused") Session session,
EndpointConfig config) {
if (config == null) {
throw new RuntimeException();
}
}
@OnError
- public void onError(@SuppressWarnings("unused") Throwable t){
+ public void onError(@SuppressWarnings("unused") Throwable t) {
throw new RuntimeException();
}
}
diff --git a/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
b/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
index e4ebc18272..86a92482f9 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
@@ -61,15 +61,13 @@ public class TestPojoMethodMapping extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
SimpleClient client = new SimpleClient();
- URI uri = new URI("ws://localhost:" + getPort() + "/" + PARAM_ONE +
- "/" + PARAM_TWO + "/" + PARAM_THREE);
+ URI uri = new URI("ws://localhost:" + getPort() + "/" + PARAM_ONE +
"/" + PARAM_TWO + "/" + PARAM_THREE);
Session session = wsContainer.connectToServer(client, uri);
session.getBasicRemote().sendText("NO-OP");
@@ -98,29 +96,25 @@ public class TestPojoMethodMapping extends TomcatBaseTest {
}
- @ServerEndpoint(value="/{one}/{two}/{three}",
- configurator=SingletonConfigurator.class)
+ @ServerEndpoint(value = "/{one}/{two}/{three}", configurator =
SingletonConfigurator.class)
public static final class Server {
private final List<String> errors = new ArrayList<>();
private volatile boolean closed;
@OnOpen
- public void onOpen(@PathParam("one") String p1, @PathParam("two")int
p2,
- @PathParam("three")boolean p3) {
+ public void onOpen(@PathParam("one") String p1, @PathParam("two") int
p2, @PathParam("three") boolean p3) {
checkParams("onOpen", p1, p2, p3);
}
@OnMessage
- public void onMessage(@SuppressWarnings("unused") String msg,
- @PathParam("one") String p1, @PathParam("two")int p2,
- @PathParam("three")boolean p3) {
+ public void onMessage(@SuppressWarnings("unused") String msg,
@PathParam("one") String p1,
+ @PathParam("two") int p2, @PathParam("three") boolean p3) {
checkParams("onMessage", p1, p2, p3);
}
@OnClose
- public void onClose(@PathParam("one") String p1,
- @PathParam("two")int p2, @PathParam("three")boolean p3) {
+ public void onClose(@PathParam("one") String p1, @PathParam("two") int
p2, @PathParam("three") boolean p3) {
checkParams("onClose", p1, p2, p3);
closed = true;
}
@@ -141,8 +135,7 @@ public class TestPojoMethodMapping extends TomcatBaseTest {
private void checkParam(String method, String expected, String actual)
{
if (!expected.equals(actual)) {
- errors.add("Method [" + method + "]. Expected [" + expected +
- "] was + [" + actual + "]");
+ errors.add("Method [" + method + "]. Expected [" + expected +
"] was + [" + actual + "]");
}
}
}
diff --git a/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
b/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
index d3611a0d6e..99aadd156b 100644
--- a/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
+++ b/test/org/apache/tomcat/websocket/pojo/TesterUtil.java
@@ -48,8 +48,7 @@ public class TesterUtil {
}
@Override
- public <T> T getEndpointInstance(Class<T> clazz)
- throws InstantiationException {
+ public <T> T getEndpointInstance(Class<T> clazz) throws
InstantiationException {
@SuppressWarnings("unchecked")
T result = (T) instance;
return result;
diff --git a/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
b/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
index 7937818b35..d12a63d9b7 100644
--- a/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
+++ b/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
@@ -54,9 +54,7 @@ public class TestAsyncMessages extends TomcatBaseTest {
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
new URI("ws://localhost:" + getPort() +
TesterAsyncTiming.Config.PATH));
AsyncTimingClientHandler handler = new AsyncTimingClientHandler();
@@ -80,7 +78,7 @@ public class TestAsyncMessages extends TomcatBaseTest {
public void onMessage(ByteBuffer message, boolean last) {
if (lastMessage == 0) {
// First message. Don't check
- sequence ++;
+ sequence++;
lastMessage = System.nanoTime();
} else {
long newTime = System.nanoTime();
@@ -88,9 +86,10 @@ public class TestAsyncMessages extends TomcatBaseTest {
lastMessage = newTime;
if (sequence == 0) {
- sequence ++;
+ sequence++;
if (message.capacity() != 8192) {
- System.out.println("Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
+ System.out.println(
+ "Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
fail = true;
}
if (diff < 40000000) {
@@ -98,9 +97,10 @@ public class TestAsyncMessages extends TomcatBaseTest {
fail = true;
}
} else if (sequence == 1) {
- sequence ++;
+ sequence++;
if (message.capacity() != 8192) {
- System.out.println("Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
+ System.out.println(
+ "Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
fail = true;
}
if (diff > 500000) {
@@ -110,7 +110,8 @@ public class TestAsyncMessages extends TomcatBaseTest {
} else if (sequence == 2) {
sequence = 0;
if (message.capacity() != 4096) {
- System.out.println("Expected size 4096 but was [" +
message.capacity() + "], count [" + count + "]");
+ System.out.println(
+ "Expected size 4096 but was [" +
message.capacity() + "], count [" + count + "]");
fail = true;
}
if (diff > 500000) {
@@ -120,7 +121,7 @@ public class TestAsyncMessages extends TomcatBaseTest {
}
}
- count ++;
+ count++;
if (count >= TesterAsyncTiming.Config.ITERATIONS * 3) {
latch.countDown();
}
diff --git a/test/org/apache/tomcat/websocket/server/TestClassLoader.java
b/test/org/apache/tomcat/websocket/server/TestClassLoader.java
index b182ef6bfc..ea5ed8d512 100644
--- a/test/org/apache/tomcat/websocket/server/TestClassLoader.java
+++ b/test/org/apache/tomcat/websocket/server/TestClassLoader.java
@@ -65,8 +65,7 @@ public class TestClassLoader extends WebSocketBaseTest {
Client client = new Client();
- Session wsSession = wsContainer.connectToServer(client,
- new URI("ws://localhost:" + getPort() + "/test"));
+ Session wsSession = wsContainer.connectToServer(client, new
URI("ws://localhost:" + getPort() + "/test"));
Assert.assertTrue(wsSession.isOpen());
@@ -77,7 +76,7 @@ public class TestClassLoader extends WebSocketBaseTest {
}
// Check it
- Assert.assertEquals(1, client.getMsgCount());
+ Assert.assertEquals(1, client.getMsgCount());
Assert.assertFalse(client.hasFailed());
wsSession.getBasicRemote().sendText("Testing");
@@ -88,7 +87,7 @@ public class TestClassLoader extends WebSocketBaseTest {
Thread.sleep(100);
}
- Assert.assertEquals(2, client.getMsgCount());
+ Assert.assertEquals(2, client.getMsgCount());
Assert.assertFalse(client.hasFailed());
wsSession.close();
diff --git a/test/org/apache/tomcat/websocket/server/TestClose.java
b/test/org/apache/tomcat/websocket/server/TestClose.java
index b1e28a36d5..97535709f3 100644
--- a/test/org/apache/tomcat/websocket/server/TestClose.java
+++ b/test/org/apache/tomcat/websocket/server/TestClose.java
@@ -68,7 +68,7 @@ public class TestClose extends WebSocketBaseTest {
// Parameter of an @OnError call
public volatile Throwable onErrorThrowable = null;
- //This is set to true for tests where the @OnMessage should send a
message
+ // This is set to true for tests where the @OnMessage should send a
message
public volatile boolean onMessageSends = false;
}
diff --git a/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
b/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
index f5a65997ad..2d128d58a2 100644
--- a/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
+++ b/test/org/apache/tomcat/websocket/server/TestCloseBug58624.java
@@ -67,7 +67,7 @@ public class TestCloseBug58624 extends WebSocketBaseTest {
count++;
Thread.sleep(100);
}
- Assert.assertNotEquals(0,
Bug58624ServerEndpoint.getOpenSessionCount());
+ Assert.assertNotEquals(0,
Bug58624ServerEndpoint.getOpenSessionCount());
// Now close the session
session.close();
@@ -78,10 +78,10 @@ public class TestCloseBug58624 extends WebSocketBaseTest {
count++;
Thread.sleep(100);
}
- Assert.assertEquals(0, Bug58624ServerEndpoint.getOpenSessionCount());
+ Assert.assertEquals(0, Bug58624ServerEndpoint.getOpenSessionCount());
// Ensure no errors were reported on the server
- Assert.assertEquals(0, Bug58624ServerEndpoint.getErrorCount());
+ Assert.assertEquals(0, Bug58624ServerEndpoint.getErrorCount());
if (client.getError() != null) {
throw client.getError();
@@ -114,11 +114,10 @@ public class TestCloseBug58624 extends WebSocketBaseTest {
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc = (ServerContainer)
sce.getServletContext().getAttribute(
- Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer) sce.getServletContext()
+
.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
- ServerEndpointConfig sec = ServerEndpointConfig.Builder.create(
- Bug58624ServerEndpoint.class, PATH).build();
+ ServerEndpointConfig sec =
ServerEndpointConfig.Builder.create(Bug58624ServerEndpoint.class, PATH).build();
try {
sc.addEndpoint(sec);
diff --git a/test/org/apache/tomcat/websocket/server/TestShutdown.java
b/test/org/apache/tomcat/websocket/server/TestShutdown.java
index 6cd7f18d74..4fb4593c75 100644
--- a/test/org/apache/tomcat/websocket/server/TestShutdown.java
+++ b/test/org/apache/tomcat/websocket/server/TestShutdown.java
@@ -42,8 +42,8 @@ import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEn
import org.apache.tomcat.websocket.WebSocketBaseTest;
/**
- * Tests inspired by https://bz.apache.org/bugzilla/show_bug.cgi?id=58835 to
- * check that WebSocket connections are closed gracefully on Tomcat shutdown.
+ * Tests inspired by https://bz.apache.org/bugzilla/show_bug.cgi?id=58835 to
check that WebSocket connections are closed
+ * gracefully on Tomcat shutdown.
*/
public class TestShutdown extends WebSocketBaseTest {
@@ -60,9 +60,7 @@ public class TestShutdown extends WebSocketBaseTest {
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
- Session wsSession = wsContainer.connectToServer(
- TesterProgrammaticEndpoint.class,
- clientEndpointConfig,
+ Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
new URI("ws://localhost:" + getPort() + "/test"));
CountDownLatch latch = new CountDownLatch(1);
BasicText handler = new BasicText(latch);
@@ -74,8 +72,7 @@ public class TestShutdown extends WebSocketBaseTest {
Thread.sleep(200);
count++;
}
- Assert.assertNotEquals("Message not received by server",
- EchoBufferedEndpoint.messageCount.get(), 0);
+ Assert.assertNotEquals("Message not received by server",
EchoBufferedEndpoint.messageCount.get(), 0);
tomcat.stop();
@@ -97,8 +94,7 @@ public class TestShutdown extends WebSocketBaseTest {
private static AtomicLong messageCount = new AtomicLong(0);
@OnOpen
- public void onOpen(Session session, @SuppressWarnings("unused")
EndpointConfig epc)
- throws IOException {
+ public void onOpen(Session session, @SuppressWarnings("unused")
EndpointConfig epc) throws IOException {
session.getAsyncRemote().setBatchingAllowed(true);
}
diff --git a/test/org/apache/tomcat/websocket/server/TestSlowClient.java
b/test/org/apache/tomcat/websocket/server/TestSlowClient.java
index 084d13a14f..eb118c314f 100644
--- a/test/org/apache/tomcat/websocket/server/TestSlowClient.java
+++ b/test/org/apache/tomcat/websocket/server/TestSlowClient.java
@@ -52,7 +52,8 @@ public class TestSlowClient extends WebSocketBaseTest {
// WebSocket client
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
- ClientEndpointConfig.Builder.create().build(), new
URI("ws://localhost:" + getPort() + TesterFirehoseServer.PATH));
+ ClientEndpointConfig.Builder.create().build(),
+ new URI("ws://localhost:" + getPort() +
TesterFirehoseServer.PATH));
// Configure a handler designed to create a backlog causing the server
// side write to time out.
wsSession.addMessageHandler(new VerySlowHandler());
diff --git a/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
b/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
index 697b48fb4e..af2344e8a4 100644
--- a/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
+++ b/test/org/apache/tomcat/websocket/server/TestUriTemplate.java
@@ -26,7 +26,7 @@ public class TestUriTemplate {
@Test
public void testBasic() throws Exception {
UriTemplate t = new UriTemplate("/{a}/{b}");
- Map<String,String> result = t.match(new UriTemplate("/foo/bar"));
+ Map<String, String> result = t.match(new UriTemplate("/foo/bar"));
Assert.assertEquals(2, result.size());
Assert.assertTrue(result.containsKey("a"));
@@ -39,40 +39,40 @@ public class TestUriTemplate {
@Test
public void testOneOfTwo() throws Exception {
UriTemplate t = new UriTemplate("/{a}/{b}");
- Map<String,String> result = t.match(new UriTemplate("/foo"));
+ Map<String, String> result = t.match(new UriTemplate("/foo"));
Assert.assertNull(result);
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testBasicPrefix() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("/x{a}/y{b}");
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testPrefixOneOfTwo() throws Exception {
UriTemplate t = new UriTemplate("/x{a}/y{b}");
t.match(new UriTemplate("/xfoo"));
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testPrefixTwoOfTwo() throws Exception {
UriTemplate t = new UriTemplate("/x{a}/y{b}");
t.match(new UriTemplate("/ybar"));
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testQuote1() throws Exception {
UriTemplate t = new UriTemplate("/.{a}");
t.match(new UriTemplate("/yfoo"));
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testQuote2() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("/.{a}");
@@ -82,7 +82,7 @@ public class TestUriTemplate {
@Test
public void testNoParams() throws Exception {
UriTemplate t = new UriTemplate("/foo/bar");
- Map<String,String> result = t.match(new UriTemplate("/foo/bar"));
+ Map<String, String> result = t.match(new UriTemplate("/foo/bar"));
Assert.assertEquals(0, result.size());
}
@@ -91,7 +91,7 @@ public class TestUriTemplate {
@Test
public void testSpecExample1_01() throws Exception {
UriTemplate t = new UriTemplate("/a/b");
- Map<String,String> result = t.match(new UriTemplate("/a/b"));
+ Map<String, String> result = t.match(new UriTemplate("/a/b"));
Assert.assertEquals(0, result.size());
}
@@ -100,7 +100,7 @@ public class TestUriTemplate {
@Test
public void testSpecExample1_02() throws Exception {
UriTemplate t = new UriTemplate("/a/b");
- Map<String,String> result = t.match(new UriTemplate("/a"));
+ Map<String, String> result = t.match(new UriTemplate("/a"));
Assert.assertNull(result);
}
@@ -109,7 +109,7 @@ public class TestUriTemplate {
@Test
public void testSpecExample1_03() throws Exception {
UriTemplate t = new UriTemplate("/a/b");
- Map<String,String> result = t.match(new UriTemplate("/a/bb"));
+ Map<String, String> result = t.match(new UriTemplate("/a/bb"));
Assert.assertNull(result);
}
@@ -118,7 +118,7 @@ public class TestUriTemplate {
@Test
public void testSpecExample2_01() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a/b"));
+ Map<String, String> result = t.match(new UriTemplate("/a/b"));
Assert.assertEquals(1, result.size());
Assert.assertEquals("b", result.get("var"));
@@ -128,7 +128,7 @@ public class TestUriTemplate {
@Test
public void testSpecExample2_02() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a/apple"));
+ Map<String, String> result = t.match(new UriTemplate("/a/apple"));
Assert.assertEquals(1, result.size());
Assert.assertEquals("apple", result.get("var"));
@@ -138,7 +138,7 @@ public class TestUriTemplate {
@Test
public void testSpecExample2_03() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a"));
+ Map<String, String> result = t.match(new UriTemplate("/a"));
Assert.assertNull(result);
}
@@ -147,13 +147,13 @@ public class TestUriTemplate {
@Test
public void testSpecExample2_04() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a/b/c"));
+ Map<String, String> result = t.match(new UriTemplate("/a/b/c"));
Assert.assertNull(result);
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testDuplicate01() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("/{var}/{var}");
@@ -163,7 +163,7 @@ public class TestUriTemplate {
@Test
public void testDuplicate02() throws Exception {
UriTemplate t = new UriTemplate("/{a}/{b}");
- Map<String,String> result = t.match(new UriTemplate("/x/x"));
+ Map<String, String> result = t.match(new UriTemplate("/x/x"));
Assert.assertEquals(2, result.size());
Assert.assertEquals("x", result.get("a"));
@@ -173,7 +173,7 @@ public class TestUriTemplate {
public void testEgMailingList01() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a/b/"));
+ Map<String, String> result = t.match(new UriTemplate("/a/b/"));
Assert.assertNull(result);
}
@@ -181,7 +181,7 @@ public class TestUriTemplate {
public void testEgMailingList02() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a/"));
+ Map<String, String> result = t.match(new UriTemplate("/a/"));
Assert.assertNull(result);
}
@@ -190,43 +190,43 @@ public class TestUriTemplate {
@Test
public void testEgMailingList03() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}");
- Map<String,String> result = t.match(new UriTemplate("/a"));
+ Map<String, String> result = t.match(new UriTemplate("/a"));
Assert.assertNull(result);
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testEgMailingList04() throws Exception {
UriTemplate t = new UriTemplate("/a/{var1}/{var2}");
@SuppressWarnings("unused")
- Map<String,String> result = t.match(new UriTemplate("/a//c"));
+ Map<String, String> result = t.match(new UriTemplate("/a//c"));
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testEgMailingList05() throws Exception {
UriTemplate t = new UriTemplate("/a/{var}/");
@SuppressWarnings("unused")
- Map<String,String> result = t.match(new UriTemplate("/a/b/"));
+ Map<String, String> result = t.match(new UriTemplate("/a/b/"));
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testSpecIssue194a() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("/a/../b");
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testSpecIssue194b() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("/./b");
}
- @Test(expected=javax.websocket.DeploymentException.class)
+ @Test(expected = javax.websocket.DeploymentException.class)
public void testSpecIssue194c() throws Exception {
@SuppressWarnings("unused")
UriTemplate t = new UriTemplate("//b");
diff --git
a/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
b/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
index 77987acd79..220b41aea2 100644
---
a/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
+++
b/test/org/apache/tomcat/websocket/server/TestWsRemoteEndpointImplServer.java
@@ -51,20 +51,15 @@ public class TestWsRemoteEndpointImplServer extends
WebSocketBaseTest {
/*
* https://bz.apache.org/bugzilla/show_bug.cgi?id=58624
*
- * This test requires three breakpoints to be set. Two in this file (marked
- * A & B with comments) and one (C) at the start of
- * WsRemoteEndpointImplServer.doWrite().
+ * This test requires three breakpoints to be set. Two in this file
(marked A & B with comments) and one (C) at the
+ * start of WsRemoteEndpointImplServer.doWrite().
*
- * With the breakpoints in place, run this test.
- * Once breakpoints A & B are reached, progress the thread at breakpoint A
- * one line to close the connection.
- * Once breakpoint C is reached, allow the thread at breakpoint B to
- * continue.
- * Then allow the thread at breakpoint C to continue.
+ * With the breakpoints in place, run this test. Once breakpoints A & B
are reached, progress the thread at
+ * breakpoint A one line to close the connection. Once breakpoint C is
reached, allow the thread at breakpoint B to
+ * continue. Then allow the thread at breakpoint C to continue.
*
- * In the failure mode, the thread at breakpoint B will not progress past
- * the call to sendObject(). If the issue is fixed, the thread at
breakpoint
- * B will continue past sendObject() and terminate with a TimeoutException.
+ * In the failure mode, the thread at breakpoint B will not progress past
the call to sendObject(). If the issue is
+ * fixed, the thread at breakpoint B will continue past sendObject() and
terminate with a TimeoutException.
*/
@Test
public void testClientDropsConnection() throws Exception {
@@ -75,8 +70,7 @@ public class TestWsRemoteEndpointImplServer extends
WebSocketBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -97,8 +91,7 @@ public class TestWsRemoteEndpointImplServer extends
WebSocketBaseTest {
protected ServerEndpointConfig getServerEndpointConfig() {
List<Class<? extends Encoder>> encoders = new ArrayList<>();
encoders.add(Bug58624Encoder.class);
- return ServerEndpointConfig.Builder.create(
- Bug58624Endpoint.class, PATH).encoders(encoders).build();
+ return ServerEndpointConfig.Builder.create(Bug58624Endpoint.class,
PATH).encoders(encoders).build();
}
}
@@ -109,8 +102,7 @@ public class TestWsRemoteEndpointImplServer extends
WebSocketBaseTest {
@OnOpen
public void onOpen(Session session) {
// Disabling blocking timeouts for this test
- session.getUserProperties().put(
-
org.apache.tomcat.websocket.Constants.BLOCKING_SEND_TIMEOUT_PROPERTY,
+
session.getUserProperties().put(org.apache.tomcat.websocket.Constants.BLOCKING_SEND_TIMEOUT_PROPERTY,
Long.valueOf(-1));
ex.submit(new Bug58624SendMessage(session));
}
diff --git a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
index 1eb69d5dab..410ff924a6 100644
--- a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
+++ b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
@@ -68,8 +68,7 @@ public class TestWsServerContainer extends WebSocketBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
- WebSocketContainer wsContainer =
- ContainerProvider.getWebSocketContainer();
+ WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -100,8 +99,7 @@ public class TestWsServerContainer extends WebSocketBaseTest
{
@Override
protected ServerEndpointConfig getServerEndpointConfig() {
- return ServerEndpointConfig.Builder.create(
- TesterEchoServer.Basic.class, "/{param}").build();
+ return
ServerEndpointConfig.Builder.create(TesterEchoServer.Basic.class,
"/{param}").build();
}
}
@@ -110,12 +108,9 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testSpecExample3() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/a/{var}/c").build();
- ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/c").build();
- ServerEndpointConfig configC = ServerEndpointConfig.Builder.create(
- Object.class, "/a/{var1}/{var2}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/a/{var}/c").build();
+ ServerEndpointConfig configB =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/c").build();
+ ServerEndpointConfig configC =
ServerEndpointConfig.Builder.create(Object.class, "/a/{var1}/{var2}").build();
sc.addEndpoint(configA);
sc.addEndpoint(configB);
@@ -131,10 +126,8 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testSpecExample4() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/{var1}/d").build();
- ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
- Object.class, "/b/{var2}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/{var1}/d").build();
+ ServerEndpointConfig configB =
ServerEndpointConfig.Builder.create(Object.class, "/b/{var2}").build();
sc.addEndpoint(configA);
sc.addEndpoint(configB);
@@ -147,10 +140,8 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths01() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/c").build();
- ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/c").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/c").build();
+ ServerEndpointConfig configB =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/c").build();
sc.addEndpoint(configA);
sc.addEndpoint(configB);
@@ -161,10 +152,8 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths02() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/{var}").build();
- ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/{var}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/{var}").build();
+ ServerEndpointConfig configB =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/{var}").build();
sc.addEndpoint(configA);
sc.addEndpoint(configB);
@@ -175,10 +164,8 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths03() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/{var1}").build();
- ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/{var2}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/{var1}").build();
+ ServerEndpointConfig configB =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/{var2}").build();
sc.addEndpoint(configA);
sc.addEndpoint(configB);
@@ -189,10 +176,8 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths04() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/a/{var1}/{var2}").build();
- ServerEndpointConfig configB = ServerEndpointConfig.Builder.create(
- Object.class, "/a/b/{var2}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/a/{var1}/{var2}").build();
+ ServerEndpointConfig configB =
ServerEndpointConfig.Builder.create(Object.class, "/a/b/{var2}").build();
sc.addEndpoint(configA);
sc.addEndpoint(configB);
@@ -203,15 +188,13 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
/*
- * Simulates a class that gets picked up for extending Endpoint and for
- * being annotated.
+ * Simulates a class that gets picked up for extending Endpoint and for
being annotated.
*/
@Test(expected = DeploymentException.class)
public void testDuplicatePaths11() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Pojo.class, "/foo").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Pojo.class, "/foo").build();
sc.addEndpoint(configA, false);
sc.addEndpoint(Pojo.class, true);
@@ -225,8 +208,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths12() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Pojo.class, "/foo").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Pojo.class, "/foo").build();
sc.addEndpoint(Pojo.class, true);
sc.addEndpoint(configA);
@@ -242,8 +224,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths13() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Pojo.class, "/foo").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Pojo.class, "/foo").build();
sc.addEndpoint(Pojo.class);
sc.addEndpoint(configA);
@@ -257,8 +238,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths14() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/foo").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/foo").build();
sc.addEndpoint(Pojo.class, true);
sc.addEndpoint(configA);
@@ -266,15 +246,13 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
/*
- * Simulates a class that gets picked up for extending Endpoint and for
- * being annotated.
+ * Simulates a class that gets picked up for extending Endpoint and for
being annotated.
*/
@Test(expected = DeploymentException.class)
public void testDuplicatePaths21() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- PojoTemplate.class, "/foo/{a}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(PojoTemplate.class, "/foo/{a}").build();
sc.addEndpoint(configA, false);
sc.addEndpoint(PojoTemplate.class, true);
@@ -288,8 +266,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths22() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- PojoTemplate.class, "/foo/{a}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(PojoTemplate.class, "/foo/{a}").build();
sc.addEndpoint(PojoTemplate.class, true);
sc.addEndpoint(configA);
@@ -305,8 +282,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths23() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- PojoTemplate.class, "/foo/{a}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(PojoTemplate.class, "/foo/{a}").build();
sc.addEndpoint(PojoTemplate.class);
sc.addEndpoint(configA);
@@ -320,8 +296,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public void testDuplicatePaths24() throws Exception {
WsServerContainer sc = new WsServerContainer(new
TesterServletContext());
- ServerEndpointConfig configA = ServerEndpointConfig.Builder.create(
- Object.class, "/foo/{a}").build();
+ ServerEndpointConfig configA =
ServerEndpointConfig.Builder.create(Object.class, "/foo/{a}").build();
sc.addEndpoint(PojoTemplate.class, true);
sc.addEndpoint(configA);
diff --git a/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
b/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
index ccecf9dc96..7929c21ccb 100644
--- a/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
+++ b/test/org/apache/tomcat/websocket/server/TesterEndpointConfig.java
@@ -27,8 +27,8 @@ public abstract class TesterEndpointConfig extends
WsContextListener {
public void contextInitialized(ServletContextEvent sce) {
super.contextInitialized(sce);
- ServerContainer sc = (ServerContainer)
sce.getServletContext().getAttribute(
- Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
+ ServerContainer sc = (ServerContainer) sce.getServletContext()
+
.getAttribute(Constants.SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE);
try {
ServerEndpointConfig sec = getServerEndpointConfig();
diff --git a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
index 01cdbc7728..e060a7168b 100644
--- a/test/org/apache/tomcat/websocket/server/TesterWsClient.java
+++ b/test/org/apache/tomcat/websocket/server/TesterWsClient.java
@@ -25,13 +25,11 @@ import java.nio.charset.StandardCharsets;
import javax.websocket.CloseReason.CloseCode;
/**
- * A client for testing Websocket behavior that differs from standard client
- * behavior.
+ * A client for testing Websocket behavior that differs from standard client
behavior.
*/
public class TesterWsClient {
- private static final byte[] maskingKey = new byte[] { 0x12, 0x34, 0x56,
- 0x78 };
+ private static final byte[] maskingKey = new byte[] { 0x12, 0x34, 0x56,
0x78 };
private final Socket socket;
@@ -68,8 +66,7 @@ public class TesterWsClient {
}
private void readUpgradeResponse() throws IOException {
- BufferedReader in = new BufferedReader(new InputStreamReader(
- socket.getInputStream()));
+ BufferedReader in = new BufferedReader(new
InputStreamReader(socket.getInputStream()));
String line = in.readLine();
while (line != null && !line.isEmpty()) {
line = in.readLine();
@@ -98,11 +95,9 @@ public class TesterWsClient {
}
private static String createUpgradeRequest(String path) {
- String[] upgradeRequestLines = { "GET " + path + " HTTP/1.1",
- "Connection: Upgrade", "Host: localhost:8080",
- "Origin: localhost:8080",
- "Sec-WebSocket-Key: OEvAoAKn5jsuqv2/YJ1Wfg==",
- "Sec-WebSocket-Version: 13", "Upgrade: websocket" };
+ String[] upgradeRequestLines = { "GET " + path + " HTTP/1.1",
"Connection: Upgrade", "Host: localhost:8080",
+ "Origin: localhost:8080", "Sec-WebSocket-Key:
OEvAoAKn5jsuqv2/YJ1Wfg==", "Sec-WebSocket-Version: 13",
+ "Upgrade: websocket" };
StringBuffer sb = new StringBuffer();
for (String line : upgradeRequestLines) {
sb.append(line);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
