fix some checkstyle

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
This commit is contained in:
olivier lamy 2020-03-18 12:04:31 +10:00 committed by Olivier Lamy
parent b47904ebe2
commit a1d16ac5e5
35 changed files with 39 additions and 7 deletions

View File

@ -38,6 +38,7 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import jakarta.servlet.RequestDispatcher; import jakarta.servlet.RequestDispatcher;
import jakarta.servlet.ServletOutputStream; import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.Cookie; import jakarta.servlet.http.Cookie;

View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.servlet; package org.eclipse.jetty.servlet;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import jakarta.servlet.UnavailableException; import jakarta.servlet.UnavailableException;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
@ -78,7 +79,7 @@ public abstract class BaseHolder<T> extends AbstractLifeCycle implements Dumpabl
{ {
//if no class already loaded and no classname, make permanently unavailable //if no class already loaded and no classname, make permanently unavailable
if (_class == null && (_className == null || _className.equals(""))) if (_class == null && (_className == null || _className.equals("")))
throw new UnavailableException( "No class in holder " + toString()); throw new UnavailableException("No class in holder " + toString());
//try to load class //try to load class
if (_class == null) if (_class == null)

View File

@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;
import jakarta.servlet.FilterConfig; import jakarta.servlet.FilterConfig;

View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.servlet; package org.eclipse.jetty.servlet;
import java.util.EventListener; import java.util.EventListener;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;

View File

@ -33,6 +33,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Stack; import java.util.Stack;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.GenericServlet; import jakarta.servlet.GenericServlet;
import jakarta.servlet.MultipartConfigElement; import jakarta.servlet.MultipartConfigElement;
import jakarta.servlet.Servlet; import jakarta.servlet.Servlet;

View File

@ -29,6 +29,7 @@ import java.util.TimerTask;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener; import jakarta.servlet.AsyncListener;

View File

@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;

View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.servlet;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig; import jakarta.servlet.FilterConfig;

View File

@ -22,6 +22,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

View File

@ -20,6 +20,7 @@ package org.eclipse.jetty.servlet;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import jakarta.servlet.Servlet; import jakarta.servlet.Servlet;
import jakarta.servlet.ServletRegistration; import jakarta.servlet.ServletRegistration;
import jakarta.servlet.UnavailableException; import jakarta.servlet.UnavailableException;

View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.servlets; package org.eclipse.jetty.servlets;
import java.io.IOException; import java.io.IOException;
import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener; import jakarta.servlet.AsyncListener;
@ -28,6 +29,7 @@ import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -33,6 +33,7 @@ import org.eclipse.jetty.util.resource.Resource;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* MetaData * MetaData
* *

View File

@ -30,6 +30,7 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import jakarta.servlet.MultipartConfigElement; import jakarta.servlet.MultipartConfigElement;
import jakarta.servlet.SessionTrackingMode; import jakarta.servlet.SessionTrackingMode;

View File

@ -22,7 +22,6 @@ import jakarta.websocket.ContainerProvider;
import jakarta.websocket.WebSocketContainer; import jakarta.websocket.WebSocketContainer;
import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ShutdownThread;
import org.eclipse.jetty.websocket.javax.client.internal.JavaxWebSocketClientContainer;
/** /**
* Client {@link ContainerProvider} implementation. * Client {@link ContainerProvider} implementation.

View File

@ -20,6 +20,7 @@ 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.ServletContainerInitializer;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;

View File

@ -22,6 +22,7 @@ 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.servlet.ServletContext;
import jakarta.websocket.DeploymentException; import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;

View File

@ -19,6 +19,7 @@
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.servlet.http.HttpSession;
import jakarta.websocket.EndpointConfig; import jakarta.websocket.EndpointConfig;
import jakarta.websocket.OnMessage; import jakarta.websocket.OnMessage;

View File

@ -21,6 +21,7 @@ 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.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.OnMessage;

View File

@ -21,6 +21,7 @@ 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.ServletContextEvent;
import jakarta.servlet.ServletContextListener; import jakarta.servlet.ServletContextListener;
import jakarta.websocket.ClientEndpoint; import jakarta.websocket.ClientEndpoint;

View File

@ -24,6 +24,7 @@ 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.Cookie;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.websocket.ClientEndpointConfig; import jakarta.websocket.ClientEndpointConfig;

View File

@ -58,7 +58,7 @@ public class MisbehavingClassTest
server.addBean(container); // allow to shutdown with server server.addBean(container); // allow to shutdown with server
EndpointRuntimeOnOpen socket = new EndpointRuntimeOnOpen(); EndpointRuntimeOnOpen socket = new EndpointRuntimeOnOpen();
try (StacklessLogging ignored = new StacklessLogging( WebSocketCoreSession.class)) try (StacklessLogging ignored = new StacklessLogging(WebSocketCoreSession.class))
{ {
// expecting RuntimeException during onOpen // expecting RuntimeException during onOpen
container.connectToServer(socket, null, server.getWsUri()); container.connectToServer(socket, null, server.getWsUri());

View File

@ -25,6 +25,7 @@ import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoEndpoint; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.echo.BasicEchoEndpoint;
/** /**
* 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
*/ */

View File

@ -24,6 +24,7 @@ import jakarta.websocket.DeploymentException;
import jakarta.websocket.server.ServerContainer; 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;
/** /**
* Example of adding a server socket (annotated) programmatically directly with no config * Example of adding a server socket (annotated) programmatically directly with no config
*/ */

View File

@ -25,6 +25,7 @@ import jakarta.websocket.server.ServerContainer;
import jakarta.websocket.server.ServerEndpointConfig; import jakarta.websocket.server.ServerEndpointConfig;
import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint; import org.eclipse.jetty.websocket.jakarta.tests.server.sockets.idletimeout.OnOpenIdleTimeoutEndpoint;
/** /**
* 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
*/ */

View File

@ -26,6 +26,7 @@ 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.ServletException;
import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;

View File

@ -26,6 +26,7 @@ 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 org.eclipse.jetty.toolchain.test.StackUtils; import org.eclipse.jetty.toolchain.test.StackUtils;
import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder; import org.eclipse.jetty.websocket.jakarta.tests.coders.DateDecoder;
import org.eclipse.jetty.websocket.jakarta.tests.coders.DateEncoder; import org.eclipse.jetty.websocket.jakarta.tests.coders.DateEncoder;
@ -33,7 +34,6 @@ import org.eclipse.jetty.websocket.jakarta.tests.coders.DateEncoder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ServerEndpoint(value = "/echo/beans/date", decoders = {DateDecoder.class}, encoders = {DateEncoder.class}) @ServerEndpoint(value = "/echo/beans/date", decoders = {DateDecoder.class}, encoders = {DateEncoder.class})
public class DateTextSocket public class DateTextSocket
{ {

View File

@ -26,6 +26,7 @@ import java.util.EnumSet;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.DispatcherType; import jakarta.servlet.DispatcherType;
import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.logging.StacklessLogging;

View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.tests.server; package org.eclipse.jetty.websocket.tests.server;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import org.eclipse.jetty.websocket.api.WebSocketContainer; import org.eclipse.jetty.websocket.api.WebSocketContainer;

View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.test.jmx; package org.eclipse.jetty.test.jmx;
import java.util.Set; import java.util.Set;
import jakarta.servlet.ServletContainerInitializer; import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContext;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;

View File

@ -21,6 +21,7 @@ package org.eclipse.jetty.server.session;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSessionActivationListener; import jakarta.servlet.http.HttpSessionActivationListener;
import jakarta.servlet.http.HttpSessionEvent; import jakarta.servlet.http.HttpSessionEvent;

View File

@ -24,6 +24,7 @@ import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener; import jakarta.servlet.AsyncListener;

View File

@ -36,6 +36,7 @@ import java.util.Enumeration;
import java.util.Locale; import java.util.Locale;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import jakarta.servlet.AsyncContext; import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent; import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener; import jakarta.servlet.AsyncListener;
@ -55,6 +56,7 @@ import jakarta.servlet.http.HttpServletRequestWrapper;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponseWrapper; import jakarta.servlet.http.HttpServletResponseWrapper;
import jakarta.servlet.http.Part; import jakarta.servlet.http.Part;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -346,7 +348,7 @@ public class Dump extends HttpServlet
} }
catch (IOException e2) catch (IOException e2)
{ {
LoggerFactory.getLogger( Dump.class).trace( "IGNORED", e2); LoggerFactory.getLogger(Dump.class).trace("IGNORED", e2);
} }
} }
catch (IOException e) catch (IOException e)

View File

@ -25,12 +25,14 @@ import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.Calendar; import java.util.Calendar;
import java.util.GregorianCalendar; import java.util.GregorianCalendar;
import jakarta.servlet.ServletConfig; import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletException; import jakarta.servlet.ServletException;
import jakarta.servlet.ServletOutputStream; import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

View File

@ -21,6 +21,7 @@ package com.acme;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig; import jakarta.servlet.FilterConfig;
@ -31,10 +32,10 @@ import jakarta.servlet.ServletRequestWrapper;
import jakarta.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper; import jakarta.servlet.http.HttpServletRequestWrapper;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
* TestFilter. * TestFilter.
* *

View File

@ -29,7 +29,6 @@ import jakarta.websocket.server.ServerEndpoint;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ServerEndpoint("/onclose/{arg}") @ServerEndpoint("/onclose/{arg}")
public class OnCloseServerEndpoint public class OnCloseServerEndpoint
{ {