This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push: new eb03b77 Use parameterized collection constructors where possible eb03b77 is described below commit eb03b77a8fe9c865463467aceff83342e9744689 Author: Lars Grefer <lars.gre...@materna.de> AuthorDate: Tue Apr 7 17:32:50 2020 +0200 Use parameterized collection constructors where possible This allows collections like ArrayList and HashSet to initialize their backing arrays with the correct size. --- java/jakarta/el/LambdaExpression.java | 3 +-- java/jakarta/servlet/ServletSecurityElement.java | 6 ++---- java/org/apache/catalina/connector/Request.java | 6 ++---- java/org/apache/catalina/core/ApplicationContext.java | 6 ++---- java/org/apache/catalina/core/AsyncContextImpl.java | 12 ++++-------- java/org/apache/catalina/ha/context/ReplicatedContext.java | 3 +-- java/org/apache/catalina/manager/HTMLManagerServlet.java | 3 +-- java/org/apache/catalina/servlets/CGIServlet.java | 4 +--- java/org/apache/catalina/session/ManagerBase.java | 12 ++++++------ java/org/apache/catalina/session/PersistentManagerBase.java | 3 +-- java/org/apache/catalina/session/StandardSession.java | 3 +-- java/org/apache/catalina/startup/HostConfig.java | 3 +-- java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 3 +-- java/org/apache/coyote/http2/HPackHuffman.java | 3 +-- java/org/apache/coyote/http2/Http2UpgradeHandler.java | 3 +-- java/org/apache/jasper/compiler/TagLibraryInfoImpl.java | 3 +-- java/org/apache/tomcat/buildutil/MimeTypeMappings.java | 3 +-- java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java | 3 +-- java/org/apache/tomcat/util/net/SSLUtilBase.java | 6 ++---- java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java | 3 +-- java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java | 3 +-- .../apache/tomcat/websocket/BackgroundProcessManager.java | 4 ++-- .../org/apache/catalina/servlets/ServletOptionsBaseTest.java | 3 +-- test/org/apache/catalina/startup/TestTomcatNoServer.java | 9 +++------ test/org/apache/catalina/valves/TestRemoteIpValve.java | 6 ++---- test/org/apache/tomcat/util/buf/TestCharsetCache.java | 6 ++---- .../tomcat/util/descriptor/web/TestWebXmlOrdering.java | 6 ++---- .../apache/tomcat/util/net/openssl/ciphers/TestCipher.java | 10 +++------- 28 files changed, 48 insertions(+), 90 deletions(-) diff --git a/java/jakarta/el/LambdaExpression.java b/java/jakarta/el/LambdaExpression.java index 8863ab9..b12c509 100644 --- a/java/jakarta/el/LambdaExpression.java +++ b/java/jakarta/el/LambdaExpression.java @@ -65,8 +65,7 @@ public class LambdaExpression { // Build the argument map // Start with the arguments from any outer expressions so if there is // any overlap the local arguments have priority - Map<String,Object> lambdaArguments = new HashMap<>(); - lambdaArguments.putAll(nestedArguments); + Map<String, Object> lambdaArguments = new HashMap<>(nestedArguments); for (int i = 0; i < formalParamCount; i++) { lambdaArguments.put(formalParameters.get(i), args[i]); } diff --git a/java/jakarta/servlet/ServletSecurityElement.java b/java/jakarta/servlet/ServletSecurityElement.java index 2b820a3..cc7f127 100644 --- a/java/jakarta/servlet/ServletSecurityElement.java +++ b/java/jakarta/servlet/ServletSecurityElement.java @@ -107,14 +107,12 @@ public class ServletSecurityElement extends HttpConstraintElement { } public Collection<HttpMethodConstraintElement> getHttpMethodConstraints() { - Collection<HttpMethodConstraintElement> result = new HashSet<>(); - result.addAll(methodConstraints.values()); + Collection<HttpMethodConstraintElement> result = new HashSet<>(methodConstraints.values()); return result; } public Collection<String> getMethodNames() { - Collection<String> result = new HashSet<>(); - result.addAll(methodConstraints.keySet()); + Collection<String> result = new HashSet<>(methodConstraints.keySet()); return result; } diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index 74f9ad5..84549d0 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -930,8 +930,7 @@ public class Request implements HttpServletRequest { } // Take a copy to prevent ConcurrentModificationExceptions if used to // remove attributes - Set<String> names = new HashSet<>(); - names.addAll(attributes.keySet()); + Set<String> names = new HashSet<>(attributes.keySet()); return Collections.enumeration(names); } @@ -1978,8 +1977,7 @@ public class Request implements HttpServletRequest { if (!isTrailerFieldsReady()) { throw new IllegalStateException(sm.getString("coyoteRequest.trailersNotReady")); } - Map<String,String> result = new HashMap<>(); - result.putAll(coyoteRequest.getTrailerFields()); + Map<String, String> result = new HashMap<>(coyoteRequest.getTrailerFields()); return result; } diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java index 358cce3..cc49ed3 100644 --- a/java/org/apache/catalina/core/ApplicationContext.java +++ b/java/org/apache/catalina/core/ApplicationContext.java @@ -204,8 +204,7 @@ public class ApplicationContext implements ServletContext { @Override public Enumeration<String> getAttributeNames() { - Set<String> names = new HashSet<>(); - names.addAll(attributes.keySet()); + Set<String> names = new HashSet<>(attributes.keySet()); return Collections.enumeration(names); } @@ -297,8 +296,7 @@ public class ApplicationContext implements ServletContext { @Override public Enumeration<String> getInitParameterNames() { - Set<String> names = new HashSet<>(); - names.addAll(parameters.keySet()); + Set<String> names = new HashSet<>(parameters.keySet()); // Special handling for XML settings as these attributes will always be // available if they have been set on the context if (context.getTldValidation()) { diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java b/java/org/apache/catalina/core/AsyncContextImpl.java index 33c366b..f303eb5 100644 --- a/java/org/apache/catalina/core/AsyncContextImpl.java +++ b/java/org/apache/catalina/core/AsyncContextImpl.java @@ -98,8 +98,7 @@ public class AsyncContextImpl implements AsyncContext, AsyncContextCallback { if (log.isDebugEnabled()) { log.debug(sm.getString("asyncContextImpl.fireOnComplete")); } - List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(); - listenersCopy.addAll(listeners); + List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(listeners); ClassLoader oldCL = context.bind(Globals.IS_SECURITY_ENABLED, null); try { @@ -133,8 +132,7 @@ public class AsyncContextImpl implements AsyncContext, AsyncContextCallback { } ClassLoader oldCL = context.bind(false, null); try { - List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(); - listenersCopy.addAll(listeners); + List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(listeners); for (AsyncListenerWrapper listener : listenersCopy) { try { listener.fireOnTimeout(event); @@ -331,8 +329,7 @@ public class AsyncContextImpl implements AsyncContext, AsyncContextCallback { this.hasOriginalRequestAndResponse = originalRequestResponse; this.event = new AsyncEvent(this, request, response); - List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(); - listenersCopy.addAll(listeners); + List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(listeners); listeners.clear(); if (log.isDebugEnabled()) { log.debug(sm.getString("asyncContextImpl.fireOnStartAsync")); @@ -416,8 +413,7 @@ public class AsyncContextImpl implements AsyncContext, AsyncContextCallback { } AsyncEvent errorEvent = new AsyncEvent(event.getAsyncContext(), event.getSuppliedRequest(), event.getSuppliedResponse(), t); - List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(); - listenersCopy.addAll(listeners); + List<AsyncListenerWrapper> listenersCopy = new ArrayList<>(listeners); for (AsyncListenerWrapper listener : listenersCopy) { try { listener.fireOnError(errorEvent); diff --git a/java/org/apache/catalina/ha/context/ReplicatedContext.java b/java/org/apache/catalina/ha/context/ReplicatedContext.java index 9a387be..2c90579 100644 --- a/java/org/apache/catalina/ha/context/ReplicatedContext.java +++ b/java/org/apache/catalina/ha/context/ReplicatedContext.java @@ -186,8 +186,7 @@ public class ReplicatedContext extends StandardContext implements MapOwner { @SuppressWarnings("unchecked") @Override public Enumeration<String> getAttributeNames() { - Set<String> names = new HashSet<>(); - names.addAll(attributes.keySet()); + Set<String> names = new HashSet<>(attributes.keySet()); return new MultiEnumeration<>(new Enumeration[] { super.getAttributeNames(), diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java index ff129f0..37657ba 100644 --- a/java/org/apache/catalina/manager/HTMLManagerServlet.java +++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java @@ -896,8 +896,7 @@ public final class HTMLManagerServlet extends ManagerServlet { Escape.htmlElementContent(cn.getDisplayName()))); } Manager manager = ctxt.getManager(); - List<Session> sessions = new ArrayList<>(); - sessions.addAll(Arrays.asList(manager.findSessions())); + List<Session> sessions = new ArrayList<>(Arrays.asList(manager.findSessions())); if (manager instanceof DistributedManager && showProxySessions) { // Add dummy proxy sessions Set<String> sessionIds = diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java index d4950bc..0743f11 100644 --- a/java/org/apache/catalina/servlets/CGIServlet.java +++ b/java/org/apache/catalina/servlets/CGIServlet.java @@ -979,10 +979,8 @@ public final class CGIServlet extends HttpServlet { * (apologies to Marv Albert regarding MJ) */ - Hashtable<String,String> envp = new Hashtable<>(); - // Add the shell environment variables (if any) - envp.putAll(shellEnv); + Hashtable<String, String> envp = new Hashtable<>(shellEnv); // Add the CGI environment variables String sPathInfoOrig = null; diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java index d6304ce..1356ac8 100644 --- a/java/org/apache/catalina/session/ManagerBase.java +++ b/java/org/apache/catalina/session/ManagerBase.java @@ -1063,9 +1063,9 @@ public abstract class ManagerBase extends LifecycleMBeanBase implements Manager @Override public int getSessionAverageAliveTime() { // Copy current stats - List<SessionTiming> copy = new ArrayList<>(); + List<SessionTiming> copy; synchronized (sessionExpirationTiming) { - copy.addAll(sessionExpirationTiming); + copy = new ArrayList<>(sessionExpirationTiming); } // Init @@ -1094,9 +1094,9 @@ public abstract class ManagerBase extends LifecycleMBeanBase implements Manager @Override public int getSessionCreateRate() { // Copy current stats - List<SessionTiming> copy = new ArrayList<>(); + List<SessionTiming> copy; synchronized (sessionCreationTiming) { - copy.addAll(sessionCreationTiming); + copy = new ArrayList<>(sessionCreationTiming); } return calculateRate(copy); @@ -1114,9 +1114,9 @@ public abstract class ManagerBase extends LifecycleMBeanBase implements Manager @Override public int getSessionExpireRate() { // Copy current stats - List<SessionTiming> copy = new ArrayList<>(); + List<SessionTiming> copy; synchronized (sessionExpirationTiming) { - copy.addAll(sessionExpirationTiming); + copy = new ArrayList<>(sessionExpirationTiming); } return calculateRate(copy); diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java b/java/org/apache/catalina/session/PersistentManagerBase.java index e9e67ef..a79dda5 100644 --- a/java/org/apache/catalina/session/PersistentManagerBase.java +++ b/java/org/apache/catalina/session/PersistentManagerBase.java @@ -647,9 +647,8 @@ public abstract class PersistentManagerBase extends ManagerBase @Override public Set<String> getSessionIdsFull() { - Set<String> sessionIds = new HashSet<>(); // In memory session ID list - sessionIds.addAll(sessions.keySet()); + Set<String> sessionIds = new HashSet<>(sessions.keySet()); // Store session ID list String[] storeKeys; try { diff --git a/java/org/apache/catalina/session/StandardSession.java b/java/org/apache/catalina/session/StandardSession.java index 0e8402a..706f2f9 100644 --- a/java/org/apache/catalina/session/StandardSession.java +++ b/java/org/apache/catalina/session/StandardSession.java @@ -1156,8 +1156,7 @@ public class StandardSession implements HttpSession, Session, Serializable { throw new IllegalStateException (sm.getString("standardSession.getAttributeNames.ise")); - Set<String> names = new HashSet<>(); - names.addAll(attributes.keySet()); + Set<String> names = new HashSet<>(attributes.keySet()); return Collections.enumeration(names); } diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java index 28a3231..99ca56b 100644 --- a/java/org/apache/catalina/startup/HostConfig.java +++ b/java/org/apache/catalina/startup/HostConfig.java @@ -1652,8 +1652,7 @@ public class HostConfig implements LifecycleListener { } // Need ordered set of names - SortedSet<String> sortedAppNames = new TreeSet<>(); - sortedAppNames.addAll(deployed.keySet()); + SortedSet<String> sortedAppNames = new TreeSet<>(deployed.keySet()); Iterator<String> iter = sortedAppNames.iterator(); diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java index 3aecff6..9ef07b0 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java @@ -396,8 +396,7 @@ public abstract class AbstractHttp11Protocol<S> extends AbstractProtocol<S> { public void setAllowedTrailerHeaders(String commaSeparatedHeaders) { // Jump through some hoops so we don't end up with an empty set while // doing updates. - Set<String> toRemove = new HashSet<>(); - toRemove.addAll(allowedTrailerHeaders); + Set<String> toRemove = new HashSet<>(allowedTrailerHeaders); if (commaSeparatedHeaders != null) { String[] headers = commaSeparatedHeaders.split(","); for (String header : headers) { diff --git a/java/org/apache/coyote/http2/HPackHuffman.java b/java/org/apache/coyote/http2/HPackHuffman.java index 365a6f9..cda063c 100644 --- a/java/org/apache/coyote/http2/HPackHuffman.java +++ b/java/org/apache/coyote/http2/HPackHuffman.java @@ -315,8 +315,7 @@ public class HPackHuffman { HuffmanCode[] currentCode = new HuffmanCode[256]; currentCode[0] = new HuffmanCode(0, 0); - final Set<HuffmanCode> allCodes = new HashSet<>(); - allCodes.addAll(Arrays.asList(HUFFMAN_CODES)); + final Set<HuffmanCode> allCodes = new HashSet<>(Arrays.asList(HUFFMAN_CODES)); while (!allCodes.isEmpty()) { int length = currentCode[pos].length; diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java index f168819..e0feae7 100644 --- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java +++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java @@ -1020,8 +1020,7 @@ class Http2UpgradeHandler extends AbstractStream implements InternalHttpUpgradeH // Recipients are children of the current stream that are in the // backlog. - Set<AbstractStream> recipients = new HashSet<>(); - recipients.addAll(stream.getChildStreams()); + Set<AbstractStream> recipients = new HashSet<>(stream.getChildStreams()); recipients.retainAll(backLogStreams.keySet()); // Loop until we run out of allocation or recipients diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java index 7da6963..d82d695 100644 --- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java +++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java @@ -341,8 +341,7 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { return null; } - Map<String,Object> initParams = new Hashtable<>(); - initParams.putAll(validatorXml.getInitParams()); + Map<String, Object> initParams = new Hashtable<>(validatorXml.getInitParams()); try { Class<?> tlvClass = ctxt.getClassLoader().loadClass(validatorClass); diff --git a/java/org/apache/tomcat/buildutil/MimeTypeMappings.java b/java/org/apache/tomcat/buildutil/MimeTypeMappings.java index 8c1e221..ad29d22 100644 --- a/java/org/apache/tomcat/buildutil/MimeTypeMappings.java +++ b/java/org/apache/tomcat/buildutil/MimeTypeMappings.java @@ -49,8 +49,7 @@ public class MimeTypeMappings { digester.parse(globalWebXml); Map<String,String> webXmlMimeMappings = webXmlDefaultFragment.getMimeMappings(); - SortedMap<String,String> sortedWebXmlMimeMappings = new TreeMap<>(); - sortedWebXmlMimeMappings.putAll(webXmlMimeMappings); + SortedMap<String, String> sortedWebXmlMimeMappings = new TreeMap<>(webXmlMimeMappings); File f = new File("java/org/apache/catalina/startup/MimeTypeMappings.properties"); FileOutputStream fos = new FileOutputStream(f); diff --git a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java index 91702c6..c0c328a 100644 --- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java @@ -130,8 +130,7 @@ public abstract class AbstractJsseEndpoint<S,U> extends AbstractEndpoint<S,U> { // one protocol in common // Note: Tomcat does not explicitly negotiate http/1.1 // TODO: Is this correct? Should it change? - List<String> commonProtocols = new ArrayList<>(); - commonProtocols.addAll(negotiableProtocols); + List<String> commonProtocols = new ArrayList<>(negotiableProtocols); commonProtocols.retainAll(clientRequestedApplicationProtocols); if (commonProtocols.size() > 0) { String[] commonProtocolsArray = commonProtocols.toArray(new String[commonProtocols.size()]); diff --git a/java/org/apache/tomcat/util/net/SSLUtilBase.java b/java/org/apache/tomcat/util/net/SSLUtilBase.java index bcbe390..e4d98f7 100644 --- a/java/org/apache/tomcat/util/net/SSLUtilBase.java +++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java @@ -155,8 +155,7 @@ public abstract class SSLUtilBase implements SSLUtil { } if (log.isDebugEnabled() || warnOnSkip) { if (enabled.size() != configured.size()) { - List<T> skipped = new ArrayList<>(); - skipped.addAll(configured); + List<T> skipped = new ArrayList<>(configured); skipped.removeAll(enabled); String msg = sm.getString("sslUtilBase.skipped", name, skipped); if (warnOnSkip) { @@ -307,8 +306,7 @@ public abstract class SSLUtilBase implements SSLUtil { keyPass); PEMFile certificateFile = new PEMFile(certificate.getCertificateFile()); - Collection<Certificate> chain = new ArrayList<>(); - chain.addAll(certificateFile.getCertificates()); + Collection<Certificate> chain = new ArrayList<>(certificateFile.getCertificates()); if (certificate.getCertificateChainFile() != null) { PEMFile certificateChainFile = new PEMFile(certificate.getCertificateChainFile()); chain.addAll(certificateChainFile.getCertificates()); diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java index 81b2369..f8e2b12 100644 --- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java +++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java @@ -300,8 +300,7 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { } if (negotiableProtocols != null && negotiableProtocols.size() > 0) { - List<String> protocols = new ArrayList<>(); - protocols.addAll(negotiableProtocols); + List<String> protocols = new ArrayList<>(negotiableProtocols); protocols.add("http/1.1"); String[] protocolsArray = protocols.toArray(new String[0]); SSLContext.setAlpnProtos(ctx, protocolsArray, SSL.SSL_SELECTOR_FAILURE_NO_ADVERTISE); diff --git a/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java b/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java index e34fb61..ec574f6 100644 --- a/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java +++ b/java/org/apache/tomcat/util/net/openssl/ciphers/Cipher.java @@ -5019,8 +5019,7 @@ public enum Cipher { this.id = id; this.openSSLAlias = openSSLAlias; if (openSSlAltNames != null && openSSlAltNames.length != 0) { - Set<String> altNames = new HashSet<>(); - altNames.addAll(Arrays.asList(openSSlAltNames)); + Set<String> altNames = new HashSet<>(Arrays.asList(openSSlAltNames)); this.openSSLAltNames = Collections.unmodifiableSet(altNames); } else { this.openSSLAltNames = Collections.emptySet(); diff --git a/java/org/apache/tomcat/websocket/BackgroundProcessManager.java b/java/org/apache/tomcat/websocket/BackgroundProcessManager.java index 88bf932..f55c058 100644 --- a/java/org/apache/tomcat/websocket/BackgroundProcessManager.java +++ b/java/org/apache/tomcat/websocket/BackgroundProcessManager.java @@ -82,9 +82,9 @@ public class BackgroundProcessManager { private void process() { - Set<BackgroundProcess> currentProcesses = new HashSet<>(); + Set<BackgroundProcess> currentProcesses; synchronized (processesLock) { - currentProcesses.addAll(processes); + currentProcesses = new HashSet<>(processes); } for (BackgroundProcess process : currentProcesses) { try { diff --git a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java index 41bcfff..bea5900 100644 --- a/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java +++ b/test/org/apache/catalina/servlets/ServletOptionsBaseTest.java @@ -152,8 +152,7 @@ public abstract class ServletOptionsBaseTest extends TomcatBaseTest { for (int i = 0; i < values.length; i++) { values[i] = values[i].trim(); } - Set<String> allowed = new HashSet<>(); - allowed.addAll(Arrays.asList(values)); + Set<String> allowed = new HashSet<>(Arrays.asList(values)); return allowed; } diff --git a/test/org/apache/catalina/startup/TestTomcatNoServer.java b/test/org/apache/catalina/startup/TestTomcatNoServer.java index 5a2f374..6ffb1e5 100644 --- a/test/org/apache/catalina/startup/TestTomcatNoServer.java +++ b/test/org/apache/catalina/startup/TestTomcatNoServer.java @@ -62,12 +62,10 @@ public class TestTomcatNoServer { Map<String,String> webXmlMimeMappings = webXmlDefaultFragment.getMimeMappings(); - Set<String> embeddedExtensions = new HashSet<>(); - embeddedExtensions.addAll(Arrays.asList(ctx.findMimeMappings())); + Set<String> embeddedExtensions = new HashSet<>(Arrays.asList(ctx.findMimeMappings())); // Find entries present in conf/web.xml that are missing in embedded - Set<String> missingInEmbedded = new HashSet<>(); - missingInEmbedded.addAll(webXmlMimeMappings.keySet()); + Set<String> missingInEmbedded = new HashSet<>(webXmlMimeMappings.keySet()); missingInEmbedded.removeAll(embeddedExtensions); if (missingInEmbedded.size() > 0) { for (String missingExtension : missingInEmbedded) { @@ -78,8 +76,7 @@ public class TestTomcatNoServer { } // Find entries present in embedded that are missing in conf/web.xml - Set<String> missingInWebXml = new HashSet<>(); - missingInWebXml.addAll(embeddedExtensions); + Set<String> missingInWebXml = new HashSet<>(embeddedExtensions); missingInWebXml.removeAll(webXmlMimeMappings.keySet()); if (missingInWebXml.size() > 0) { for (String missingExtension : missingInWebXml) { diff --git a/test/org/apache/catalina/valves/TestRemoteIpValve.java b/test/org/apache/catalina/valves/TestRemoteIpValve.java index 851e339..5fc43f9 100644 --- a/test/org/apache/catalina/valves/TestRemoteIpValve.java +++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java @@ -1140,10 +1140,8 @@ public class TestRemoteIpValve { } Assert.assertNotNull(actual); Assert.assertEquals(expected.length, actual.length); - List<String> e = new ArrayList<>(); - e.addAll(Arrays.asList(expected)); - List<String> a = new ArrayList<>(); - a.addAll(Arrays.asList(actual)); + List<String> e = new ArrayList<>(Arrays.asList(expected)); + List<String> a = new ArrayList<>(Arrays.asList(actual)); for (String entry : e) { Assert.assertTrue(a.remove(entry)); diff --git a/test/org/apache/tomcat/util/buf/TestCharsetCache.java b/test/org/apache/tomcat/util/buf/TestCharsetCache.java index a7d90cd..ee3293f 100644 --- a/test/org/apache/tomcat/util/buf/TestCharsetCache.java +++ b/test/org/apache/tomcat/util/buf/TestCharsetCache.java @@ -33,10 +33,8 @@ public class TestCharsetCache { @Test public void testAllKnownCharsets() { - Set<String> known = new HashSet<>(); - known.addAll(Arrays.asList(CharsetCache.LAZY_CHARSETS)); - Set<String> initial = new HashSet<>(); - initial.addAll(Arrays.asList(CharsetCache.INITIAL_CHARSETS)); + Set<String> known = new HashSet<>(Arrays.asList(CharsetCache.LAZY_CHARSETS)); + Set<String> initial = new HashSet<>(Arrays.asList(CharsetCache.INITIAL_CHARSETS)); List<String> cacheMisses = new ArrayList<>(); diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java b/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java index e60a859..e854965 100644 --- a/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java +++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java @@ -203,8 +203,7 @@ public class TestWebXmlOrdering { for (int m = 0; m < 2; m++) { setUp(); runner.init(); - ArrayList<WebXml> source = new ArrayList<>(); - source.addAll(fragments.values()); + ArrayList<WebXml> source = new ArrayList<>(fragments.values()); Map<String,WebXml> input = new LinkedHashMap<>(); @@ -255,8 +254,7 @@ public class TestWebXmlOrdering { } private void populatePositions(Set<WebXml> ordered) { - List<WebXml> indexed = new ArrayList<>(); - indexed.addAll(ordered); + List<WebXml> indexed = new ArrayList<>(ordered); posA = indexed.indexOf(a); posB = indexed.indexOf(b); diff --git a/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java b/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java index fd680ba..ab5e033 100644 --- a/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java +++ b/test/org/apache/tomcat/util/net/openssl/ciphers/TestCipher.java @@ -87,8 +87,7 @@ public class TestCipher { cipher.getProtocol().getOpenSSLName()); } - Set<String> unavailableCipherSuites = new HashSet<>(); - unavailableCipherSuites.addAll(expectedCipherSuites); + Set<String> unavailableCipherSuites = new HashSet<>(expectedCipherSuites); unavailableCipherSuites.removeAll(availableCipherSuites); StringBuilder unavailableList = new StringBuilder("Unavailable cipher suites: "); for (String cipher : unavailableCipherSuites) { @@ -97,8 +96,7 @@ public class TestCipher { } Assert.assertEquals(unavailableList.toString(), 0, unavailableCipherSuites.size()); - Set<String> unexpectedCipherSuites = new HashSet<>(); - unexpectedCipherSuites.addAll(availableCipherSuites); + Set<String> unexpectedCipherSuites = new HashSet<>(availableCipherSuites); unexpectedCipherSuites.removeAll(expectedCipherSuites); StringBuilder unexpectedList = new StringBuilder("Unexpected cipher suites: "); for (String cipher : unexpectedCipherSuites) { @@ -547,9 +545,7 @@ public class TestCipher { "SSL_KRB5_EXPORT_WITH_DES_CBC_40_MD5", "SSL_RSA_EXPORT_WITH_RC2_CBC_40_MD5")); - Set<String> allNames = new HashSet<>(); - - allNames.addAll(sslNames); + Set<String> allNames = new HashSet<>(sslNames); for (String sslName : sslNames) { allNames.add("TLS" + sslName.substring(3)); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org