Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some checkstyle fixes 

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2020-03-17 13:48:27 +10:00 committed by Olivier Lamy
parent 5f6ab9a6a0
commit b47904ebe2
19 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/config/JakartaWebSocketServletContainerInitializer.java
View File

@ -20,16 +20,16 @@ package org.eclipse.jetty.websocket.jakarta.server.config;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.HandlesTypes;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.Endpoint; import jakarta.websocket.Endpoint;
import jakarta.websocket.server.ServerApplicationConfig; import jakarta.websocket.server.ServerApplicationConfig;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.HandlesTypes;
import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;

2
jetty-websocket/websocket-jakarta-server/src/main/java/org/eclipse/jetty/websocket/jakarta/server/internal/JakartaWebSocketServerContainer.java
View File

@ -22,10 +22,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.function.Function; import java.util.function.Function;
import jakarta.servlet.ServletContext;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContext;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.http.pathmap.PathSpec;

2
jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionConfigurator.java
View File

@ -18,10 +18,10 @@
package org.eclipse.jetty.websocket.jakarta.server.examples; package org.eclipse.jetty.websocket.jakarta.server.examples;
import jakarta.servlet.http.HttpSession;
import jakarta.websocket.HandshakeResponse; import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest; import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.http.HttpSession;
public class GetHttpSessionConfigurator extends ServerEndpointConfig.Configurator public class GetHttpSessionConfigurator extends ServerEndpointConfig.Configurator
{ {

2
jetty-websocket/websocket-jakarta-server/src/test/java/org/eclipse/jetty/websocket/jakarta/server/examples/GetHttpSessionSocket.java
View File

@ -19,12 +19,12 @@
package org.eclipse.jetty.websocket.jakarta.server.examples; package org.eclipse.jetty.websocket.jakarta.server.examples;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.http.HttpSession;
import jakarta.websocket.EndpointConfig; import jakarta.websocket.EndpointConfig;
import jakarta.websocket.OnMessage; import jakarta.websocket.OnMessage;
import jakarta.websocket.OnOpen; import jakarta.websocket.OnOpen;
import jakarta.websocket.Session; import jakarta.websocket.Session;
import jakarta.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import jakarta.servlet.http.HttpSession;
@ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class) @ServerEndpoint(value = "/example", configurator = GetHttpSessionConfigurator.class)
public class GetHttpSessionSocket public class GetHttpSessionSocket

4
jetty-websocket/websocket-jakarta-tests/src/main/java/org/eclipse/jetty/websocket/jakarta/tests/LocalServer.java
View File

@ -21,10 +21,10 @@ package org.eclipse.jetty.websocket.jakarta.tests;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import jakarta.websocket.OnMessage;
import jakarta.websocket.server.ServerEndpoint;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.websocket.OnMessage;
import jakarta.websocket.server.ServerEndpoint;
import org.eclipse.jetty.http.HttpVersion; import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.http.pathmap.PathSpec; import org.eclipse.jetty.http.pathmap.PathSpec;

4
jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/BasicEchoEndpointConfigContextListener.java
View File

@ -18,10 +18,10 @@
package com.acme.websocket; package com.acme.websocket;
import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerEndpointConfig;
public class BasicEchoEndpointConfigContextListener implements ServletContextListener public class BasicEchoEndpointConfigContextListener implements ServletContextListener
{ {

4
jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/IdleTimeoutContextListener.java
View File

@ -18,11 +18,11 @@
package com.acme.websocket; package com.acme.websocket;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
/** /**
* Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config * Example of adding a server WebSocket (extending {@link jakarta.websocket.Endpoint}) programmatically via config

2
jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/LargeEchoContextListener.java
View File

@ -18,9 +18,9 @@
package com.acme.websocket; package com.acme.websocket;
import jakarta.websocket.server.ServerContainer;
import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletContextListener;
import jakarta.websocket.server.ServerContainer;
public class LargeEchoContextListener implements ServletContextListener public class LargeEchoContextListener implements ServletContextListener
{ {

4
jetty-websocket/websocket-jakarta-tests/src/test/java/com/acme/websocket/PongContextListener.java
View File

@ -18,13 +18,13 @@
package com.acme.websocket; package com.acme.websocket;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.HandshakeResponse; import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest; import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
public class PongContextListener implements ServletContextListener public class PongContextListener implements ServletContextListener
{ {

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/RestartContextTest.java
View File

@ -21,6 +21,8 @@ package org.eclipse.jetty.websocket.jakarta.tests;
import java.net.URI; import java.net.URI;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.ClientEndpoint; import jakarta.websocket.ClientEndpoint;
import jakarta.websocket.ContainerProvider; import jakarta.websocket.ContainerProvider;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
@ -29,8 +31,6 @@ import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer; import jakarta.websocket.WebSocketContainer;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/client/CookiesTest.java
View File

@ -24,14 +24,14 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.function.Function; import java.util.function.Function;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.websocket.ClientEndpointConfig; import jakarta.websocket.ClientEndpointConfig;
import jakarta.websocket.ContainerProvider; import jakarta.websocket.ContainerProvider;
import jakarta.websocket.Endpoint; import jakarta.websocket.Endpoint;
import jakarta.websocket.HandshakeResponse; import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.Session; import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer; import jakarta.websocket.WebSocketContainer;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import org.eclipse.jetty.util.FuturePromise; import org.eclipse.jetty.util.FuturePromise;
import org.eclipse.jetty.websocket.core.FrameHandler; import org.eclipse.jetty.websocket.core.FrameHandler;

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointConfigContextListener.java
View File

@ -18,11 +18,11 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoEndpoint; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoEndpoint;
/** /**

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoEndpointContextListener.java
View File

@ -18,11 +18,11 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint;

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketConfigContextListener.java
View File

@ -18,11 +18,11 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket;

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/BasicEchoSocketContextListener.java
View File

@ -18,10 +18,10 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer;
import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoSocket;
/** /**

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/IdleTimeoutContextListener.java
View File

@ -18,11 +18,11 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint;
/** /**

2
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/LargeEchoContextListener.java
View File

@ -18,9 +18,9 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.websocket.server.ServerContainer;
import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletContextListener;
import jakarta.websocket.server.ServerContainer;
/** /**
* Configure the Large Text Message Size via the Container * Configure the Large Text Message Size via the Container

4
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/PongContextListener.java
View File

@ -18,14 +18,14 @@
package org.eclipse.jetty.websocket.jakarta.tests.server; package org.eclipse.jetty.websocket.jakarta.tests.server;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.HandshakeResponse; import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest; import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerContainer; import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import jakarta.websocket.server.ServerEndpointConfig.Configurator; import jakarta.websocket.server.ServerEndpointConfig.Configurator;
import jakarta.servlet.ServletContextEvent;
import jakarta.servlet.ServletContextListener;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.pong.PongMessageEndpoint;

8
jetty-websocket/websocket-jakarta-tests/src/test/java/org/eclipse/jetty/websocket/jakarta/tests/server/WebSocketServerContainerExecutorTest.java
View File

@ -26,6 +26,10 @@ import java.net.HttpURLConnection;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.websocket.ClientEndpoint; import jakarta.websocket.ClientEndpoint;
import jakarta.websocket.ContainerProvider; import jakarta.websocket.ContainerProvider;
import jakarta.websocket.EndpointConfig; import jakarta.websocket.EndpointConfig;
@ -35,10 +39,6 @@ import jakarta.websocket.OnOpen;
import jakarta.websocket.Session; import jakarta.websocket.Session;
import jakarta.websocket.WebSocketContainer; import jakarta.websocket.WebSocketContainer;
import jakarta.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;