This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c6a8acd Use parameterized collection constructors where possible
c6a8acd is described below
commit c6a8acdf62e2290ec08ca0aa8c3e3863bba47c90
Author: Lars Grefer <[email protected]>
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/javax/el/LambdaExpression.java | 3 +--
java/javax/servlet/ServletSecurityElement.java | 6 ++----
java/org/apache/catalina/connector/Request.java | 3 +--
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/tomcat/util/net/AbstractJsseEndpoint.java | 3 +--
java/org/apache/tomcat/util/net/SSLUtilBase.java | 3 +--
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 +++-------
webapps/docs/changelog.xml | 4 ++++
26 files changed, 47 insertions(+), 80 deletions(-)
diff --git a/java/javax/el/LambdaExpression.java
b/java/javax/el/LambdaExpression.java
index 7e9ca06..36c7929 100644
--- a/java/javax/el/LambdaExpression.java
+++ b/java/javax/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/javax/servlet/ServletSecurityElement.java
b/java/javax/servlet/ServletSecurityElement.java
index 199779e..75542c2 100644
--- a/java/javax/servlet/ServletSecurityElement.java
+++ b/java/javax/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 301d5a9..2d13f82 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -989,8 +989,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);
}
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 8a42c24..7dc4242 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -219,8 +219,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);
}
@@ -312,8 +311,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 3f801d5..2f6db1c 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -97,8 +97,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 {
@@ -132,8 +131,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);
@@ -330,8 +328,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"));
@@ -415,8 +412,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 97cc656..83f963c 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 55fe007..1f247d6 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -890,8 +890,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 b519497..3e7b9eb 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 51b4f09..ebee3f7 100644
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -1011,9 +1011,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
@@ -1042,9 +1042,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);
@@ -1062,9 +1062,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 0a3cd88..7a91251 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -652,9 +652,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 f4fd0cb..34012d9 100644
--- a/java/org/apache/catalina/session/StandardSession.java
+++ b/java/org/apache/catalina/session/StandardSession.java
@@ -1174,8 +1174,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 63e1233..9c35bed 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1644,8 +1644,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 c94c1bd..dc853e1 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -432,8 +432,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/tomcat/util/net/AbstractJsseEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
index 76f1cb0..d0ef4b3 100644
--- a/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
@@ -136,8 +136,7 @@ public abstract class AbstractJsseEndpoint<S> extends
AbstractEndpoint<S> {
// 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 00df440..eb4c21a 100644
--- a/java/org/apache/tomcat/util/net/SSLUtilBase.java
+++ b/java/org/apache/tomcat/util/net/SSLUtilBase.java
@@ -154,8 +154,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) {
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
index 19bc06b..88802cc 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
@@ -305,8 +305,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 4777185..ab20e42 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 a50ab47..d2f7040 100644
--- a/test/org/apache/catalina/valves/TestRemoteIpValve.java
+++ b/test/org/apache/catalina/valves/TestRemoteIpValve.java
@@ -1135,10 +1135,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));
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 039009a..47ee493 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,10 @@
Add missing entries to test class path in sample NetBeans configuration
files. Patch provided by Brian Burch. (markt)
</fix>
+ <scode>
+ Refactor to use parameterized <code>Collection</code> constructors
where
+ possible. Pull request provided by Lars Grefer. (markt)
+ </scode>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
