[tomcat] branch 8.5.x updated: Code clean-up - formatting. No functional change.
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 9e8b4a2f83 Code clean-up - formatting. No functional change.
9e8b4a2f83 is described below
commit 9e8b4a2f832487020c26df390bffd23beb2c20e6
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:32:11 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/filters/Constants.java| 3 +-
java/org/apache/catalina/filters/CorsFilter.java | 12
.../catalina/filters/CsrfPreventionFilter.java | 10 +++
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RemoteIpFilter.java| 22 +++---
.../catalina/filters/RestCsrfPreventionFilter.java | 7 +++--
8 files changed, 53 insertions(+), 43 deletions(-)
diff --git a/java/org/apache/catalina/filters/Constants.java
b/java/org/apache/catalina/filters/Constants.java
index 25693aef56..dbec2a72cc 100644
--- a/java/org/apache/catalina/filters/Constants.java
+++ b/java/org/apache/catalina/filters/Constants.java
@@ -60,5 +60,6 @@ public final class Constants {
/**
* The servlet context attribute key under which the CSRF REST header name
can be found.
*/
-public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
+public static final String CSRF_REST_NONCE_HEADER_NAME_KEY =
+"org.apache.catalina.filters.CSRF_REST_NONCE_HEADER_NAME";
}
diff --git a/java/org/apache/catalina/filters/CorsFilter.java
b/java/org/apache/catalina/filters/CorsFilter.java
index c211ea66cc..ca29c554a9 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -278,8 +278,8 @@ public class CorsFilter implements Filter {
}
// Section 6.2.4
-String accessControlRequestHeadersHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
+String accessControlRequestHeadersHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS);
List accessControlRequestHeaders = new ArrayList<>();
if (accessControlRequestHeadersHeader != null &&
!accessControlRequestHeadersHeader.trim().isEmpty()) {
String[] headers =
accessControlRequestHeadersHeader.trim().split(",");
@@ -571,8 +571,8 @@ public class CorsFilter implements Filter {
String method = request.getMethod();
if (method != null) {
if ("OPTIONS".equals(method)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
requestType = CORSRequestType.PRE_FLIGHT;
} else if (accessControlRequestMethodHeader != null &&
@@ -922,8 +922,8 @@ public class CorsFilter implements Filter {
/**
* Request headers sent as 'Access-Control-Request-Headers' header, for
pre-flight request.
*/
-public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
HTTP_REQUEST_ATTRIBUTE_PREFIX +
-"request.headers";
+public static final String HTTP_REQUEST_ATTRIBUTE_REQUEST_HEADERS =
+HTTP_REQUEST_ATTRIBUTE_PREFIX + "request.headers";
// -- Constants
/**
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index 9bb2660a33..ef5e979126 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -258,8 +258,8 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
return null;
}
@SuppressWarnings("unchecked")
-NonceCache nonceCache = (NonceCache) session
-.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
+NonceCache nonceCache =
+(NonceCache)
session.getAttribute(Constants.CSRF_NONCE_SESSION_ATTR_NAME);
return nonceCache;
}
@@ -355,14 +355,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
// Although the internal implementation uses a Map, this cache
//
[tomcat] branch 8.5.x updated: Code clean-up - formatting. No functional change.
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 4af9b611e6 Code clean-up - formatting. No functional change.
4af9b611e6 is described below
commit 4af9b611e62351aa14b9cb1dfc7fc25fd05b7e23
Author: Mark Thomas
AuthorDate: Thu Jun 1 19:47:12 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/connector/Connector.java | 10 ++---
.../apache/catalina/connector/CoyoteAdapter.java | 4 +-
.../org/apache/catalina/connector/InputBuffer.java | 2 +-
.../apache/catalina/connector/OutputBuffer.java| 2 +-
java/org/apache/catalina/connector/Request.java| 46 +++---
.../apache/catalina/connector/RequestFacade.java | 6 +--
java/org/apache/catalina/connector/Response.java | 4 +-
7 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/java/org/apache/catalina/connector/Connector.java
b/java/org/apache/catalina/connector/Connector.java
index 8d3ff0657a..faf6ee2094 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -64,8 +64,8 @@ public class Connector extends LifecycleMBeanBase {
/**
* Alternate flag to enable recycling of facades.
*/
-public static final boolean RECYCLE_FACADES = Boolean
-
.parseBoolean(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
"false"));
+public static final boolean RECYCLE_FACADES =
+
Boolean.parseBoolean(System.getProperty("org.apache.catalina.connector.RECYCLE_FACADES",
"false"));
public static final String INTERNAL_EXECUTOR_NAME = "Internal";
@@ -275,8 +275,8 @@ public class Connector extends LifecycleMBeanBase {
* The behavior when an encoded solidus (slash) is submitted.
*/
@SuppressWarnings("deprecation")
-private EncodedSolidusHandling encodedSolidusHandling =
UDecoder.ALLOW_ENCODED_SLASH ? EncodedSolidusHandling.DECODE
-: EncodedSolidusHandling.REJECT;
+private EncodedSolidusHandling encodedSolidusHandling =
+UDecoder.ALLOW_ENCODED_SLASH ? EncodedSolidusHandling.DECODE :
EncodedSolidusHandling.REJECT;
/**
@@ -285,7 +285,7 @@ public class Connector extends LifecycleMBeanBase {
protected boolean useBodyEncodingForURI = false;
-protected static final HashMap replacements = new
HashMap<>();
+protected static final HashMap replacements = new
HashMap<>();
static {
replacements.put("acceptCount", "backlog");
replacements.put("connectionLinger", "soLinger");
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index c674626bc7..066fa82d83 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -910,8 +910,8 @@ public class CoyoteAdapter implements Adapter {
int end = uriBC.getEnd();
int pathParamStart = semicolon + 1;
-int pathParamEnd = ByteChunk.findBytes(uriBC.getBuffer(), start +
pathParamStart, end,
-new byte[] { ';', '/' });
+int pathParamEnd =
+ByteChunk.findBytes(uriBC.getBuffer(), start +
pathParamStart, end, new byte[] { ';', '/' });
String pv = null;
diff --git a/java/org/apache/catalina/connector/InputBuffer.java
b/java/org/apache/catalina/connector/InputBuffer.java
index cce362ce24..f65112646a 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -69,7 +69,7 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
/**
* Encoder cache.
*/
-private static final ConcurrentMap> encoders = new ConcurrentHashMap<>();
+private static final
ConcurrentMap> encoders = new
ConcurrentHashMap<>();
// - Instance Variables
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 7a14989b54..2249a21395 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -55,7 +55,7 @@ public class OutputBuffer extends Writer {
/**
* Encoder cache.
*/
-private final Map encoders = new HashMap<>();
+private final Map encoders = new HashMap<>();
/**
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 75c24acd02..1bfe791e8f 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -201,10 +201,10 @@ public class Request implements
[tomcat] branch 8.5.x updated: Code clean-up - formatting. No functional change.
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 6ee0828b13 Code clean-up - formatting. No functional change.
6ee0828b13 is described below
commit 6ee0828b13d26ec563923f8e217a7896858679a0
Author: Mark Thomas
AuthorDate: Wed May 10 17:06:50 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
index 4f8aa81b46..f0dd05f482 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorQueryTask.java
@@ -154,10 +154,7 @@ public class JMXAccessorQueryTask extends JMXAccessorTask {
}
continue;
}
-if (value == null) {
-continue;
-}
-if ("modelerType".equals(attName)) {
+if ((value == null) || "modelerType".equals(attName)) {
continue;
}
createProperty(pname + attName, value);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Code clean-up. Formatting. No functional change.
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 87e440948e Code clean-up. Formatting. No functional change.
87e440948e is described below
commit 87e440948ee2e739f91862d268a54e03b96d1f34
Author: Mark Thomas
AuthorDate: Wed Mar 15 14:11:33 2023 +
Code clean-up. Formatting. No functional change.
---
.../catalina/tribes/demos/ChannelCreator.java | 90 +++---
.../catalina/tribes/demos/CoordinationDemo.java| 238
.../apache/catalina/tribes/demos/EchoRpcTest.java | 232
.../catalina/tribes/demos/IntrospectionUtils.java | 67 ++---
.../org/apache/catalina/tribes/demos/LoadTest.java | 217 +++
test/org/apache/catalina/tribes/demos/MapDemo.java | 302 ++---
.../tribes/demos/MembersWithProperties.java| 45 ++-
7 files changed, 582 insertions(+), 609 deletions(-)
diff --git a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
index 4c96c2f1b5..e395c95312 100644
--- a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
+++ b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
@@ -42,31 +42,20 @@ public class ChannelCreator {
public static StringBuilder usage() {
StringBuilder buf = new StringBuilder();
-buf.append("\n\t\t[-bind tcpbindaddress]")
- .append("\n\t\t[-tcpselto tcpselectortimeout]")
- .append("\n\t\t[-tcpthreads tcpthreadcount]")
- .append("\n\t\t[-port tcplistenport]")
- .append("\n\t\t[-autobind tcpbindtryrange]")
- .append("\n\t\t[-ackto acktimeout]")
- .append("\n\t\t[-receiver
org.apache.catalina.tribes.transport.nio.NioReceiver|org.apache.catalina.tribes.transport.bio.BioReceiver|]")
- .append("\n\t\t[-transport
org.apache.catalina.tribes.transport.nio.PooledParallelSender|org.apache.catalina.tribes.transport.bio.PooledMultiSender]")
- .append("\n\t\t[-transport.xxx transport specific property]")
- .append("\n\t\t[-maddr multicastaddr]")
- .append("\n\t\t[-mport multicastport]")
- .append("\n\t\t[-mbind multicastbindaddr]")
- .append("\n\t\t[-mfreq multicastfrequency]")
- .append("\n\t\t[-mdrop multicastdroptime]")
- .append("\n\t\t[-gzip]")
- .append("\n\t\t[-static hostname:port (-static localhost:
-static 127.0.0.1: can be repeated)]")
- .append("\n\t\t[-order]")
- .append("\n\t\t[-ordersize maxorderqueuesize]")
- .append("\n\t\t[-frag]")
- .append("\n\t\t[-fragsize maxmsgsize]")
- .append("\n\t\t[-throughput]")
- .append("\n\t\t[-failuredetect]")
- .append("\n\t\t[-async]")
- .append("\n\t\t[-asyncsize maxqueuesizeinkilobytes]");
- return buf;
+buf.append("\n\t\t[-bind tcpbindaddress]").append("\n\t\t[-tcpselto
tcpselectortimeout]")
+.append("\n\t\t[-tcpthreads
tcpthreadcount]").append("\n\t\t[-port tcplistenport]")
+.append("\n\t\t[-autobind
tcpbindtryrange]").append("\n\t\t[-ackto acktimeout]")
+.append("\n\t\t[-receiver
org.apache.catalina.tribes.transport.nio.NioReceiver|org.apache.catalina.tribes.transport.bio.BioReceiver|]")
+.append("\n\t\t[-transport
org.apache.catalina.tribes.transport.nio.PooledParallelSender|org.apache.catalina.tribes.transport.bio.PooledMultiSender]")
+.append("\n\t\t[-transport.xxx transport specific
property]").append("\n\t\t[-maddr multicastaddr]")
+.append("\n\t\t[-mport multicastport]").append("\n\t\t[-mbind
multicastbindaddr]")
+.append("\n\t\t[-mfreq
multicastfrequency]").append("\n\t\t[-mdrop multicastdroptime]")
+.append("\n\t\t[-gzip]")
+.append("\n\t\t[-static hostname:port (-static localhost:
-static 127.0.0.1: can be repeated)]")
+.append("\n\t\t[-order]").append("\n\t\t[-ordersize
maxorderqueuesize]").append("\n\t\t[-frag]")
+.append("\n\t\t[-fragsize
maxmsgsize]").append("\n\t\t[-throughput]").append("\n\t\t[-failuredetect]")
+.append("\n\t\t[-async]").append("\n\t\t[-asyncsize
maxqueuesizeinkilobytes]");
+return buf;
}
@@ -92,7 +81,7 @@ public class ChannelCreator {
String transport =
"org.apache.catalina.tribes.transport.nio.PooledParallelSender";
String receiver =
"org.apache.catalina.tribes.transport.nio.NioReceiver";
boolean async = false;
-int asyncsize = 1024*1024*50; //50MB
+int asyncsize = 1024 * 1024 * 50; // 50MB
boolean throughput = false;
boolean failuredetect = false;
@@ -115,12 +104,12 @@ public class
[tomcat] branch 8.5.x updated: Code clean-up. Formatting. No functional change.
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 f46a2a61ea Code clean-up. Formatting. No functional change.
f46a2a61ea is described below
commit f46a2a61ea8aa0de9e4c88b38e671767b5e5b290
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:31:36 2023 +
Code clean-up. Formatting. No functional change.
---
.../tomcat/websocket/TestConnectionLimit.java | 9 +-
.../tomcat/websocket/TestPerMessageDeflate.java| 18 ++-
test/org/apache/tomcat/websocket/TestUtil.java | 82 ---
.../tomcat/websocket/TestWebSocketFrameClient.java | 37 ++---
.../websocket/TestWebSocketFrameClientSSL.java | 52 +++
test/org/apache/tomcat/websocket/TestWsFrame.java | 6 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 22 ++-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 18 +--
.../websocket/TestWsSessionSuspendResume.java | 6 +-
.../tomcat/websocket/TestWsSubprotocols.java | 28 ++--
.../tomcat/websocket/TestWsWebSocketContainer.java | 153 -
.../TestWsWebSocketContainerGetOpenSessions.java | 23 ++--
...WsWebSocketContainerSessionExpiryContainer.java | 19 +--
...stWsWebSocketContainerSessionExpirySession.java | 16 +--
.../TestWsWebSocketContainerTimeoutClient.java | 16 +--
.../TestWsWebSocketContainerTimeoutServer.java | 38 ++---
.../TestWsWebSocketContainerWithProxy.java | 2 +-
.../tomcat/websocket/TesterBlockWebSocketSCI.java | 13 +-
.../apache/tomcat/websocket/TesterEchoServer.java | 8 +-
.../tomcat/websocket/TesterFirehoseServer.java | 7 +-
.../tomcat/websocket/TesterMessageCountClient.java | 13 +-
.../websocket/TesterWebSocketClientProxy.java | 7 +-
.../tomcat/websocket/TesterWsClientAutobahn.java | 24 ++--
.../apache/tomcat/websocket/WebSocketBaseTest.java | 4 +-
.../websocket/WsWebSocketContainerBaseTest.java| 7 +-
.../websocket/pojo/TestEncodingDecoding.java | 128 -
.../websocket/pojo/TestPojoEndpointBase.java | 11 +-
.../websocket/pojo/TestPojoMethodMapping.java | 23 ++--
.../apache/tomcat/websocket/pojo/TesterUtil.java | 3 +-
.../tomcat/websocket/server/TestClassLoader.java | 7 +-
.../apache/tomcat/websocket/server/TestClose.java | 2 +-
.../tomcat/websocket/server/TestCloseBug58624.java | 13 +-
.../tomcat/websocket/server/TestShutdown.java | 14 +-
.../tomcat/websocket/server/TestSlowClient.java| 3 +-
.../tomcat/websocket/server/TestUriTemplate.java | 54
.../server/TestWsRemoteEndpointImplServer.java | 28 ++--
.../websocket/server/TestWsServerContainer.java| 75 --
.../websocket/server/TesterEndpointConfig.java | 4 +-
.../tomcat/websocket/server/TesterWsClient.java| 17 +--
39 files changed, 397 insertions(+), 613 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index e4eb14d57e..f1ec95dcdb 100644
--- a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
+++ b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
@@ -38,8 +38,7 @@ import
org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEn
public class TestConnectionLimit extends TomcatBaseTest {
/*
- * Simple test to see how many outgoing connections can be created on a
- * single machine.
+ * Simple test to see how many outgoing connections can be created on a
single machine.
*/
@Test
public void testSingleMachine() throws Exception {
@@ -54,8 +53,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
tomcat.start();
-URI uri = new URI("ws://localhost:" + getPort() +
-TesterEchoServer.Config.PATH_ASYNC);
+URI uri = new URI("ws://localhost:" + getPort() +
TesterEchoServer.Config.PATH_ASYNC);
AtomicInteger counter = new AtomicInteger(0);
int threadCount = 50;
@@ -87,8 +85,7 @@ public class TestConnectionLimit extends TomcatBaseTest {
@Override
public void run() {
-WebSocketContainer wsContainer =
-ContainerProvider.getWebSocketContainer();
+WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
int count = 0;
diff --git a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
index 4538eba976..d1676b6c96 100644
--- a/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
+++ b/test/org/apache/tomcat/websocket/TestPerMessageDeflate.java
@@ -93,17 +93,16 @@ public class TestPerMessageDeflate {
ByteBuffer received = ByteBuffer.allocate(8192);
-TransformationResult tr =
[tomcat] branch 8.5.x updated: Code clean-up. Formatting. No functional change.
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 eb5cca161b Code clean-up. Formatting. No functional change.
eb5cca161b is described below
commit eb5cca161b8c471460ceb5c1b7b12b9001070c90
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:31:12 2023 +
Code clean-up. Formatting. No functional change.
---
.../apache/tomcat/websocket/server/Constants.java | 12 +-
.../server/DefaultServerEndpointConfigurator.java | 15 +-
.../tomcat/websocket/server/UpgradeUtil.java | 131 +---
.../tomcat/websocket/server/UriTemplate.java | 26 +--
.../tomcat/websocket/server/WsContextListener.java | 10 +-
.../apache/tomcat/websocket/server/WsFilter.java | 14 +-
.../tomcat/websocket/server/WsFrameServer.java | 63 +++---
.../websocket/server/WsHandshakeRequest.java | 49 ++---
.../websocket/server/WsHttpUpgradeHandler.java | 58 ++---
.../tomcat/websocket/server/WsMappingResult.java | 7 +-
.../server/WsPerSessionServerEndpointConfig.java | 12 +-
.../server/WsRemoteEndpointImplServer.java | 33 ++-
java/org/apache/tomcat/websocket/server/WsSci.java | 36 ++--
.../tomcat/websocket/server/WsServerContainer.java | 235 -
.../tomcat/websocket/server/WsSessionListener.java | 2 +-
.../tomcat/websocket/server/WsWriteTimeout.java| 23 +-
.../tomcat/websocket/server/package-info.java | 4 +-
17 files changed, 286 insertions(+), 444 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index 876f1b8074..20e263fd18 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -21,15 +21,11 @@ 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
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
-"org.apache.tomcat.websocket.noAddAfterHandshake";
+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
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.noAddAfterHandshake";
-public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
-"javax.websocket.server.ServerContainer";
+public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
"javax.websocket.server.ServerContainer";
private Constants() {
diff --git
a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
index 75b8d7059e..5e1b253709 100644
---
a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++
b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -26,12 +26,10 @@ import javax.websocket.HandshakeResponse;
import javax.websocket.server.HandshakeRequest;
import javax.websocket.server.ServerEndpointConfig;
-public class DefaultServerEndpointConfigurator
-extends ServerEndpointConfig.Configurator {
+public class DefaultServerEndpointConfigurator extends
ServerEndpointConfig.Configurator {
@Override
-public T getEndpointInstance(Class clazz)
-throws InstantiationException {
+public T getEndpointInstance(Class clazz) throws
InstantiationException {
try {
return clazz.getConstructor().newInstance();
} catch (InstantiationException e) {
@@ -45,8 +43,7 @@ public class DefaultServerEndpointConfigurator
@Override
-public String getNegotiatedSubprotocol(List supported,
-List requested) {
+public String getNegotiatedSubprotocol(List supported,
List requested) {
for (String request : requested) {
if (supported.contains(request)) {
@@ -58,8 +55,7 @@ public class DefaultServerEndpointConfigurator
@Override
-public List getNegotiatedExtensions(List installed,
-List requested) {
+public List getNegotiatedExtensions(List installed,
List requested) {
Set installedNames = new HashSet<>();
for (Extension e : installed) {
installedNames.add(e.getName());
@@ -80,8 +76,7 @@ public class DefaultServerEndpointConfigurator
}
[tomcat] branch 8.5.x updated: Code clean-up. Formatting. No functional change.
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 996d77a753 Code clean-up. Formatting. No functional change.
996d77a753 is described below
commit 996d77a753024a7572c83b82555fe12a01b637b4
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:31:00 2023 +
Code clean-up. Formatting. No functional change.
---
.../apache/tomcat/websocket/pojo/Constants.java| 3 +-
.../tomcat/websocket/pojo/PojoEndpointBase.java| 49 ++-
.../tomcat/websocket/pojo/PojoEndpointClient.java | 13 +-
.../tomcat/websocket/pojo/PojoEndpointServer.java | 12 +-
.../websocket/pojo/PojoMessageHandlerBase.java | 15 +-
.../pojo/PojoMessageHandlerPartialBase.java| 22 +-
.../pojo/PojoMessageHandlerPartialBinary.java | 11 +-
.../pojo/PojoMessageHandlerPartialText.java| 11 +-
.../pojo/PojoMessageHandlerWholeBase.java | 21 +-
.../pojo/PojoMessageHandlerWholeBinary.java| 23 +-
.../pojo/PojoMessageHandlerWholePong.java | 11 +-
.../pojo/PojoMessageHandlerWholeText.java | 23 +-
.../tomcat/websocket/pojo/PojoMethodMapping.java | 328 -
.../tomcat/websocket/pojo/PojoPathParam.java | 12 +-
.../apache/tomcat/websocket/pojo/package-info.java | 4 +-
15 files changed, 222 insertions(+), 336 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/pojo/Constants.java
b/java/org/apache/tomcat/websocket/pojo/Constants.java
index 762ac9fe3f..1eba53131a 100644
--- a/java/org/apache/tomcat/websocket/pojo/Constants.java
+++ b/java/org/apache/tomcat/websocket/pojo/Constants.java
@@ -21,8 +21,7 @@ package org.apache.tomcat.websocket.pojo;
*/
public class Constants {
-public static final String POJO_METHOD_MAPPING_KEY =
-"org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping";
+public static final String POJO_METHOD_MAPPING_KEY =
"org.apache.tomcat.websocket.pojo.PojoEndpoint.methodMapping";
private Constants() {
// Hide default constructor
diff --git a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
index fa71489acd..bebfc6b67a 100644
--- a/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
+++ b/java/org/apache/tomcat/websocket/pojo/PojoEndpointBase.java
@@ -33,9 +33,8 @@ import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
/**
- * Base implementation (client and server have different concrete
- * implementations) of the wrapper that converts a POJO instance into a
- * WebSocket endpoint instance.
+ * Base implementation (client and server have different concrete
implementations) of the wrapper that converts a POJO
+ * instance into a WebSocket endpoint instance.
*/
public abstract class PojoEndpointBase extends Endpoint {
@@ -43,11 +42,11 @@ public abstract class PojoEndpointBase extends Endpoint {
private static final StringManager sm =
StringManager.getManager(PojoEndpointBase.class);
private Object pojo;
-private final Map pathParameters;
+private final Map pathParameters;
private PojoMethodMapping methodMapping;
-protected PojoEndpointBase(Map pathParameters) {
+protected PojoEndpointBase(Map pathParameters) {
this.pathParameters = pathParameters;
}
@@ -59,22 +58,17 @@ public abstract class PojoEndpointBase extends Endpoint {
// Add message handlers before calling onOpen since that may trigger a
// message which in turn could trigger a response and/or close the
// session
-for (MessageHandler mh : methodMapping.getMessageHandlers(pojo,
-pathParameters, session, config)) {
+for (MessageHandler mh : methodMapping.getMessageHandlers(pojo,
pathParameters, session, config)) {
session.addMessageHandler(mh);
}
if (methodMapping.getOnOpen() != null) {
try {
-methodMapping.getOnOpen().invoke(pojo,
-methodMapping.getOnOpenArgs(
-pathParameters, session, config));
+methodMapping.getOnOpen().invoke(pojo,
methodMapping.getOnOpenArgs(pathParameters, session, config));
} catch (IllegalAccessException e) {
// Reflection related problems
-log.error(sm.getString(
-"pojoEndpointBase.onOpenFail",
-pojo.getClass().getName()), e);
+log.error(sm.getString("pojoEndpointBase.onOpenFail",
pojo.getClass().getName()), e);
handleOnOpenOrCloseError(session, e);
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
@@ -107,8 +101,7 @@ public abstract class
