This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new c6b9a9e543 Code clean-up - formatting. No functional change.
c6b9a9e543 is described below
commit c6b9a9e5436ea7d47d7b72e608e42a86aaf89827
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Aug 29 11:52:42 2025 +0100
Code clean-up - formatting. No functional change.
---
.../tomcat/websocket/pojo/PojoEndpointBase.java | 4 ++--
.../tomcat/websocket/pojo/PojoEndpointServer.java | 6 +++---
.../tomcat/websocket/pojo/PojoMethodMapping.java | 20 ++++++++++----------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
index 8067b72325..892fdc47d3 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
@@ -42,11 +42,11 @@ public abstract class PojoEndpointBase extends Endpoint {
private static final StringManager sm =
StringManager.getManager(PojoEndpointBase.class);
private Object pojo;
- private final Map<String, String> pathParameters;
+ private final Map<String,String> pathParameters;
private PojoMethodMapping methodMapping;
- protected PojoEndpointBase(Map<String, String> pathParameters) {
+ protected PojoEndpointBase(Map<String,String> pathParameters) {
this.pathParameters = pathParameters;
}
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
b/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
index 650a72b097..378b478ed2 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
@@ -28,7 +28,7 @@ import jakarta.websocket.server.ServerEndpointConfig;
*/
public class PojoEndpointServer extends PojoEndpointBase {
- public PojoEndpointServer(Map<String, String> pathParameters, Object pojo)
{
+ public PojoEndpointServer(Map<String,String> pathParameters, Object pojo) {
super(pathParameters);
setPojo(pojo);
}
@@ -39,8 +39,8 @@ public class PojoEndpointServer extends PojoEndpointBase {
ServerEndpointConfig sec = (ServerEndpointConfig) endpointConfig;
- PojoMethodMapping methodMapping = (PojoMethodMapping)
sec.getUserProperties()
- .get(Constants.POJO_METHOD_MAPPING_KEY);
+ PojoMethodMapping methodMapping =
+ (PojoMethodMapping)
sec.getUserProperties().get(Constants.POJO_METHOD_MAPPING_KEY);
setMethodMapping(methodMapping);
doOnOpen(session, endpointConfig);
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
index da851418f0..fcef7bbd10 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
@@ -229,7 +229,7 @@ public class PojoMethodMapping {
}
- public Object[] getOnOpenArgs(Map<String, String> pathParameters, Session
session, EndpointConfig config)
+ public Object[] getOnOpenArgs(Map<String,String> pathParameters, Session
session, EndpointConfig config)
throws DecodeException {
return buildArgs(onOpenParams, pathParameters, session, config, null,
null);
}
@@ -240,7 +240,7 @@ public class PojoMethodMapping {
}
- public Object[] getOnCloseArgs(Map<String, String> pathParameters, Session
session, CloseReason closeReason)
+ public Object[] getOnCloseArgs(Map<String,String> pathParameters, Session
session, CloseReason closeReason)
throws DecodeException {
return buildArgs(onCloseParams, pathParameters, session, null, null,
closeReason);
}
@@ -251,7 +251,7 @@ public class PojoMethodMapping {
}
- public Object[] getOnErrorArgs(Map<String, String> pathParameters, Session
session, Throwable throwable)
+ public Object[] getOnErrorArgs(Map<String,String> pathParameters, Session
session, Throwable throwable)
throws DecodeException {
return buildArgs(onErrorParams, pathParameters, session, null,
throwable, null);
}
@@ -262,7 +262,7 @@ public class PojoMethodMapping {
}
- public Set<MessageHandler> getMessageHandlers(Object pojo, Map<String,
String> pathParameters, Session session,
+ public Set<MessageHandler> getMessageHandlers(Object pojo,
Map<String,String> pathParameters, Session session,
EndpointConfig config) {
Set<MessageHandler> result = new HashSet<>();
for (MessageHandlerInfo messageMethod : onMessage) {
@@ -314,7 +314,7 @@ public class PojoMethodMapping {
}
- private static Object[] buildArgs(PojoPathParam[] pathParams, Map<String,
String> pathParameters, Session session,
+ private static Object[] buildArgs(PojoPathParam[] pathParams,
Map<String,String> pathParameters, Session session,
EndpointConfig config, Throwable throwable, CloseReason
closeReason) throws DecodeException {
Object[] result = new Object[pathParams.length];
for (int i = 0; i < pathParams.length; i++) {
@@ -354,7 +354,7 @@ public class PojoMethodMapping {
private int indexInputStream = -1;
private int indexReader = -1;
private int indexPrimitive = -1;
- private final Map<Integer, PojoPathParam> indexPathParams = new
HashMap<>();
+ private final Map<Integer,PojoPathParam> indexPathParams = new
HashMap<>();
private int indexPayload = -1;
private DecoderMatch decoderMatch = null;
private final long maxMessageSize;
@@ -574,11 +574,11 @@ public class PojoMethodMapping {
}
- public Set<MessageHandler> getMessageHandlers(Object pojo, Map<String,
String> pathParameters, Session session,
+ public Set<MessageHandler> getMessageHandlers(Object pojo,
Map<String,String> pathParameters, Session session,
EndpointConfig config) {
Object[] params = new Object[m.getParameterTypes().length];
- for (Map.Entry<Integer, PojoPathParam> entry :
indexPathParams.entrySet()) {
+ for (Map.Entry<Integer,PojoPathParam> entry :
indexPathParams.entrySet()) {
PojoPathParam pathParam = entry.getValue();
String valueString = pathParameters.get(pathParam.getName());
Object value;
@@ -630,8 +630,8 @@ public class PojoMethodMapping {
results.add(mh);
}
} else {
- MessageHandler mh = new PojoMessageHandlerWholePong(pojo,
m, session, params, indexPong, false,
- indexSession);
+ MessageHandler mh =
+ new PojoMessageHandlerWholePong(pojo, m, session,
params, indexPong, false, indexSession);
results.add(mh);
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
