This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 58a83e6593 Refactor. Simplify code. No functional change.
58a83e6593 is described below
commit 58a83e65939f8a45363416a73cd06ca84b8d75f1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Oct 7 19:52:49 2022 +0100
Refactor. Simplify code. No functional change.
---
java/org/apache/catalina/startup/HostConfig.java | 3 +--
java/org/apache/catalina/util/CustomObjectInputStream.java | 3 +--
java/org/apache/catalina/webresources/StandardRoot.java | 4 +---
java/org/apache/coyote/AbstractProtocol.java | 4 +---
java/org/apache/coyote/http11/AbstractHttp11Protocol.java | 4 +---
java/org/apache/coyote/http2/AbstractStream.java | 3 +--
java/org/apache/coyote/http2/Http2Protocol.java | 4 +---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 3 +--
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 7 +++----
9 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 6991131b99..36a0ce5bac 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -31,7 +31,6 @@ import java.security.PermissionCollection;
import java.security.Policy;
import java.security.cert.Certificate;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -159,7 +158,7 @@ public class HostConfig implements LifecycleListener {
* Set of applications which are being serviced, and shouldn't be
* deployed/undeployed/redeployed at the moment.
*/
- private Set<String> servicedSet = Collections.newSetFromMap(new
ConcurrentHashMap<String,Boolean>());
+ private Set<String> servicedSet = ConcurrentHashMap.newKeySet();
/**
* The <code>Digester</code> instance used to parse context descriptors.
diff --git a/java/org/apache/catalina/util/CustomObjectInputStream.java
b/java/org/apache/catalina/util/CustomObjectInputStream.java
index 539b6017b1..4d5e88fe76 100644
--- a/java/org/apache/catalina/util/CustomObjectInputStream.java
+++ b/java/org/apache/catalina/util/CustomObjectInputStream.java
@@ -22,7 +22,6 @@ import java.io.InvalidClassException;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
import java.lang.reflect.Proxy;
-import java.util.Collections;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -112,7 +111,7 @@ public final class CustomObjectInputStream extends
ObjectInputStream {
reportedClasses = reportedClassCache.get(classLoader);
}
if (reportedClasses == null) {
- reportedClasses = Collections.newSetFromMap(new
ConcurrentHashMap<>());
+ reportedClasses = ConcurrentHashMap.newKeySet();
Set<String> original;
synchronized (reportedClassCache) {
original = reportedClassCache.putIfAbsent(classLoader,
reportedClasses);
diff --git a/java/org/apache/catalina/webresources/StandardRoot.java
b/java/org/apache/catalina/webresources/StandardRoot.java
index daa60d55d5..8109a3786f 100644
--- a/java/org/apache/catalina/webresources/StandardRoot.java
+++ b/java/org/apache/catalina/webresources/StandardRoot.java
@@ -24,7 +24,6 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
@@ -80,8 +79,7 @@ public class StandardRoot extends LifecycleMBeanBase
implements WebResourceRoot
private ObjectName cacheJmxName = null;
private boolean trackLockedFiles = false;
- private final Set<TrackedWebResource> trackedResources =
- Collections.newSetFromMap(new ConcurrentHashMap<>());
+ private final Set<TrackedWebResource> trackedResources =
ConcurrentHashMap.newKeySet();
// 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 b0c1285b9d..40bc2be500 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -18,7 +18,6 @@ package org.apache.coyote;
import java.net.InetAddress;
import java.nio.ByteBuffer;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -86,8 +85,7 @@ public abstract class AbstractProtocol<S> implements
ProtocolHandler,
private Handler<S> handler;
- private final Set<Processor> waitingProcessors =
- Collections.newSetFromMap(new ConcurrentHashMap<>());
+ private final Set<Processor> waitingProcessors =
ConcurrentHashMap.newKeySet();
/**
* Controller for the timeout scheduling.
diff --git a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
index 64e2383919..5526e0d12e 100644
--- a/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
+++ b/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
@@ -17,7 +17,6 @@
package org.apache.coyote.http11;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -498,8 +497,7 @@ public abstract class AbstractHttp11Protocol<S> extends
AbstractProtocol<S> {
* The names of headers that are allowed to be sent via a trailer when
using
* chunked encoding. They are stored in lower case.
*/
- private Set<String> allowedTrailerHeaders =
- Collections.newSetFromMap(new ConcurrentHashMap<>());
+ private Set<String> allowedTrailerHeaders = ConcurrentHashMap.newKeySet();
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/coyote/http2/AbstractStream.java
b/java/org/apache/coyote/http2/AbstractStream.java
index 6a825c28fd..dc651d30e9 100644
--- a/java/org/apache/coyote/http2/AbstractStream.java
+++ b/java/org/apache/coyote/http2/AbstractStream.java
@@ -16,7 +16,6 @@
*/
package org.apache.coyote.http2;
-import java.util.Collections;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -37,7 +36,7 @@ abstract class AbstractStream {
private final String idAsString;
private volatile AbstractStream parentStream = null;
- private final Set<AbstractNonZeroStream> childStreams =
Collections.newSetFromMap(new ConcurrentHashMap<>());
+ private final Set<AbstractNonZeroStream> childStreams =
ConcurrentHashMap.newKeySet();
private long windowSize =
ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
private volatile int connectionAllocationRequested = 0;
diff --git a/java/org/apache/coyote/http2/Http2Protocol.java
b/java/org/apache/coyote/http2/Http2Protocol.java
index 8f06dfc84d..2c7d1e5be7 100644
--- a/java/org/apache/coyote/http2/Http2Protocol.java
+++ b/java/org/apache/coyote/http2/Http2Protocol.java
@@ -18,7 +18,6 @@ package org.apache.coyote.http2;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
@@ -93,8 +92,7 @@ public class Http2Protocol implements UpgradeProtocol {
// change the default defined in ConnectionSettingsBase.
private int initialWindowSize =
ConnectionSettingsBase.DEFAULT_INITIAL_WINDOW_SIZE;
// Limits
- private Set<String> allowedTrailerHeaders =
- Collections.newSetFromMap(new ConcurrentHashMap<String,
Boolean>());
+ private Set<String> allowedTrailerHeaders = ConcurrentHashMap.newKeySet();
private int maxHeaderCount = Constants.DEFAULT_MAX_HEADER_COUNT;
private int maxHeaderSize = Constants.DEFAULT_MAX_HEADER_SIZE;
private int maxTrailerCount = Constants.DEFAULT_MAX_TRAILER_COUNT;
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 108dca8be7..d45a67d8a9 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -20,7 +20,6 @@ import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Queue;
@@ -132,7 +131,7 @@ class Http2UpgradeHandler extends AbstractStream implements
InternalHttpUpgradeH
private final AtomicInteger nextLocalStreamId = new AtomicInteger(2);
private final PingManager pingManager = getPingManager();
private volatile int newStreamsSinceLastPrune = 0;
- private final Set<AbstractStream> backLogStreams =
Collections.newSetFromMap(new ConcurrentHashMap<>());
+ private final Set<AbstractStream> backLogStreams =
ConcurrentHashMap.newKeySet();
private long backLogSize = 0;
// The time at which the connection will timeout unless data arrives before
// then. -1 means no timeout.
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index c5336d6d57..d1de15234a 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -487,10 +487,9 @@ public class WsServerContainer extends WsWebSocketContainer
String httpSessionId) {
Set<WsSession> wsSessions = authenticatedSessions.get(httpSessionId);
if (wsSessions == null) {
- wsSessions = Collections.newSetFromMap(
- new ConcurrentHashMap<>());
- authenticatedSessions.putIfAbsent(httpSessionId, wsSessions);
- wsSessions = authenticatedSessions.get(httpSessionId);
+ wsSessions = ConcurrentHashMap.newKeySet();
+ authenticatedSessions.putIfAbsent(httpSessionId, wsSessions);
+ wsSessions = authenticatedSessions.get(httpSessionId);
}
wsSessions.add(wsSession);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
