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 b621524de9 Fix formatting glitches
b621524de9 is described below
commit b621524de9c9d393345f16856418bb2db121b3e3
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Apr 14 14:43:14 2023 +0100
Fix formatting glitches
---
java/javax/websocket/DefaultClientEndpointConfig.java | 2 +-
java/javax/websocket/EndpointConfig.java | 2 +-
java/javax/websocket/HandshakeResponse.java | 2 +-
java/javax/websocket/Session.java | 4 ++--
java/javax/websocket/server/DefaultServerEndpointConfig.java | 2 +-
java/javax/websocket/server/HandshakeRequest.java | 2 +-
java/javax/websocket/server/ServerEndpointConfig.java | 3 ++-
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/java/javax/websocket/DefaultClientEndpointConfig.java
b/java/javax/websocket/DefaultClientEndpointConfig.java
index 4926dce279..6a91c6bbc3 100644
--- a/java/javax/websocket/DefaultClientEndpointConfig.java
+++ b/java/javax/websocket/DefaultClientEndpointConfig.java
@@ -26,7 +26,7 @@ final class DefaultClientEndpointConfig implements
ClientEndpointConfig {
private final List<Extension> extensions;
private final List<Class<? extends Encoder>> encoders;
private final List<Class<? extends Decoder>> decoders;
- private final Map<String, Object> userProperties = new
ConcurrentHashMap<>();
+ private final Map<String,Object> userProperties = new
ConcurrentHashMap<>();
private final Configurator configurator;
diff --git a/java/javax/websocket/EndpointConfig.java
b/java/javax/websocket/EndpointConfig.java
index 7cac76e752..0b6c96818d 100644
--- a/java/javax/websocket/EndpointConfig.java
+++ b/java/javax/websocket/EndpointConfig.java
@@ -25,5 +25,5 @@ public interface EndpointConfig {
List<Class<? extends Decoder>> getDecoders();
- Map<String, Object> getUserProperties();
+ Map<String,Object> getUserProperties();
}
diff --git a/java/javax/websocket/HandshakeResponse.java
b/java/javax/websocket/HandshakeResponse.java
index a25c1a2de4..a932192218 100644
--- a/java/javax/websocket/HandshakeResponse.java
+++ b/java/javax/websocket/HandshakeResponse.java
@@ -26,5 +26,5 @@ public interface HandshakeResponse {
*/
String SEC_WEBSOCKET_ACCEPT = "Sec-WebSocket-Accept";
- Map<String, List<String>> getHeaders();
+ Map<String,List<String>> getHeaders();
}
diff --git a/java/javax/websocket/Session.java
b/java/javax/websocket/Session.java
index 588c12391d..3b062e0d38 100644
--- a/java/javax/websocket/Session.java
+++ b/java/javax/websocket/Session.java
@@ -141,9 +141,9 @@ public interface Session extends Closeable {
String getQueryString();
- Map<String, String> getPathParameters();
+ Map<String,String> getPathParameters();
- Map<String, Object> getUserProperties();
+ Map<String,Object> getUserProperties();
Principal getUserPrincipal();
diff --git a/java/javax/websocket/server/DefaultServerEndpointConfig.java
b/java/javax/websocket/server/DefaultServerEndpointConfig.java
index 064c2e14a0..8f588f87f3 100644
--- a/java/javax/websocket/server/DefaultServerEndpointConfig.java
+++ b/java/javax/websocket/server/DefaultServerEndpointConfig.java
@@ -36,7 +36,7 @@ final class DefaultServerEndpointConfig implements
ServerEndpointConfig {
private final List<Class<? extends Encoder>> encoders;
private final List<Class<? extends Decoder>> decoders;
private final Configurator serverEndpointConfigurator;
- private final Map<String, Object> userProperties = new
ConcurrentHashMap<>();
+ private final Map<String,Object> userProperties = new
ConcurrentHashMap<>();
DefaultServerEndpointConfig(Class<?> endpointClass, String path,
List<String> subprotocols,
List<Extension> extensions, List<Class<? extends Encoder>>
encoders,
diff --git a/java/javax/websocket/server/HandshakeRequest.java
b/java/javax/websocket/server/HandshakeRequest.java
index 373f0cde2d..dba91d4c12 100644
--- a/java/javax/websocket/server/HandshakeRequest.java
+++ b/java/javax/websocket/server/HandshakeRequest.java
@@ -31,7 +31,7 @@ public interface HandshakeRequest {
String SEC_WEBSOCKET_VERSION = "Sec-WebSocket-Version";
String SEC_WEBSOCKET_EXTENSIONS = "Sec-WebSocket-Extensions";
- Map<String, List<String>> getHeaders();
+ Map<String,List<String>> getHeaders();
Principal getUserPrincipal();
diff --git a/java/javax/websocket/server/ServerEndpointConfig.java
b/java/javax/websocket/server/ServerEndpointConfig.java
index 879c104b65..2ca618707a 100644
--- a/java/javax/websocket/server/ServerEndpointConfig.java
+++ b/java/javax/websocket/server/ServerEndpointConfig.java
@@ -147,7 +147,8 @@ public interface ServerEndpointConfig extends
EndpointConfig {
private static volatile Configurator defaultImpl = null;
private static final Object defaultImplLock = new Object();
- private static final String DEFAULT_IMPL_CLASSNAME =
"org.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator";
+ private static final String DEFAULT_IMPL_CLASSNAME =
+
"org.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator";
static Configurator fetchContainerDefaultConfigurator() {
if (defaultImpl == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
