This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 8f93a286b2 Code clean-up - formatting. No functional change.
8f93a286b2 is described below
commit 8f93a286b262f86a5123eb00cf490e25f8d39186
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 29 11:57:54 2025 +0100
Code clean-up - formatting. No functional change.
---
.../apache/tomcat/websocket/server/Constants.java | 6 ++++--
.../apache/tomcat/websocket/server/UpgradeUtil.java | 16 ++++++++--------
.../apache/tomcat/websocket/server/UriTemplate.java | 8 ++++----
.../tomcat/websocket/server/WsHandshakeRequest.java | 20 ++++++++++----------
.../websocket/server/WsHttpUpgradeHandler.java | 12 ++++++------
.../tomcat/websocket/server/WsMappingResult.java | 2 +-
.../server/WsPerSessionServerEndpointConfig.java | 4 ++--
.../websocket/server/WsRemoteEndpointImplServer.java | 5 ++---
.../tomcat/websocket/server/WsServerContainer.java | 18 +++++++++---------
.../tomcat/websocket/server/WsWriteTimeout.java | 4 ++--
10 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index 2612cdb60f..e8fd034db6 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -21,8 +21,10 @@ package org.apache.tomcat.websocket.server;
*/
public class Constants {
- public static final String BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.binaryBufferSize";
- public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.textBufferSize";
+ public static final String BINARY_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
+ "org.apache.tomcat.websocket.binaryBufferSize";
+ public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
+ "org.apache.tomcat.websocket.textBufferSize";
public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
"jakarta.websocket.server.ServerContainer";
diff --git a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
index 7ef73ff7e5..44b3670ce6 100644
--- a/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
+++ b/java/org/apache/tomcat/websocket/server/UpgradeUtil.java
@@ -50,8 +50,8 @@ import org.apache.tomcat.websocket.pojo.PojoMethodMapping;
public class UpgradeUtil {
private static final StringManager sm =
StringManager.getManager(UpgradeUtil.class.getPackage().getName());
- private static final byte[] WS_ACCEPT =
"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
- .getBytes(StandardCharsets.ISO_8859_1);
+ private static final byte[] WS_ACCEPT =
+
"258EAFA5-E914-47DA-95CA-C5AB0DC85B11".getBytes(StandardCharsets.ISO_8859_1);
private UpgradeUtil() {
// Utility class. Hide default constructor.
@@ -79,7 +79,7 @@ public class UpgradeUtil {
public static void doUpgrade(WsServerContainer sc, HttpServletRequest req,
HttpServletResponse resp,
- ServerEndpointConfig sec, Map<String, String> pathParams) throws
ServletException, IOException {
+ ServerEndpointConfig sec, Map<String,String> pathParams) throws
ServletException, IOException {
// Validate the rest of the headers and reject the request if that
// validation fails
@@ -130,8 +130,8 @@ public class UpgradeUtil {
installedExtensions.addAll(sec.getExtensions());
installedExtensions.addAll(Constants.INSTALLED_EXTENSIONS);
}
- List<Extension> negotiatedExtensionsPhase1 =
sec.getConfigurator().getNegotiatedExtensions(installedExtensions,
- extensionsRequested);
+ List<Extension> negotiatedExtensionsPhase1 =
+
sec.getConfigurator().getNegotiatedExtensions(installedExtensions,
extensionsRequested);
// Negotiation phase 2. Create the Transformations that will be applied
// to this connection. Note than an extension may be dropped at this
@@ -211,7 +211,7 @@ public class UpgradeUtil {
wsRequest.finished();
// Add any additional headers
- for (Entry<String, List<String>> entry :
wsResponse.getHeaders().entrySet()) {
+ for (Entry<String,List<String>> entry :
wsResponse.getHeaders().entrySet()) {
for (String headerValue : entry.getValue()) {
resp.addHeader(entry.getKey(), headerValue);
}
@@ -253,7 +253,7 @@ public class UpgradeUtil {
TransformationFactory factory = TransformationFactory.getInstance();
- LinkedHashMap<String, List<List<Extension.Parameter>>>
extensionPreferences = new LinkedHashMap<>();
+ LinkedHashMap<String,List<List<Extension.Parameter>>>
extensionPreferences = new LinkedHashMap<>();
// Result will likely be smaller than this
List<Transformation> result = new
ArrayList<>(negotiatedExtensions.size());
@@ -263,7 +263,7 @@ public class UpgradeUtil {
.add(extension.getParameters());
}
- for (Map.Entry<String, List<List<Extension.Parameter>>> entry :
extensionPreferences.entrySet()) {
+ for (Map.Entry<String,List<List<Extension.Parameter>>> entry :
extensionPreferences.entrySet()) {
Transformation transformation = factory.create(entry.getKey(),
entry.getValue(), true);
if (transformation != null) {
result.add(transformation);
diff --git a/java/org/apache/tomcat/websocket/server/UriTemplate.java
b/java/org/apache/tomcat/websocket/server/UriTemplate.java
index 583f2f2bac..5b823c1248 100644
--- a/java/org/apache/tomcat/websocket/server/UriTemplate.java
+++ b/java/org/apache/tomcat/websocket/server/UriTemplate.java
@@ -43,8 +43,8 @@ public class UriTemplate {
public UriTemplate(String path) throws DeploymentException {
- if (path == null || !path.startsWith("/") || path.contains("/../") ||
- path.contains("/./") || path.contains("//")) {
+ if (path == null || !path.startsWith("/") || path.contains("/../") ||
path.contains("/./") ||
+ path.contains("//")) {
throw new
DeploymentException(sm.getString("uriTemplate.invalidPath", path));
}
@@ -97,9 +97,9 @@ public class UriTemplate {
}
- public Map<String, String> match(UriTemplate candidate) {
+ public Map<String,String> match(UriTemplate candidate) {
- Map<String, String> result = new HashMap<>();
+ Map<String,String> result = new HashMap<>();
// Should not happen but for safety
if (candidate.getSegmentCount() != getSegmentCount()) {
diff --git a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
index b910ed3a5b..413f8f85e8 100644
--- a/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
+++ b/java/org/apache/tomcat/websocket/server/WsHandshakeRequest.java
@@ -43,16 +43,16 @@ public class WsHandshakeRequest implements HandshakeRequest
{
private static final StringManager sm =
StringManager.getManager(WsHandshakeRequest.class);
private final URI requestUri;
- private final Map<String, List<String>> parameterMap;
+ private final Map<String,List<String>> parameterMap;
private final String queryString;
private final Principal userPrincipal;
- private final Map<String, List<String>> headers;
+ private final Map<String,List<String>> headers;
private final Object httpSession;
private volatile HttpServletRequest request;
- public WsHandshakeRequest(HttpServletRequest request, Map<String, String>
pathParams) {
+ public WsHandshakeRequest(HttpServletRequest request, Map<String,String>
pathParams) {
this.request = request;
@@ -62,18 +62,18 @@ public class WsHandshakeRequest implements HandshakeRequest
{
requestUri = buildRequestUri(request);
// ParameterMap
- Map<String, String[]> originalParameters = request.getParameterMap();
- Map<String, List<String>> newParameters = new
HashMap<>(originalParameters.size());
- for (Entry<String, String[]> entry : originalParameters.entrySet()) {
+ Map<String,String[]> originalParameters = request.getParameterMap();
+ Map<String,List<String>> newParameters = new
HashMap<>(originalParameters.size());
+ for (Entry<String,String[]> entry : originalParameters.entrySet()) {
newParameters.put(entry.getKey(),
Collections.unmodifiableList(Arrays.asList(entry.getValue())));
}
- for (Entry<String, String> entry : pathParams.entrySet()) {
+ for (Entry<String,String> entry : pathParams.entrySet()) {
newParameters.put(entry.getKey(),
Collections.singletonList(entry.getValue()));
}
parameterMap = Collections.unmodifiableMap(newParameters);
// Headers
- Map<String, List<String>> newHeaders = new CaseInsensitiveKeyMap<>();
+ Map<String,List<String>> newHeaders = new CaseInsensitiveKeyMap<>();
Enumeration<String> headerNames = request.getHeaderNames();
while (headerNames.hasMoreElements()) {
@@ -91,7 +91,7 @@ public class WsHandshakeRequest implements HandshakeRequest {
}
@Override
- public Map<String, List<String>> getParameterMap() {
+ public Map<String,List<String>> getParameterMap() {
return parameterMap;
}
@@ -106,7 +106,7 @@ public class WsHandshakeRequest implements HandshakeRequest
{
}
@Override
- public Map<String, List<String>> getHeaders() {
+ public Map<String,List<String>> getHeaders() {
return headers;
}
diff --git a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
index 95a2629016..4aabb34fe8 100644
--- a/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
+++ b/java/org/apache/tomcat/websocket/server/WsHttpUpgradeHandler.java
@@ -63,7 +63,7 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
private List<Extension> negotiatedExtensions;
private String subProtocol;
private Transformation transformation;
- private Map<String, String> pathParameters;
+ private Map<String,String> pathParameters;
private boolean secure;
private WebConnection connection;
@@ -85,7 +85,7 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
public void preInit(ServerEndpointConfig serverEndpointConfig,
WsServerContainer wsc,
WsHandshakeRequest handshakeRequest, List<Extension>
negotiatedExtensionsPhase2, String subProtocol,
- Transformation transformation, Map<String, String> pathParameters,
boolean secure) {
+ Transformation transformation, Map<String,String> pathParameters,
boolean secure) {
this.serverEndpointConfig = serverEndpointConfig;
this.webSocketContainer = wsc;
this.handshakeRequest = handshakeRequest;
@@ -117,8 +117,8 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
ClassLoader cl = t.getContextClassLoader();
t.setContextClassLoader(applicationClassLoader);
try {
- wsRemoteEndpointServer = new
WsRemoteEndpointImplServer(socketWrapper, upgradeInfo, webSocketContainer,
- connection);
+ wsRemoteEndpointServer =
+ new WsRemoteEndpointImplServer(socketWrapper, upgradeInfo,
webSocketContainer, connection);
wsSession = new WsSession(wsRemoteEndpointServer,
webSocketContainer, handshakeRequest.getRequestURI(),
handshakeRequest.getParameterMap(),
handshakeRequest.getQueryString(),
handshakeRequest.getUserPrincipal(), httpSessionId,
negotiatedExtensions, subProtocol,
@@ -162,8 +162,8 @@ public class WsHttpUpgradeHandler implements
InternalHttpUpgradeHandler {
wsRemoteEndpointServer.onWritePossible(false);
break;
case STOP:
- CloseReason cr = new CloseReason(CloseCodes.GOING_AWAY,
- sm.getString("wsHttpUpgradeHandler.serverStop"));
+ CloseReason cr =
+ new CloseReason(CloseCodes.GOING_AWAY,
sm.getString("wsHttpUpgradeHandler.serverStop"));
try {
wsSession.close(cr);
} catch (IOException ioe) {
diff --git a/java/org/apache/tomcat/websocket/server/WsMappingResult.java
b/java/org/apache/tomcat/websocket/server/WsMappingResult.java
index fc76861f1a..62a932e57d 100644
--- a/java/org/apache/tomcat/websocket/server/WsMappingResult.java
+++ b/java/org/apache/tomcat/websocket/server/WsMappingResult.java
@@ -20,5 +20,5 @@ import java.util.Map;
import jakarta.websocket.server.ServerEndpointConfig;
-public record WsMappingResult(ServerEndpointConfig config, Map<String, String>
pathParams) {
+public record WsMappingResult(ServerEndpointConfig config, Map<String,String>
pathParams) {
}
diff --git
a/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
b/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
index 451efe412f..691096dd81 100644
---
a/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
+++
b/java/org/apache/tomcat/websocket/server/WsPerSessionServerEndpointConfig.java
@@ -33,7 +33,7 @@ import jakarta.websocket.server.ServerEndpointConfig;
class WsPerSessionServerEndpointConfig implements ServerEndpointConfig {
private final ServerEndpointConfig perEndpointConfig;
- private final Map<String, Object> perSessionUserProperties = new
ConcurrentHashMap<>();
+ private final Map<String,Object> perSessionUserProperties = new
ConcurrentHashMap<>();
WsPerSessionServerEndpointConfig(ServerEndpointConfig perEndpointConfig) {
this.perEndpointConfig = perEndpointConfig;
@@ -51,7 +51,7 @@ class WsPerSessionServerEndpointConfig implements
ServerEndpointConfig {
}
@Override
- public Map<String, Object> getUserProperties() {
+ public Map<String,Object> getUserProperties() {
return perSessionUserProperties;
}
diff --git
a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
index a3d444a6a2..f42205dbcc 100644
--- a/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
+++ b/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
@@ -165,7 +165,7 @@ public class WsRemoteEndpointImplServer extends
WsRemoteEndpointImplBase {
}
}
socketWrapper.write(block ? BlockingMode.BLOCK :
BlockingMode.SEMI_BLOCK, timeout, TimeUnit.MILLISECONDS,
- null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION,
new CompletionHandler<Long, Void>() {
+ null, SocketWrapperBase.COMPLETE_WRITE_WITH_COMPLETION,
new CompletionHandler<Long,Void>() {
@Override
public void completed(Long result, Void attachment) {
if (block) {
@@ -378,8 +378,7 @@ public class WsRemoteEndpointImplServer extends
WsRemoteEndpointImplBase {
}
- private record OnResultRunnable(WsSession session, SendHandler sh,
- Throwable t) implements Runnable {
+ private record OnResultRunnable(WsSession session, SendHandler sh,
Throwable t) implements Runnable {
@Override
public void run() {
if (t == null) {
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index 6221d609b9..09cffeecc0 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -66,9 +66,10 @@ public class WsServerContainer extends WsWebSocketContainer
implements ServerCon
private final WsWriteTimeout wsWriteTimeout = new WsWriteTimeout();
private final ServletContext servletContext;
- private final Map<String, ExactPathMatch> configExactMatchMap = new
ConcurrentHashMap<>();
- private final Map<Integer, ConcurrentSkipListMap<String,
TemplatePathMatch>> configTemplateMatchMap = new ConcurrentHashMap<>();
- private final Map<String, Set<WsSession>> authenticatedSessions = new
ConcurrentHashMap<>();
+ private final Map<String,ExactPathMatch> configExactMatchMap = new
ConcurrentHashMap<>();
+ private final Map<Integer,ConcurrentSkipListMap<String,TemplatePathMatch>>
configTemplateMatchMap =
+ new ConcurrentHashMap<>();
+ private final Map<String,Set<WsSession>> authenticatedSessions = new
ConcurrentHashMap<>();
private volatile boolean endpointsRegistered = false;
private volatile boolean deploymentFailed = false;
@@ -139,7 +140,7 @@ public class WsServerContainer extends WsWebSocketContainer
implements ServerCon
UriTemplate uriTemplate = new UriTemplate(path);
if (uriTemplate.hasParameters()) {
Integer key = Integer.valueOf(uriTemplate.getSegmentCount());
- ConcurrentSkipListMap<String, TemplatePathMatch>
templateMatches = configTemplateMatchMap.get(key);
+ ConcurrentSkipListMap<String,TemplatePathMatch>
templateMatches = configTemplateMatchMap.get(key);
if (templateMatches == null) {
// Ensure that if concurrent threads execute this block
they
// all end up using the same ConcurrentSkipListMap instance
@@ -260,7 +261,7 @@ public class WsServerContainer extends WsWebSocketContainer
implements ServerCon
@Override
public void upgradeHttpToWebSocket(Object httpServletRequest, Object
httpServletResponse, ServerEndpointConfig sec,
- Map<String, String> pathParameters) throws IOException,
DeploymentException {
+ Map<String,String> pathParameters) throws IOException,
DeploymentException {
try {
UpgradeUtil.doUpgrade(this, (HttpServletRequest)
httpServletRequest,
(HttpServletResponse) httpServletResponse, sec,
pathParameters);
@@ -289,7 +290,7 @@ public class WsServerContainer extends WsWebSocketContainer
implements ServerCon
// Number of segments has to match
Integer key = Integer.valueOf(pathUriTemplate.getSegmentCount());
- ConcurrentSkipListMap<String, TemplatePathMatch> templateMatches =
configTemplateMatchMap.get(key);
+ ConcurrentSkipListMap<String,TemplatePathMatch> templateMatches =
configTemplateMatchMap.get(key);
if (templateMatches == null) {
// No templates with an equal number of segments so there will be
@@ -300,7 +301,7 @@ public class WsServerContainer extends WsWebSocketContainer
implements ServerCon
// List is in alphabetical order of normalised templates.
// Correct match is the first one that matches.
ServerEndpointConfig sec = null;
- Map<String, String> pathParams = null;
+ Map<String,String> pathParams = null;
for (TemplatePathMatch templateMatch : templateMatches.values()) {
pathParams = templateMatch.uriTemplate().match(pathUriTemplate);
if (pathParams != null) {
@@ -414,8 +415,7 @@ public class WsServerContainer extends WsWebSocketContainer
implements ServerCon
}
- private record TemplatePathMatch(ServerEndpointConfig config, UriTemplate
uriTemplate,
- boolean fromAnnotatedPojo) {
+ private record TemplatePathMatch(ServerEndpointConfig config, UriTemplate
uriTemplate, boolean fromAnnotatedPojo) {
}
diff --git a/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
b/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
index 24d59535c0..be844e1a34 100644
--- a/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
+++ b/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
@@ -34,8 +34,8 @@ public class WsWriteTimeout implements BackgroundProcess {
/**
* Note: The comparator imposes orderings that are inconsistent with equals
*/
- private final Set<WsRemoteEndpointImplServer> endpoints = new
ConcurrentSkipListSet<>(
-
Comparator.comparingLong(WsRemoteEndpointImplServer::getTimeoutExpiry));
+ private final Set<WsRemoteEndpointImplServer> endpoints =
+ new
ConcurrentSkipListSet<>(Comparator.comparingLong(WsRemoteEndpointImplServer::getTimeoutExpiry));
private final AtomicInteger count = new AtomicInteger(0);
private int backgroundProcessCount = 0;
private volatile int processPeriod = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
