This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit aca179e8ebbbdbb142d5fe9eee9cb1e671eec4fb
Author: Dimitris Soumis <jimsou...@gmail.com>
AuthorDate: Mon Jun 24 15:16:59 2024 +0300
Fix issues which did not abide by Checkstyle rules
---
.../catalina/filters/TesterHttpServletRequest.java | 6 +--
.../websocket/server/TestWsServerContainer.java | 46 +++++++++++++++++++---
2 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/test/org/apache/catalina/filters/TesterHttpServletRequest.java
b/test/org/apache/catalina/filters/TesterHttpServletRequest.java
index 288e754030..ef0d28170f 100644
--- a/test/org/apache/catalina/filters/TesterHttpServletRequest.java
+++ b/test/org/apache/catalina/filters/TesterHttpServletRequest.java
@@ -19,6 +19,7 @@ package org.apache.catalina.filters;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
import java.security.Principal;
import java.util.ArrayList;
import java.util.Collection;
@@ -471,11 +472,10 @@ public class TesterHttpServletRequest implements
HttpServletRequest {
*/
@Override
public <T extends HttpUpgradeHandler> T upgrade(Class<T>
httpUpgradeHandlerClass)
- throws IOException, ServletException {
+ throws IOException, ServletException {
try {
return
httpUpgradeHandlerClass.getDeclaredConstructor().newInstance();
- }catch (NoSuchMethodException | InvocationTargetException |
InstantiationException | IllegalAccessException ignore){
-
+ } catch (NoSuchMethodException | InvocationTargetException |
InstantiationException | IllegalAccessException ignore) {
}
return null;
}
diff --git a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
index db6a24e6ee..a78894a6a1 100644
--- a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
+++ b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
@@ -16,13 +16,25 @@
*/
package org.apache.tomcat.websocket.server;
+import java.lang.reflect.Field;
import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Queue;
+import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
+import javax.servlet.http.HttpServletResponse;
import javax.websocket.ContainerProvider;
+import javax.websocket.Decoder;
import javax.websocket.DeploymentException;
+import javax.websocket.Encoder;
+import javax.websocket.EndpointConfig;
+import javax.websocket.HandshakeResponse;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import javax.websocket.server.ServerEndpoint;
@@ -33,15 +45,17 @@ import org.junit.Test;
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleState;
+import org.apache.catalina.filters.TesterHttpServletRequest;
+import org.apache.catalina.filters.TesterHttpServletResponse;
import org.apache.catalina.servlets.DefaultServlet;
import org.apache.catalina.startup.Tomcat;
import org.apache.tomcat.unittest.TesterServletContext;
+import org.apache.tomcat.websocket.Constants;
import org.apache.tomcat.websocket.TesterEchoServer;
import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText;
import org.apache.tomcat.websocket.WebSocketBaseTest;
import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient;
-
public class TestWsServerContainer extends WebSocketBaseTest {
@Test
@@ -441,7 +455,9 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
HttpServletResponse response = new TesterHttpServletResponse();
- ServerEndpointConfig sec =
ServerEndpointConfig.Builder.create(Object.class,
"/").subprotocols(List.of("testProtocol")).build();
+ ArrayList<String> protocols = new ArrayList<>();
+ protocols.add("testProtocol");
+ ServerEndpointConfig sec =
ServerEndpointConfig.Builder.create(Object.class,
"/").subprotocols(protocols).build();
WsServerContainer container = new WsServerContainer(new
TesterServletContext());
@@ -464,7 +480,9 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
HttpServletResponse response = new TesterHttpServletResponse();
- ServerEndpointConfig sec =
ServerEndpointConfig.Builder.create(Object.class,
"/").decoders(List.of(DummyDecoder.class)).build();
+ ArrayList<Class<? extends Decoder>> decoders = new ArrayList<>();
+ decoders.add(DummyDecoder.class);
+ ServerEndpointConfig sec =
ServerEndpointConfig.Builder.create(Object.class,
"/").decoders(decoders).build();
WsServerContainer container = new WsServerContainer(new
TesterServletContext());
@@ -472,7 +490,15 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
}
private static class DummyDecoder implements Decoder {
- public DummyDecoder(String ignoredParam) {
+ DummyDecoder(String ignoredParam) {
+ }
+
+ @Override
+ public void init(EndpointConfig endpointConfig) {
+ }
+
+ @Override
+ public void destroy() {
}
}
@@ -554,7 +580,7 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
}
private static class DummyConfigurator extends
ServerEndpointConfig.Configurator {
- public DummyConfigurator(String ignoredParam) {
+ DummyConfigurator(String ignoredParam) {
}
}
@@ -570,9 +596,17 @@ public class TestWsServerContainer extends
WebSocketBaseTest {
public static class DummyPojo3 {
}
- private static class DummyEncoder implements Encoder {
+ public static class DummyEncoder implements Encoder {
public DummyEncoder() {
}
+
+ @Override
+ public void init(EndpointConfig endpointConfig) {
+ }
+
+ @Override
+ public void destroy() {
+ }
}
@Test(expected = DeploymentException.class)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
