This is an automated email from the ASF dual-hosted git repository. ebourg pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cf0d33c11e6bf15598530c2a2e811b2be3104c89 Author: Emmanuel Bourg <ebo...@apache.org> AuthorDate: Thu Dec 3 23:43:49 2020 +0100 Replace explicit types with <> --- java/org/apache/catalina/ha/tcp/ReplicationValve.java | 2 +- java/org/apache/catalina/startup/ContextConfig.java | 2 +- java/org/apache/catalina/valves/rewrite/RewriteRule.java | 2 +- java/org/apache/catalina/webresources/StandardRoot.java | 2 +- java/org/apache/coyote/AbstractProtocol.java | 2 +- java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 2 +- java/org/apache/naming/NamingContext.java | 2 +- java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java | 2 +- java/org/apache/tomcat/websocket/Constants.java | 2 +- .../apache/tomcat/websocket/server/WsServerContainer.java | 2 +- .../loader/TestWebappClassLoaderExecutorMemoryLeak.java | 2 +- .../apache/catalina/startup/TestContextConfigAnnotation.java | 12 +++++------- test/org/apache/tomcat/websocket/TestUtil.java | 4 ++-- 13 files changed, 18 insertions(+), 20 deletions(-) diff --git a/java/org/apache/catalina/ha/tcp/ReplicationValve.java b/java/org/apache/catalina/ha/tcp/ReplicationValve.java index 6eed956..0a5850d 100644 --- a/java/org/apache/catalina/ha/tcp/ReplicationValve.java +++ b/java/org/apache/catalina/ha/tcp/ReplicationValve.java @@ -325,7 +325,7 @@ public class ReplicationValve log.debug(sm.getString("ReplicationValve.crossContext.add")); } //FIXME add Pool of Arraylists - crossContextSessions.set(new ArrayList<DeltaSession>()); + crossContextSessions.set(new ArrayList<>()); } getNext().invoke(request, response); if(context != null && cluster != null diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java index 355dea3..f898ab4 100644 --- a/java/org/apache/catalina/startup/ContextConfig.java +++ b/java/org/apache/catalina/startup/ContextConfig.java @@ -1847,7 +1847,7 @@ public class ContextConfig implements LifecycleListener { } for (ServletContainerInitializer sci : detectedScis) { - initializerClassMap.put(sci, new HashSet<Class<?>>()); + initializerClassMap.put(sci, new HashSet<>()); HandlesTypes ht; try { diff --git a/java/org/apache/catalina/valves/rewrite/RewriteRule.java b/java/org/apache/catalina/valves/rewrite/RewriteRule.java index 833a12c..ca29223 100644 --- a/java/org/apache/catalina/valves/rewrite/RewriteRule.java +++ b/java/org/apache/catalina/valves/rewrite/RewriteRule.java @@ -63,7 +63,7 @@ public class RewriteRule { newEnvSubstitution.setSub(s); newEnvSubstitution.parse(maps); envSubstitution.add(newEnvSubstitution); - envResult.add(new ThreadLocal<String>()); + envResult.add(new ThreadLocal<>()); } } if (isCookie()) { diff --git a/java/org/apache/catalina/webresources/StandardRoot.java b/java/org/apache/catalina/webresources/StandardRoot.java index cc401f2..0aad50e 100644 --- a/java/org/apache/catalina/webresources/StandardRoot.java +++ b/java/org/apache/catalina/webresources/StandardRoot.java @@ -81,7 +81,7 @@ public class StandardRoot extends LifecycleMBeanBase implements WebResourceRoot private boolean trackLockedFiles = false; private final Set<TrackedWebResource> trackedResources = - Collections.newSetFromMap(new ConcurrentHashMap<TrackedWebResource,Boolean>()); + Collections.newSetFromMap(new ConcurrentHashMap<>()); // Constructs to make iteration over all WebResourceSets simpler private final List<WebResourceSet> mainResources = new ArrayList<>(); diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index 61dcffa..092fcf3 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -87,7 +87,7 @@ public abstract class AbstractProtocol<S> implements ProtocolHandler, private final Set<Processor> waitingProcessors = - Collections.newSetFromMap(new ConcurrentHashMap<Processor, Boolean>()); + Collections.newSetFromMap(new ConcurrentHashMap<>()); /** * Controller for the timeout scheduling. diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java index 0c82380..4c64197 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java @@ -474,7 +474,7 @@ public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> { * chunked encoding. They are stored in lower case. */ private Set<String> allowedTrailerHeaders = - Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>()); + Collections.newSetFromMap(new ConcurrentHashMap<>()); public void setAllowedTrailerHeaders(String commaSeparatedHeaders) { // Jump through some hoops so we don't end up with an empty set while // doing updates. diff --git a/java/org/apache/naming/NamingContext.java b/java/org/apache/naming/NamingContext.java index a064421..e1ddeff 100644 --- a/java/org/apache/naming/NamingContext.java +++ b/java/org/apache/naming/NamingContext.java @@ -74,7 +74,7 @@ public class NamingContext implements Context { * @param name The name of the associated Catalina Context */ public NamingContext(Hashtable<String,Object> env, String name) { - this(env, name, new HashMap<String,NamingEntry>()); + this(env, name, new HashMap<>()); } diff --git a/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java b/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java index fe0136e..6d1413b 100644 --- a/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java +++ b/java/org/apache/tomcat/websocket/AsyncChannelGroupUtil.java @@ -87,7 +87,7 @@ public class AsyncChannelGroupUtil { 0, Integer.MAX_VALUE, Long.MAX_VALUE, TimeUnit.MILLISECONDS, - new SynchronousQueue<Runnable>(), + new SynchronousQueue<>(), new AsyncIOThreadFactory()); try { diff --git a/java/org/apache/tomcat/websocket/Constants.java b/java/org/apache/tomcat/websocket/Constants.java index 09dbc73..466a541 100644 --- a/java/org/apache/tomcat/websocket/Constants.java +++ b/java/org/apache/tomcat/websocket/Constants.java @@ -146,7 +146,7 @@ public class Constants { static { if (DISABLE_BUILTIN_EXTENSIONS) { - INSTALLED_EXTENSIONS = Collections.unmodifiableList(new ArrayList<Extension>()); + INSTALLED_EXTENSIONS = Collections.unmodifiableList(new ArrayList<>()); } else { List<Extension> installed = new ArrayList<>(1); installed.add(new WsExtension("permessage-deflate")); diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java b/java/org/apache/tomcat/websocket/server/WsServerContainer.java index 3221ddf..3b9708b 100644 --- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java +++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java @@ -429,7 +429,7 @@ public class WsServerContainer extends WsWebSocketContainer Set<WsSession> wsSessions = authenticatedSessions.get(httpSessionId); if (wsSessions == null) { wsSessions = Collections.newSetFromMap( - new ConcurrentHashMap<WsSession,Boolean>()); + new ConcurrentHashMap<>()); authenticatedSessions.putIfAbsent(httpSessionId, wsSessions); wsSessions = authenticatedSessions.get(httpSessionId); } diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java b/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java index 5f8e22b..63120ba 100644 --- a/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java +++ b/test/org/apache/catalina/loader/TestWebappClassLoaderExecutorMemoryLeak.java @@ -92,7 +92,7 @@ public class TestWebappClassLoaderExecutorMemoryLeak extends TomcatBaseTest { resp.getWriter().println( "The current thread served " + this + " servlet"); tpe = new ThreadPoolExecutor(tpSize, tpSize, 50000L, - TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>()); + TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()); Task[] tasks = new Task[nTasks]; for (int i = 0; i < nTasks; i++) { diff --git a/test/org/apache/catalina/startup/TestContextConfigAnnotation.java b/test/org/apache/catalina/startup/TestContextConfigAnnotation.java index 1321c9b..0521cbf 100644 --- a/test/org/apache/catalina/startup/TestContextConfigAnnotation.java +++ b/test/org/apache/catalina/startup/TestContextConfigAnnotation.java @@ -284,20 +284,18 @@ public class TestContextConfigAnnotation { // Add an SCI that has no interest in any type SCI sciNone = new SCI(); - config.initializerClassMap.put(sciNone, new HashSet<Class<?>>()); + config.initializerClassMap.put(sciNone, new HashSet<>()); // Add an SCI with an interest in Servlets SCI sciServlet = new SCI(); - config.initializerClassMap.put(sciServlet, new HashSet<Class<?>>()); - config.typeInitializerMap.put(Servlet.class, - new HashSet<ServletContainerInitializer>()); + config.initializerClassMap.put(sciServlet, new HashSet<>()); + config.typeInitializerMap.put(Servlet.class, new HashSet<>()); config.typeInitializerMap.get(Servlet.class).add(sciServlet); // Add an SCI with an interest in Objects - i.e. everything SCI sciObject = new SCI(); - config.initializerClassMap.put(sciObject, new HashSet<Class<?>>()); - config.typeInitializerMap.put(Object.class, - new HashSet<ServletContainerInitializer>()); + config.initializerClassMap.put(sciObject, new HashSet<>()); + config.typeInitializerMap.put(Object.class, new HashSet<>()); config.typeInitializerMap.get(Object.class).add(sciObject); // Scan Servlet, Filter, Servlet, Listener diff --git a/test/org/apache/tomcat/websocket/TestUtil.java b/test/org/apache/tomcat/websocket/TestUtil.java index 9c64417..c433403 100644 --- a/test/org/apache/tomcat/websocket/TestUtil.java +++ b/test/org/apache/tomcat/websocket/TestUtil.java @@ -459,11 +459,11 @@ public class TestUtil { @Test(expected=IllegalArgumentException.class) public void testParseExtensionHeaderInvalid01() { - Util.parseExtensionHeader(new ArrayList<Extension>(), "ext;a=\"1;b=2"); + Util.parseExtensionHeader(new ArrayList<>(), "ext;a=\"1;b=2"); } @Test(expected=IllegalArgumentException.class) public void testParseExtensionHeaderInvalid02() { - Util.parseExtensionHeader(new ArrayList<Extension>(), "ext;a=1\";b=2"); + Util.parseExtensionHeader(new ArrayList<>(), "ext;a=1\";b=2"); } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org