(tomcat) 02/02: Fix issues which did not abide by Checkstyle rules

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e4d174e5c6461de80a2bcfe1035d79be088b8bf1
Author: Dimitris Soumis <jimsou...@gmail.com>
AuthorDate: Mon Jun 24 15:16:59 2024 +0300

    Fix issues which did not abide by Checkstyle rules
---
 .../websocket/server/TestWsServerContainer.java    | 41 +++++++++++++---------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java 
b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
index 24bae4bd7a..da2492b46b 100644
--- a/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
+++ b/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java
@@ -16,12 +16,32 @@
  */
 package org.apache.tomcat.websocket.server;
 
+import java.lang.reflect.Field;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterRegistration;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.websocket.*;
+import jakarta.websocket.ContainerProvider;
+import jakarta.websocket.Decoder;
+import jakarta.websocket.DeploymentException;
+import jakarta.websocket.Encoder;
+import jakarta.websocket.HandshakeResponse;
+import jakarta.websocket.Session;
+import jakarta.websocket.WebSocketContainer;
 import jakarta.websocket.server.ServerEndpoint;
 import jakarta.websocket.server.ServerEndpointConfig;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.LifecycleState;
 import org.apache.catalina.filters.TesterHttpServletRequest;
@@ -34,19 +54,6 @@ 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;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.lang.reflect.Field;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 
 public class TestWsServerContainer extends WebSocketBaseTest {
 
@@ -478,7 +485,7 @@ public class TestWsServerContainer extends 
WebSocketBaseTest {
     }
 
     private static class DummyDecoder implements Decoder {
-        public DummyDecoder(String ignoredParam) {
+        DummyDecoder(String ignoredParam) {
         }
     }
 
@@ -560,7 +567,7 @@ public class TestWsServerContainer extends 
WebSocketBaseTest {
     }
 
     private static class DummyConfigurator extends 
ServerEndpointConfig.Configurator {
-        public DummyConfigurator(String ignoredParam) {
+        DummyConfigurator(String ignoredParam) {
         }
 
     }
@@ -576,7 +583,7 @@ public class TestWsServerContainer extends 
WebSocketBaseTest {
     public static class DummyPojo3 {
     }
 
-    private static class DummyEncoder implements Encoder {
+    public static class DummyEncoder implements Encoder {
         public DummyEncoder() {
         }
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org