(tomcat) branch main 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 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 d244b42a62 Code clean-up. Formatting. No functional change.
d244b42a62 is described below
commit d244b42a62c45230c7eea84b681bdacfc162ea7b
Author: Mark Thomas
AuthorDate: Fri Jun 28 15:56:06 2024 +0100
Code clean-up. Formatting. No functional change.
---
java/org/apache/coyote/ajp/AbstractAjpProtocol.java | 4 ++--
java/org/apache/coyote/ajp/AjpProcessor.java| 8
java/org/apache/coyote/ajp/Constants.java | 16
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
index 1e11a99352..f1231ad473 100644
--- a/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
+++ b/java/org/apache/coyote/ajp/AbstractAjpProtocol.java
@@ -43,7 +43,7 @@ public abstract class AbstractAjpProtocol extends
AbstractProtocol {
protected static final StringManager sm =
StringManager.getManager(AbstractAjpProtocol.class);
-public AbstractAjpProtocol(AbstractEndpoint endpoint) {
+public AbstractAjpProtocol(AbstractEndpoint endpoint) {
super(endpoint);
setConnectionTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
// AJP does not use Send File
@@ -63,7 +63,7 @@ public abstract class AbstractAjpProtocol extends
AbstractProtocol {
* {@inheritDoc} Overridden to make getter accessible to other classes in
this package.
*/
@Override
-protected AbstractEndpoint getEndpoint() {
+protected AbstractEndpoint getEndpoint() {
return super.getEndpoint();
}
diff --git a/java/org/apache/coyote/ajp/AjpProcessor.java
b/java/org/apache/coyote/ajp/AjpProcessor.java
index 0cd678e7b2..1c568b05aa 100644
--- a/java/org/apache/coyote/ajp/AjpProcessor.java
+++ b/java/org/apache/coyote/ajp/AjpProcessor.java
@@ -89,7 +89,7 @@ public class AjpProcessor extends AbstractProcessor {
private static final byte[] pongMessageArray;
-private static final Map jakartaAttributeMapping;
+private static final Map jakartaAttributeMapping;
private static final Set iisTlsAttributes;
@@ -131,7 +131,7 @@ public class AjpProcessor extends AbstractProcessor {
System.arraycopy(pongMessage.getBuffer(), 0, pongMessageArray, 0,
pongMessage.getLen());
// Build Map of Java Servlet to Jakarta Servlet attribute names
-Map m = new HashMap<>();
+Map m = new HashMap<>();
m.put("jakarta.servlet.request.secure_protocol",
"jakarta.servlet.request.secure_protocol");
m.put("jakarta.servlet.request.cipher_suite",
"jakarta.servlet.request.cipher_suite");
m.put("jakarta.servlet.request.key_size",
"jakarta.servlet.request.key_size");
@@ -994,8 +994,8 @@ public class AjpProcessor extends AbstractProcessor {
responseMessage.appendBytes(hV);
} catch (IllegalArgumentException iae) {
// Log the problematic header
-
log.warn(sm.getString("ajpprocessor.response.invalidHeader",
headers.getName(i), headers.getValue(i)),
-iae);
+
log.warn(sm.getString("ajpprocessor.response.invalidHeader", headers.getName(i),
+headers.getValue(i)), iae);
// Remove the problematic header
headers.removeHeader(i);
numHeaders--;
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index f124d8ebcb..2e4e4de60b 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -104,10 +104,10 @@ public final class Constants {
public static final int MAX_SEND_SIZE = MAX_PACKET_SIZE - SEND_HEAD_LEN;
// Translates integer codes to names of HTTP methods
-private static final String[] methodTransArray = { "OPTIONS", "GET",
"HEAD", "POST", "PUT", "DELETE", "TRACE",
-"PROPFIND", "PROPPATCH", "MKCOL", "COPY", "MOVE", "LOCK",
"UNLOCK", "ACL", "REPORT", "VERSION-CONTROL",
-"CHECKIN", "CHECKOUT", "UNCHECKOUT", "SEARCH", "MKWORKSPACE",
"UPDATE", "LABEL", "MERGE",
-"BASELINE-CONTROL", "MKACTIVITY" };
+private static final String[] methodTransArray =
+{ "OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE", "TRACE",
"PROPFIND", "PROPPATCH", "MKCOL", "COPY",
+"MOVE", "LOCK", "UNLOCK", "ACL", "REPORT",
"VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
+"SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE",
"BASELINE-CONTROL", "MKACTIVITY" };
/**
* Converts an AJP coded HTTP method to the method name.
@@ -139,9 +139,9 @@ public final class
(tomcat) branch main 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 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 a51f20fdfc Code clean-up - formatting. No functional change.
a51f20fdfc is described below
commit a51f20fdfc19a6d838fd58c78aa9e19fcfee64e9
Author: Mark Thomas
AuthorDate: Thu Jun 13 12:51:57 2024 +0100
Code clean-up - formatting. No functional change.
---
.../catalina/webresources/AbstractArchiveResourceSet.java | 13 ++---
.../webresources/AbstractSingleArchiveResourceSet.java | 2 +-
java/org/apache/catalina/webresources/Cache.java | 14 +++---
java/org/apache/catalina/webresources/CachedResource.java | 4 ++--
.../apache/catalina/webresources/JarWarResourceSet.java| 10 +-
5 files changed, 21 insertions(+), 22 deletions(-)
diff --git
a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
index ec1ddd15cd..d5551522f5 100644
--- a/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
+++ b/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
@@ -37,7 +37,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
private URL baseUrl;
private String baseUrlString;
private JarFile archive = null;
-protected Map archiveEntries = null;
+protected Map archiveEntries = null;
protected final Object archiveLock = new Object();
private long archiveUseCount = 0;
private JarContents jarContents;
@@ -163,7 +163,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
*
* @return The archives entries mapped to their names or null if {@link
#getArchiveEntry(String)} should be used.
*/
-protected abstract Map getArchiveEntries(boolean single);
+protected abstract Map getArchiveEntries(boolean single);
/**
@@ -205,10 +205,9 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
* If jarContents reports that this resource definitely does not
contain the path, we can end this method and
* move on to the next jar.
*/
-if (jarContents != null &&
-!jarContents.mightContainResource(getInternalPath().isEmpty()
? path : getInternalPath() + path,
- webAppMount)) {
-return new EmptyResource(root, path);
+if (jarContents != null && !jarContents
+.mightContainResource(getInternalPath().isEmpty() ? path :
getInternalPath() + path, webAppMount)) {
+return new EmptyResource(root, path);
}
/*
@@ -245,7 +244,7 @@ public abstract class AbstractArchiveResourceSet extends
AbstractResourceSet {
// Calls JarFile.getJarEntry() which is multi-release aware
jarEntry = getArchiveEntry(pathInJar);
} else {
-Map jarEntries = getArchiveEntries(true);
+Map jarEntries = getArchiveEntries(true);
if (!(pathInJar.charAt(pathInJar.length() - 1) == '/')) {
if (jarEntries == null) {
jarEntry = getArchiveEntry(pathInJar + '/');
diff --git
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
index f847d91ce1..a28f10e3e0 100644
---
a/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
+++
b/java/org/apache/catalina/webresources/AbstractSingleArchiveResourceSet.java
@@ -61,7 +61,7 @@ public abstract class AbstractSingleArchiveResourceSet
extends AbstractArchiveRe
@Override
-protected Map getArchiveEntries(boolean single) {
+protected Map getArchiveEntries(boolean single) {
synchronized (archiveLock) {
if (archiveEntries == null && !single) {
JarFile jarFile = null;
diff --git a/java/org/apache/catalina/webresources/Cache.java
b/java/org/apache/catalina/webresources/Cache.java
index 467a43bf2e..03e933d37c 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -52,7 +52,7 @@ public class Cache {
private LongAdder lookupCount = new LongAdder();
private LongAdder hitCount = new LongAdder();
-private final ConcurrentMap resourceCache = new
ConcurrentHashMap<>();
+private final ConcurrentMap resourceCache = new
ConcurrentHashMap<>();
public Cache(StandardRoot root) {
this.root = root;
@@ -83,8 +83,8 @@ public class Cache {
if (cacheEntry == null) {
// Local copy to ensure consistency
int objectMaxSizeBytes = getObjectMaxSizeBytes();
-
(tomcat) branch main 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 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 43f42a327e Code clean-up - formatting. No functional change.
43f42a327e is described below
commit 43f42a327ef6992065d597a5f46e5119610e5841
Author: Mark Thomas
AuthorDate: Fri May 24 13:10:33 2024 +0100
Code clean-up - formatting. No functional change.
---
.../catalina/valves/AbstractAccessLogValve.java| 14 +-
.../valves/CrawlerSessionManagerValve.java | 10 +++
.../catalina/valves/ExtendedAccessLogValve.java| 10 +++
java/org/apache/catalina/valves/FilterValve.java | 5 ++--
.../apache/catalina/valves/JsonAccessLogValve.java | 32 --
.../catalina/valves/LoadBalancerDrainingValve.java | 4 +--
.../apache/catalina/valves/PersistentValve.java| 11
java/org/apache/catalina/valves/RemoteIpValve.java | 4 +--
.../org/apache/catalina/valves/SemaphoreValve.java | 3 +-
.../catalina/valves/StuckThreadDetectionValve.java | 11
10 files changed, 54 insertions(+), 50 deletions(-)
diff --git a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
index 50a5fbeeb2..a0f0163e9a 100644
--- a/java/org/apache/catalina/valves/AbstractAccessLogValve.java
+++ b/java/org/apache/catalina/valves/AbstractAccessLogValve.java
@@ -362,7 +362,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
private final Locale cacheDefaultLocale;
private final DateFormatCache parent;
protected final Cache cLFCache;
-private final Map formatCache = new HashMap<>();
+private final Map formatCache = new HashMap<>();
protected DateFormatCache(int size, Locale loc, DateFormatCache
parent) {
cacheSize = size;
@@ -409,14 +409,14 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Global date format cache.
*/
-private static final DateFormatCache globalDateCache = new
DateFormatCache(globalCacheSize, Locale.getDefault(),
-null);
+private static final DateFormatCache globalDateCache =
+new DateFormatCache(globalCacheSize, Locale.getDefault(), null);
/**
* Thread local date format cache.
*/
-private static final ThreadLocal localDateCache =
ThreadLocal
-.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
+private static final ThreadLocal localDateCache =
+ThreadLocal.withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
/**
@@ -1339,7 +1339,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
/**
* Append the time to the buffer in the appropriate format.
*
- * @param buf The buffer to append to.
+ * @param buf The buffer to append to.
* @param time The time to log in nanoseconds.
*/
public abstract void append(CharArrayWriter buf, long time);
@@ -1915,7 +1915,7 @@ public abstract class AbstractAccessLogValve extends
ValveBase implements Access
// is encountered plus at the end.
default:
}
-// Control (1-31), delete (127) or above 127
+// Control (1-31), delete (127) or above 127
} else {
// Write unchanged string parts
if (current > next) {
diff --git a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
index 21f032847f..491fcb17fd 100644
--- a/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
+++ b/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
@@ -45,8 +45,8 @@ public class CrawlerSessionManagerValve extends ValveBase {
private static final Log log =
LogFactory.getLog(CrawlerSessionManagerValve.class);
-private final Map clientIdSessionId = new
ConcurrentHashMap<>();
-private final Map sessionIdClientId = new
ConcurrentHashMap<>();
+private final Map clientIdSessionId = new
ConcurrentHashMap<>();
+private final Map sessionIdClientId = new
ConcurrentHashMap<>();
private String crawlerUserAgents = ".*[bB]ot.*|.*Yahoo!
Slurp.*|.*Feedfetcher-Google.*";
private Pattern uaPattern = null;
@@ -139,7 +139,7 @@ public class CrawlerSessionManagerValve extends ValveBase {
}
-public Map getClientIpSessionId() {
+public Map getClientIpSessionId() {
return clientIdSessionId;
}
@@ -272,10 +272,10 @@ public class CrawlerSessionManagerValve extends ValveBase
{
private static class
(tomcat) branch main 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 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 58deafb727 Code clean-up - formatting. No functional change
58deafb727 is described below
commit 58deafb727e5a8b509732e13491266f0c0060e58
Author: Mark Thomas
AuthorDate: Tue May 14 10:59:32 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/users/AbstractGroup.java | 5 +-
java/org/apache/catalina/users/AbstractRole.java | 5 +-
java/org/apache/catalina/users/AbstractUser.java | 5 +-
java/org/apache/catalina/users/Constants.java | 2 +-
.../catalina/users/DataSourceUserDatabase.java | 49 +--
.../users/DataSourceUserDatabaseFactory.java | 48 ++-
java/org/apache/catalina/users/GenericGroup.java | 17 ++--
java/org/apache/catalina/users/GenericRole.java| 15 ++--
java/org/apache/catalina/users/GenericUser.java| 16 ++--
.../apache/catalina/users/MemoryUserDatabase.java | 96 +-
.../catalina/users/MemoryUserDatabaseFactory.java | 52 ++--
11 files changed, 149 insertions(+), 161 deletions(-)
diff --git a/java/org/apache/catalina/users/AbstractGroup.java
b/java/org/apache/catalina/users/AbstractGroup.java
index 0430b65f33..8d4e4f74cd 100644
--- a/java/org/apache/catalina/users/AbstractGroup.java
+++ b/java/org/apache/catalina/users/AbstractGroup.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Group;
/**
- * Convenience base class for {@link Group} implementations.
+ *
+ * Convenience base class for {@link Group} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractGroup implements Group {
diff --git a/java/org/apache/catalina/users/AbstractRole.java
b/java/org/apache/catalina/users/AbstractRole.java
index 7de9d545aa..610aedde73 100644
--- a/java/org/apache/catalina/users/AbstractRole.java
+++ b/java/org/apache/catalina/users/AbstractRole.java
@@ -21,9 +21,12 @@ import org.apache.catalina.Role;
/**
- * Convenience base class for {@link Role} implementations.
+ *
+ * Convenience base class for {@link Role} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractRole implements Role {
diff --git a/java/org/apache/catalina/users/AbstractUser.java
b/java/org/apache/catalina/users/AbstractUser.java
index 7ff6752f62..a00ead6c80 100644
--- a/java/org/apache/catalina/users/AbstractUser.java
+++ b/java/org/apache/catalina/users/AbstractUser.java
@@ -21,9 +21,12 @@ import org.apache.catalina.User;
/**
- * Convenience base class for {@link User} implementations.
+ *
+ * Convenience base class for {@link User} implementations.
+ *
*
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public abstract class AbstractUser implements User {
diff --git a/java/org/apache/catalina/users/Constants.java
b/java/org/apache/catalina/users/Constants.java
index c79f517a7b..df7e150ca8 100644
--- a/java/org/apache/catalina/users/Constants.java
+++ b/java/org/apache/catalina/users/Constants.java
@@ -20,8 +20,8 @@ package org.apache.catalina.users;
/**
* Manifest constants for this Java package.
*
- *
* @author Craig R. McClanahan
+ *
* @since 4.1
*/
public final class Constants {
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 8ad9aa7a7f..99b4c2fe59 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -61,17 +61,17 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
*/
protected final String id;
-protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modifiedUsers = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap removedUsers = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap removedGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap createdGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap modifiedGroups = new
ConcurrentHashMap<>();
+protected final ConcurrentHashMap removedGroups = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap createdRoles = new
ConcurrentHashMap<>();
-protected final ConcurrentHashMap modifiedRoles =
(tomcat) branch main 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 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 6a166ad281 Code clean-up - formatting. No functional change
6a166ad281 is described below
commit 6a166ad2812b775532b99d6c288ad856e5642c5c
Author: Mark Thomas
AuthorDate: Fri May 10 14:56:09 2024 +0100
Code clean-up - formatting. No functional change
---
.../catalina/tribes/transport/AbstractRxTask.java | 3 +-
.../catalina/tribes/transport/AbstractSender.java | 15 +-
.../catalina/tribes/transport/Constants.java | 8 +-
.../catalina/tribes/transport/DataSender.java | 7 +
.../tribes/transport/MultiPointSender.java | 9 +-
.../catalina/tribes/transport/PooledSender.java| 51 ++---
.../catalina/tribes/transport/ReceiverBase.java| 66 ---
.../tribes/transport/ReplicationTransmitter.java | 11 +-
.../catalina/tribes/transport/RxTaskPool.java | 48 ++---
.../catalina/tribes/transport/SenderState.java | 6 +-
.../catalina/tribes/transport/nio/NioReceiver.java | 196 +--
.../tribes/transport/nio/NioReplicationTask.java | 212 ++---
.../catalina/tribes/transport/nio/NioSender.java | 195 +--
.../tribes/transport/nio/ParallelNioSender.java| 141 +++---
.../tribes/transport/nio/PooledParallelSender.java | 16 +-
15 files changed, 502 insertions(+), 482 deletions(-)
diff --git a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
index 2a95f7dd53..2d17ae166b 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractRxTask.java
@@ -18,8 +18,7 @@ package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.io.ListenCallback;
-public abstract class AbstractRxTask implements Runnable
-{
+public abstract class AbstractRxTask implements Runnable {
public static final int OPTION_DIRECT_BUFFER =
ReceiverBase.OPTION_DIRECT_BUFFER;
diff --git a/java/org/apache/catalina/tribes/transport/AbstractSender.java
b/java/org/apache/catalina/tribes/transport/AbstractSender.java
index ba17303123..f3b7a0a563 100644
--- a/java/org/apache/catalina/tribes/transport/AbstractSender.java
+++ b/java/org/apache/catalina/tribes/transport/AbstractSender.java
@@ -37,7 +37,7 @@ public abstract class AbstractSender implements DataSender {
private Member destination;
private InetAddress address;
private int port;
-private int maxRetryAttempts = 1;//1 resends
+private int maxRetryAttempts = 1;// 1 resends
private int attempt;
private boolean tcpNoDelay = true;
private boolean soKeepAlive = false;
@@ -52,8 +52,9 @@ public abstract class AbstractSender implements DataSender {
/**
* transfers sender properties from one sender to another
+ *
* @param from AbstractSender
- * @param to AbstractSender
+ * @param to AbstractSender
*/
public static void transferProperties(AbstractSender from, AbstractSender
to) {
to.rxBufSize = from.rxBufSize;
@@ -87,19 +88,19 @@ public abstract class AbstractSender implements DataSender {
public boolean keepalive() {
boolean disconnect = false;
if (isUdpBased()) {
-disconnect = true; //always disconnect UDP, TODO optimize the
keepalive handling
-} else if ( keepAliveCount >= 0 && requestCount>keepAliveCount ) {
+disconnect = true; // always disconnect UDP, TODO optimize the
keepalive handling
+} else if (keepAliveCount >= 0 && requestCount > keepAliveCount) {
disconnect = true;
-} else if ( keepAliveTime >= 0 &&
(System.currentTimeMillis()-connectTime)>keepAliveTime ) {
+} else if (keepAliveTime >= 0 && (System.currentTimeMillis() -
connectTime) > keepAliveTime) {
disconnect = true;
}
-if ( disconnect ) {
+if (disconnect) {
disconnect();
}
return disconnect;
}
-protected void setConnected(boolean connected){
+protected void setConnected(boolean connected) {
this.connected = connected;
}
diff --git a/java/org/apache/catalina/tribes/transport/Constants.java
b/java/org/apache/catalina/tribes/transport/Constants.java
index 07946d826e..46983a493d 100644
--- a/java/org/apache/catalina/tribes/transport/Constants.java
+++ b/java/org/apache/catalina/tribes/transport/Constants.java
@@ -19,8 +19,8 @@ package org.apache.catalina.tribes.transport;
import org.apache.catalina.tribes.io.XByteBuffer;
/**
- * Manifest constants for the org.apache.catalina.tribes.transport
- * package.
+ * Manifest constants for the
org.apache.catalina.tribes.transport package.
+ *
* @author Peter Rossbach
*/
public
(tomcat) branch main 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 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 ada0a5ea1e Code clean-up - formatting. No functional change
ada0a5ea1e is described below
commit ada0a5ea1e18dd9cecddb914ecd441c2233886dc
Author: Mark Thomas
AuthorDate: Fri May 10 14:32:35 2024 +0100
Code clean-up - formatting. No functional change
---
java/org/apache/catalina/tribes/io/BufferPool.java | 21 +-
.../org/apache/catalina/tribes/io/ChannelData.java | 194 +++---
.../tribes/io/DirectByteArrayOutputStream.java | 4 +-
.../apache/catalina/tribes/io/ListenCallback.java | 19 +-
.../apache/catalina/tribes/io/ObjectReader.java| 52 ++--
.../catalina/tribes/io/ReplicationStream.java | 47 ++--
.../org/apache/catalina/tribes/io/XByteBuffer.java | 288 +++--
7 files changed, 318 insertions(+), 307 deletions(-)
diff --git a/java/org/apache/catalina/tribes/io/BufferPool.java
b/java/org/apache/catalina/tribes/io/BufferPool.java
index 29e8804f9b..7e4736ae36 100644
--- a/java/org/apache/catalina/tribes/io/BufferPool.java
+++ b/java/org/apache/catalina/tribes/io/BufferPool.java
@@ -27,8 +27,9 @@ import org.apache.juli.logging.LogFactory;
public class BufferPool {
private static final Log log = LogFactory.getLog(BufferPool.class);
-public static final int DEFAULT_POOL_SIZE =
-
Integer.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE",
100*1024*1024).intValue(); //100 MiB
+public static final int DEFAULT_POOL_SIZE = Integer
+
.getInteger("org.apache.catalina.tribes.io.BufferPool.DEFAULT_POOL_SIZE", 100 *
1024 * 1024).intValue(); // 100
+
// MiB
protected static final StringManager sm =
StringManager.getManager(BufferPool.class);
@@ -40,8 +41,7 @@ public class BufferPool {
if (instance == null) {
BufferPool pool = new BufferPool();
pool.setMaxSize(DEFAULT_POOL_SIZE);
-log.info(sm.getString("bufferPool.created",
-Integer.toString(DEFAULT_POOL_SIZE),
+log.info(sm.getString("bufferPool.created",
Integer.toString(DEFAULT_POOL_SIZE),
pool.getClass().getName()));
instance = pool;
}
@@ -55,12 +55,12 @@ public class BufferPool {
public XByteBuffer getBuffer(int minSize, boolean discard) {
XByteBuffer buffer = queue.poll();
-if ( buffer != null ) {
+if (buffer != null) {
size.addAndGet(-buffer.getCapacity());
}
-if ( buffer == null ) {
-buffer = new XByteBuffer(minSize,discard);
-} else if ( buffer.getCapacity() <= minSize ) {
+if (buffer == null) {
+buffer = new XByteBuffer(minSize, discard);
+} else if (buffer.getCapacity() <= minSize) {
buffer.expand(minSize);
}
buffer.setDiscard(discard);
@@ -69,7 +69,7 @@ public class BufferPool {
}
public void returnBuffer(XByteBuffer buffer) {
-if ( (size.get() + buffer.getCapacity()) <= maxSize ) {
+if ((size.get() + buffer.getCapacity()) <= maxSize) {
size.addAndGet(buffer.getCapacity());
queue.offer(buffer);
}
@@ -82,8 +82,7 @@ public class BufferPool {
protected int maxSize;
protected final AtomicInteger size = new AtomicInteger(0);
-protected final ConcurrentLinkedQueue queue =
-new ConcurrentLinkedQueue<>();
+protected final ConcurrentLinkedQueue queue = new
ConcurrentLinkedQueue<>();
public void setMaxSize(int bytes) {
this.maxSize = bytes;
diff --git a/java/org/apache/catalina/tribes/io/ChannelData.java
b/java/org/apache/catalina/tribes/io/ChannelData.java
index 8190f32798..9f94520dd6 100644
--- a/java/org/apache/catalina/tribes/io/ChannelData.java
+++ b/java/org/apache/catalina/tribes/io/ChannelData.java
@@ -26,10 +26,10 @@ import org.apache.catalina.tribes.membership.MemberImpl;
import org.apache.catalina.tribes.util.UUIDGenerator;
/**
- * The ChannelData object is used to transfer a message through
the
- * channel interceptor stack and eventually out on a transport to be sent
- * to another node. While the message is being processed by the different
+ * The ChannelData object is used to transfer a message through
the channel interceptor stack and
+ * eventually out on a transport to be sent to another node. While the message
is being processed by the different
* interceptors, the message data can be manipulated as each interceptor seems
appropriate.
+ *
* @author Peter Rossbach
*/
public class ChannelData implements ChannelMessage
(tomcat) branch main 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 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 99754a3941 Code clean-up. Formatting. No functional change.
99754a3941 is described below
commit 99754a3941769ff6b89fd530c63571ea1fba6641
Author: Mark Thomas
AuthorDate: Mon Jan 15 13:03:24 2024 +
Code clean-up. Formatting. No functional change.
---
.../catalina/ssi/ByteArrayServletOutputStream.java | 4 +-
.../apache/catalina/ssi/ExpressionParseTree.java | 75 +
.../apache/catalina/ssi/ExpressionTokenizer.java | 39 +++--
.../catalina/ssi/ResponseIncludeWrapper.java | 45 +++---
java/org/apache/catalina/ssi/SSICommand.java | 29 ++--
java/org/apache/catalina/ssi/SSIConditional.java | 25 ++-
.../apache/catalina/ssi/SSIConditionalState.java | 11 +-
java/org/apache/catalina/ssi/SSIConfig.java| 13 +-
java/org/apache/catalina/ssi/SSIEcho.java | 15 +-
java/org/apache/catalina/ssi/SSIExec.java | 13 +-
.../apache/catalina/ssi/SSIExternalResolver.java | 26 ++--
java/org/apache/catalina/ssi/SSIFilter.java| 42 ++---
java/org/apache/catalina/ssi/SSIFlastmod.java | 14 +-
java/org/apache/catalina/ssi/SSIFsize.java | 22 ++-
java/org/apache/catalina/ssi/SSIInclude.java | 18 +--
java/org/apache/catalina/ssi/SSIMediator.java | 78 --
java/org/apache/catalina/ssi/SSIPrintenv.java | 8 +-
java/org/apache/catalina/ssi/SSIProcessor.java | 111 ++---
java/org/apache/catalina/ssi/SSIServlet.java | 86 ---
.../catalina/ssi/SSIServletExternalResolver.java | 171 +
.../apache/catalina/ssi/SSIServletRequestUtil.java | 18 +--
java/org/apache/catalina/ssi/SSISet.java | 13 +-
.../catalina/ssi/SSIStopProcessingException.java | 5 +-
23 files changed, 375 insertions(+), 506 deletions(-)
diff --git a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
index 4f1f8d7039..aa713db084 100644
--- a/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
+++ b/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
@@ -23,10 +23,10 @@ import jakarta.servlet.WriteListener;
/**
- * Class that extends ServletOutputStream, used as a wrapper from within
- * SsiInclude
+ * Class that extends ServletOutputStream, used as a wrapper from within
SsiInclude
*
* @author Bip Thelin
+ *
* @see ServletOutputStream and ByteArrayOutputStream
*/
public class ByteArrayServletOutputStream extends ServletOutputStream {
diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index ce535d268e..af181050e3 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -26,6 +26,7 @@ import java.util.regex.PatternSyntaxException;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
+
/**
* Represents a parsed expression.
*
@@ -34,13 +35,13 @@ import org.apache.tomcat.util.res.StringManager;
public class ExpressionParseTree {
private static final StringManager sm =
StringManager.getManager(ExpressionParseTree.class);
/**
- * Contains the current set of completed nodes. This is a workspace for the
- * parser. Needs to be LinkedList since it can contain {@code null}s.
+ * Contains the current set of completed nodes. This is a workspace for
the parser. Needs to be LinkedList since it
+ * can contain {@code null}s.
*/
private final LinkedList nodeStack = new LinkedList<>();
/**
- * Contains operator nodes that don't yet have values. This is a workspace
- * for the parser. Needs to be LinkedList since it can contain {@code
null}s.
+ * Contains operator nodes that don't yet have values. This is a workspace
for the parser. Needs to be LinkedList
+ * since it can contain {@code null}s.
*/
private final LinkedList oppStack = new LinkedList<>();
/**
@@ -55,20 +56,20 @@ public class ExpressionParseTree {
/**
* Creates a new parse tree for the specified expression.
- * @param expr The expression string
+ *
+ * @param exprThe expression string
* @param ssiMediator Used to evaluated the expressions
+ *
* @throws ParseException a parsing error occurred
*/
-public ExpressionParseTree(String expr, SSIMediator ssiMediator)
-throws ParseException {
+public ExpressionParseTree(String expr, SSIMediator ssiMediator) throws
ParseException {
this.ssiMediator = ssiMediator;
parseExpression(expr);
}
/**
- * Evaluates the tree and returns true or false. The specified
[tomcat] branch main 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 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 7094596844 Code-clean-up - formatting. No functional change.
7094596844 is described below
commit 70945968440bc5163f0e4db737cea59412722923
Author: Mark Thomas
AuthorDate: Tue Aug 8 13:43:32 2023 +0100
Code-clean-up - formatting. No functional change.
Files missed when package was re-formatted
---
java/org/apache/catalina/ha/CatalinaCluster.java | 16 +-
.../apache/catalina/ha/tcp/SendMessageData.java| 15 +-
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 170 ++---
3 files changed, 99 insertions(+), 102 deletions(-)
diff --git a/java/org/apache/catalina/ha/CatalinaCluster.java
b/java/org/apache/catalina/ha/CatalinaCluster.java
index 7246d586d9..af53bbaca0 100644
--- a/java/org/apache/catalina/ha/CatalinaCluster.java
+++ b/java/org/apache/catalina/ha/CatalinaCluster.java
@@ -26,14 +26,14 @@ import org.apache.catalina.tribes.Member;
/**
- * A CatalinaCluster interface allows to plug in and out the
- * different cluster implementations
+ * A CatalinaCluster interface allows to plug in and out the different
cluster implementations
*/
public interface CatalinaCluster extends Cluster {
// - Instance Variables
/**
* Sends a message to all the members in the cluster
+ *
* @param msg ClusterMessage
*/
void send(ClusterMessage msg);
@@ -41,7 +41,7 @@ public interface CatalinaCluster extends Cluster {
/**
* Sends a message to a specific member in the cluster.
*
- * @param msg ClusterMessage
+ * @param msg ClusterMessage
* @param dest Member
*/
void send(ClusterMessage msg, Member dest);
@@ -49,8 +49,8 @@ public interface CatalinaCluster extends Cluster {
/**
* Sends a message with the specified sendOptions to a specific member in
the cluster.
*
- * @param msg ClusterMessage
- * @param dest Member
+ * @param msg ClusterMessage
+ * @param destMember
* @param sendOptions sendOptions
*/
void send(ClusterMessage msg, Member dest, int sendOptions);
@@ -87,15 +87,19 @@ public interface CatalinaCluster extends Cluster {
/**
* Get Manager
+ *
* @param name The manager name
+ *
* @return The manager
*/
Manager getManager(String name);
/**
* Get a new cluster name for a manager.
- * @param name Override name (optional)
+ *
+ * @param nameOverride name (optional)
* @param manager The manager
+ *
* @return the manager name in the cluster
*/
String getManagerName(String name, Manager manager);
diff --git a/java/org/apache/catalina/ha/tcp/SendMessageData.java
b/java/org/apache/catalina/ha/tcp/SendMessageData.java
index 5f1fc12c30..12e3a54429 100644
--- a/java/org/apache/catalina/ha/tcp/SendMessageData.java
+++ b/java/org/apache/catalina/ha/tcp/SendMessageData.java
@@ -23,18 +23,17 @@ import org.apache.catalina.tribes.Member;
*/
public class SendMessageData {
-private Object message ;
-private Member destination ;
-private Exception exception ;
+private Object message;
+private Member destination;
+private Exception exception;
/**
- * @param message The message to send
+ * @param message The message to send
* @param destination Member destination
- * @param exception Associated error
+ * @param exception Associated error
*/
-public SendMessageData(Object message, Member destination,
-Exception exception) {
+public SendMessageData(Object message, Member destination, Exception
exception) {
super();
this.message = message;
this.destination = destination;
@@ -47,12 +46,14 @@ public class SendMessageData {
public Member getDestination() {
return destination;
}
+
/**
* @return the exception.
*/
public Exception getException() {
return exception;
}
+
/**
* @return the message.
*/
diff --git a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
index 3f01ebf0eb..a970df0d7e 100644
--- a/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
+++ b/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
@@ -58,17 +58,14 @@ import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
- * A Cluster implementation using simple multicast. Responsible for
- * setting up a cluster and provides callers with a valid multicast
- * receiver/sender.
- *
- * FIXME wrote testcases
+ * A Cluster implementation using simple multicast. Responsible for
setting up a cluster and
[tomcat] branch main 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 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 83388f896a Code clean-up - formatting. No functional change.
83388f896a is described below
commit 83388f896aede1e54d77190638059a19474d6f70
Author: Mark Thomas
AuthorDate: Tue Jul 4 12:31:06 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 | 8 ++---
.../catalina/filters/CsrfPreventionFilterBase.java | 4 +--
.../org/apache/catalina/filters/ExpiresFilter.java | 34 +-
.../catalina/filters/HttpHeaderSecurityFilter.java | 4 ++-
.../apache/catalina/filters/RateLimitFilter.java | 4 +--
.../apache/catalina/filters/RemoteIpFilter.java| 22 +++---
.../catalina/filters/RestCsrfPreventionFilter.java | 15 +-
9 files changed, 58 insertions(+), 48 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 74314ba6b8..2760635f04 100644
--- a/java/org/apache/catalina/filters/CorsFilter.java
+++ b/java/org/apache/catalina/filters/CorsFilter.java
@@ -276,8 +276,8 @@ public class CorsFilter extends GenericFilter {
}
// 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(",");
@@ -563,8 +563,8 @@ public class CorsFilter extends GenericFilter {
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 &&
@@ -894,8 +894,8 @@ public class CorsFilter extends GenericFilter {
/**
* 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 28769a0b59..d33fdb8d08 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;
}
@@ -343,14 +343,14 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
//
[tomcat] branch main 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 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 9033e8fd1e Code clean-up - formatting. No functional change.
9033e8fd1e is described below
commit 9033e8fd1e5d6bdd441158f67a34a3554a4f05df
Author: Mark Thomas
AuthorDate: Thu Jun 1 19:44:20 2023 +0100
Code clean-up - formatting. No functional change.
---
.../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| 38 +++---
.../apache/catalina/connector/RequestFacade.java | 4 +--
java/org/apache/catalina/connector/Response.java | 4 +--
.../apache/catalina/connector/ResponseFacade.java | 4 +--
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 7443b2cb6a..5ae62570a3 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -917,8 +917,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 5aacb0663a..58c3f8e103 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -65,7 +65,7 @@ public class InputBuffer extends Reader implements
ByteChunk.ByteInputChannel, A
/**
* Encoder cache.
*/
-private static final Map>
encoders = new ConcurrentHashMap<>();
+private static final Map> encoders
= new ConcurrentHashMap<>();
// - Instance Variables
diff --git a/java/org/apache/catalina/connector/OutputBuffer.java
b/java/org/apache/catalina/connector/OutputBuffer.java
index 42e0ab8d7f..8b0a809182 100644
--- a/java/org/apache/catalina/connector/OutputBuffer.java
+++ b/java/org/apache/catalina/connector/OutputBuffer.java
@@ -51,7 +51,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 905af9cacb..312b3f4e81 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -195,7 +195,7 @@ public class Request implements HttpServletRequest {
/**
* The attributes associated with this Request, keyed by attribute name.
*/
-private final Map attributes = new ConcurrentHashMap<>();
+private final Map attributes = new ConcurrentHashMap<>();
/**
@@ -214,7 +214,7 @@ public class Request implements HttpServletRequest {
/**
* Internal notes associated with this request by Catalina components and
event listeners.
*/
-private final transient HashMap notes = new HashMap<>();
+private final transient HashMap notes = new HashMap<>();
/**
@@ -305,7 +305,7 @@ public class Request implements HttpServletRequest {
/**
* Hash map used in the getParametersMap method.
*/
-protected ParameterMap parameterMap = new
ParameterMap<>();
+protected ParameterMap parameterMap = new
ParameterMap<>();
/**
@@ -1091,7 +1091,7 @@ public class Request implements HttpServletRequest {
* @return A Map containing parameter names as keys and
parameter values as map values.
*/
@Override
-public Map getParameterMap() {
+public Map getParameterMap() {
if (parameterMap.isLocked()) {
return parameterMap;
@@ -1522,8 +1522,8 @@ public class Request implements HttpServletRequest {
if ((listeners == null) || (listeners.length == 0)) {
return;
}
-ServletRequestAttributeEvent event = new
ServletRequestAttributeEvent(context.getServletContext(), getRequest(),
-name, value);
+ServletRequestAttributeEvent event =
+new ServletRequestAttributeEvent(context.getServletContext(),
getRequest(), name, value);
for (Object o : listeners) {
if (!(o instanceof
[tomcat] branch main 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 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 63461b3bed Code clean-up. Formatting. No functional change.
63461b3bed is described below
commit 63461b3bed4d837d435afe4b72f05a370fd83f44
Author: Mark Thomas
AuthorDate: Tue May 23 11:23:09 2023 +0100
Code clean-up. Formatting. No functional change.
---
.../catalina/authenticator/AuthenticatorBase.java | 12 +--
.../authenticator/DigestAuthenticator.java | 25 ++---
.../catalina/authenticator/SavedRequest.java | 2 +-
.../catalina/authenticator/SingleSignOn.java | 2 +-
.../catalina/authenticator/SingleSignOnEntry.java | 6 +-
.../jaspic/AuthConfigFactoryImpl.java | 107 +
.../authenticator/jaspic/CallbackHandlerImpl.java | 11 +--
.../authenticator/jaspic/MessageInfoImpl.java | 10 +-
.../jaspic/PersistentProviderRegistrations.java| 34 ---
.../jaspic/SimpleAuthConfigProvider.java | 18 ++--
.../jaspic/SimpleServerAuthConfig.java | 17 ++--
.../jaspic/SimpleServerAuthContext.java| 14 ++-
12 files changed, 118 insertions(+), 140 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index e53ffc7297..352f984c79 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -612,8 +612,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
String originHeader =
request.getHeader(CorsFilter.REQUEST_HEADER_ORIGIN);
if (originHeader != null && !originHeader.isEmpty() &&
RequestUtil.isValidOrigin(originHeader) &&
!RequestUtil.isSameOrigin(request, originHeader)) {
-String accessControlRequestMethodHeader = request
-
.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
+String accessControlRequestMethodHeader =
+
request.getHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD);
if (accessControlRequestMethodHeader != null &&
!accessControlRequestMethodHeader.isEmpty()) {
// This appears to be a CORS Preflight request
if (allowCorsPreflight == AllowCorsPreflight.ALWAYS) {
@@ -699,8 +699,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
try {
CallbackHandler callbackHandler = getCallbackHandler();
-ServerAuthConfig serverAuthConfig =
jaspicProvider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-callbackHandler);
+ServerAuthConfig serverAuthConfig =
+jaspicProvider.getServerAuthConfig("HttpServlet",
jaspicAppContextID, callbackHandler);
String authContextID =
serverAuthConfig.getAuthContextID(jaspicState.messageInfo);
jaspicState.serverAuthContext =
serverAuthConfig.getAuthContext(authContextID, null, null);
} catch (AuthException e) {
@@ -1171,8 +1171,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (client != null) {
ServerAuthContext serverAuthContext;
try {
-ServerAuthConfig serverAuthConfig =
provider.getServerAuthConfig("HttpServlet", jaspicAppContextID,
-getCallbackHandler());
+ServerAuthConfig serverAuthConfig =
+provider.getServerAuthConfig("HttpServlet",
jaspicAppContextID, getCallbackHandler());
String authContextID =
serverAuthConfig.getAuthContextID(messageInfo);
serverAuthContext =
serverAuthConfig.getAuthContext(authContextID, null, null);
serverAuthContext.cleanSubject(messageInfo, client);
diff --git a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
index 065efce308..399ffa8da4 100644
--- a/java/org/apache/catalina/authenticator/DigestAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/DigestAuthenticator.java
@@ -68,7 +68,7 @@ public class DigestAuthenticator extends AuthenticatorBase {
private static final String NONCE_DIGEST = "SHA-256";
// List permitted algorithms and maps them to Java standard names
-private static final Map PERMITTED_ALGORITHMS = new
HashMap<>();
+private static final Map PERMITTED_ALGORITHMS = new
HashMap<>();
static {
// Allows the digester to be configured with either the Standard Java
name or the
[tomcat] branch main 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 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 612e2cd302 Code clean-up - formatting. No functional change.
612e2cd302 is described below
commit 612e2cd302e73340d2b2d85c21cdb5a67d3c9cca
Author: Mark Thomas
AuthorDate: Wed May 10 17:04:27 2023 +0100
Code clean-up - formatting. No functional change.
Main purpose is to trigger CI build to test building with Java 21
---
java/org/apache/catalina/ant/jmx/Arg.java | 8 +-
.../catalina/ant/jmx/JMXAccessorCondition.java | 40 +++--
.../catalina/ant/jmx/JMXAccessorConditionBase.java | 36 +++--
.../catalina/ant/jmx/JMXAccessorCreateTask.java| 49 +++---
.../ant/jmx/JMXAccessorEqualsCondition.java| 9 +-
.../catalina/ant/jmx/JMXAccessorGetTask.java | 26 ++--
.../catalina/ant/jmx/JMXAccessorInvokeTask.java| 67
.../catalina/ant/jmx/JMXAccessorQueryTask.java | 25 +--
.../catalina/ant/jmx/JMXAccessorSetTask.java | 44 +++---
.../apache/catalina/ant/jmx/JMXAccessorTask.java | 173 +
.../ant/jmx/JMXAccessorUnregisterTask.java | 28 ++--
11 files changed, 251 insertions(+), 254 deletions(-)
diff --git a/java/org/apache/catalina/ant/jmx/Arg.java
b/java/org/apache/catalina/ant/jmx/Arg.java
index dc47302f3a..ba9059cae8 100644
--- a/java/org/apache/catalina/ant/jmx/Arg.java
+++ b/java/org/apache/catalina/ant/jmx/Arg.java
@@ -21,12 +21,12 @@ public class Arg {
private String type;
private String value;
-public void setType( String type) {
-this.type=type;
+public void setType(String type) {
+this.type = type;
}
-public void setValue( String value ) {
-this.value=value;
+public void setValue(String value) {
+this.value = value;
}
public String getValue() {
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index 37e2e6a762..9fe020b2ac 100644
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -20,6 +20,7 @@ import org.apache.tools.ant.BuildException;
/**
* Definition:
+ *
*
* path id="catalina_ant"
* fileset dir="${catalina.home}/server/lib"
@@ -38,6 +39,7 @@ import org.apache.tools.ant.BuildException;
*
*
* Usage: Wait for start backup node
+ *
*
* target name="wait"
* jmxOpen
@@ -61,28 +63,30 @@ import org.apache.tools.ant.BuildException;
* fail if="server.timeout" message="Server ${url} don't answer
inside ${maxwait} sec" /
* echo message="Server ${url} alive" /
* /target
- *
*
+ *
* Allowed operation between jmx attribute and reference value:
*
- * == equals
- * != not equals
+ * == equals
+ * != not equals
* greater than (gt;)
* = greater than or equals (gt;=)
* lesser than (lt;)
* = lesser than or equals (lt;=)
*
- * NOTE: For numeric expressions the type must be set and use xml
entities as operations.
+ * NOTE: For numeric expressions the type must be set and use xml
entities as operations.
* As type we currently support long and double.
+ *
* @author Peter Rossbach
+ *
* @since 5.5.10
*/
public class JMXAccessorCondition extends JMXAccessorConditionBase {
// - Instance Variables
-private String operation = "==" ;
-private String type = "long" ;
+private String operation = "==";
+private String type = "long";
private String unlessCondition;
private String ifCondition;
@@ -95,6 +99,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getOperation() {
return operation;
}
+
/**
* @param operation The operation to set.
*/
@@ -108,6 +113,7 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getType() {
return type;
}
+
/**
* @param type The type to set.
*/
@@ -121,23 +127,26 @@ public class JMXAccessorCondition extends
JMXAccessorConditionBase {
public String getIf() {
return ifCondition;
}
+
/**
* Only execute if a property of the given name exists in the current
project.
+ *
* @param c property name
*/
public void setIf(String c) {
ifCondition = c;
}
- /**
+/**
* @return Returns the unlessCondition.
*/
public String getUnless() {
return unlessCondition;
}
+
/**
- * Only execute if a property of the given name does not
- * exist in the current project.
+ * Only execute if a property of the given name does not exist in the
current project.
+ *
* @param c property name
[tomcat] branch main 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 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 1f509bca8c Code clean-up. Formatting. No functional change.
1f509bca8c is described below
commit 1f509bca8c769108c382cce5aab972d6d2d05c0b
Author: Mark Thomas
AuthorDate: Wed Mar 15 14:09:36 2023 +
Code clean-up. Formatting. No functional change.
---
.../catalina/tribes/demos/ChannelCreator.java | 88 +++---
.../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, 581 insertions(+), 608 deletions(-)
diff --git a/test/org/apache/catalina/tribes/demos/ChannelCreator.java
b/test/org/apache/catalina/tribes/demos/ChannelCreator.java
index 43cebc05ab..472cd6fe47 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 main 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 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 6364efcb63 Code clean-up. Formatting. No functional change.
6364efcb63 is described below
commit 6364efcb635f46279c1fb40fcdf03f5a0011aed6
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:27:34 2023 +
Code clean-up. Formatting. No functional change.
---
.../websocket/pojo/TestEncodingDecoding.java | 128 ++---
.../websocket/pojo/TestPojoEndpointBase.java | 11 +-
.../websocket/pojo/TestPojoMethodMapping.java | 23 ++--
.../apache/tomcat/websocket/pojo/TesterUtil.java | 3 +-
4 files changed, 77 insertions(+), 88 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index b3166be31a..597b240e34 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -74,7 +74,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@Test
-public void testProgrammaticEndPoints() throws Exception{
+public void testProgrammaticEndPoints() throws Exception {
Tomcat tomcat = getTomcatInstance();
// No file system docBase required
Context ctx = tomcat.addContext("", null);
@@ -96,8 +96,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
// Should not take very long
int i = 0;
while (i < WAIT_LOOPS) {
-if (MsgStringMessageHandler.received.size() > 0 &&
-client.received.size() > 0) {
+if (MsgStringMessageHandler.received.size() > 0 &&
client.received.size() > 0) {
break;
}
i++;
@@ -109,10 +108,8 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Assert.assertEquals(1, client.received.size());
// Check correct messages were received
-Assert.assertEquals(MESSAGE_ONE,
-((MsgString)
MsgStringMessageHandler.received.peek()).getData());
-Assert.assertEquals(MESSAGE_ONE,
-new String(((MsgByte) client.received.peek()).getData()));
+Assert.assertEquals(MESSAGE_ONE, ((MsgString)
MsgStringMessageHandler.received.peek()).getData());
+Assert.assertEquals(MESSAGE_ONE, new String(((MsgByte)
client.received.peek()).getData()));
session.close();
}
@@ -131,8 +128,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new DefaultServlet());
ctx.addServletMappingDecoded("/", "default");
-WebSocketContainer wsContainer =
-ContainerProvider.getWebSocketContainer();
+WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
tomcat.start();
@@ -159,21 +155,19 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Assert.assertEquals(1, client.received.size());
// Check correct messages were received
-Assert.assertEquals(MESSAGE_ONE,
-((MsgString) server.received.peek()).getData());
-Assert.assertEquals(MESSAGE_ONE,
-((MsgString) client.received.peek()).getData());
+Assert.assertEquals(MESSAGE_ONE, ((MsgString)
server.received.peek()).getData());
+Assert.assertEquals(MESSAGE_ONE, ((MsgString)
client.received.peek()).getData());
session.close();
// Should not take very long but some failures have been seen
-i = testEvent(MsgStringEncoder.class.getName()+":init", 0);
-i = testEvent(MsgStringDecoder.class.getName()+":init", i);
-i = testEvent(MsgByteEncoder.class.getName()+":init", i);
-i = testEvent(MsgByteDecoder.class.getName()+":init", i);
-i = testEvent(MsgStringEncoder.class.getName()+":destroy", i);
-i = testEvent(MsgStringDecoder.class.getName()+":destroy", i);
-i = testEvent(MsgByteEncoder.class.getName()+":destroy", i);
-i = testEvent(MsgByteDecoder.class.getName()+":destroy", i);
+i = testEvent(MsgStringEncoder.class.getName() + ":init", 0);
+i = testEvent(MsgStringDecoder.class.getName() + ":init", i);
+i = testEvent(MsgByteEncoder.class.getName() + ":init", i);
+i = testEvent(MsgByteDecoder.class.getName() + ":init", i);
+i = testEvent(MsgStringEncoder.class.getName() + ":destroy", i);
+i = testEvent(MsgStringDecoder.class.getName() + ":destroy", i);
+i = testEvent(MsgByteEncoder.class.getName() + ":destroy", i);
+i = testEvent(MsgByteDecoder.class.getName() + ":destroy", i);
}
@@ -191,8 +185,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
Tomcat.addServlet(ctx, "default", new
[tomcat] branch main 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 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 a7d4c7b336 Code clean-up. Formatting. No functional change.
a7d4c7b336 is described below
commit a7d4c7b3360bebbdd39ebbe152eddeeb62d2a92c
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:27:07 2023 +
Code clean-up. Formatting. No functional change.
---
.../apache/tomcat/websocket/server/Constants.java | 9 +-
.../server/DefaultServerEndpointConfigurator.java | 17 +--
.../tomcat/websocket/server/UpgradeUtil.java | 130 +++--
.../tomcat/websocket/server/UriTemplate.java | 26 ++--
.../tomcat/websocket/server/WsContextListener.java | 10 +-
.../apache/tomcat/websocket/server/WsFilter.java | 13 +-
.../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 | 156 -
.../tomcat/websocket/server/WsSessionListener.java | 2 +-
.../tomcat/websocket/server/WsWriteTimeout.java| 18 +--
.../tomcat/websocket/server/package-info.java | 4 +-
17 files changed, 250 insertions(+), 393 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index d30c880af0..5aa99bbb5e 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -21,13 +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";
+public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
"jakarta.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 50252f61c1..24ed9e5c0f 100644
---
a/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
+++
b/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
@@ -26,13 +26,11 @@ import jakarta.websocket.HandshakeResponse;
import jakarta.websocket.server.HandshakeRequest;
import jakarta.websocket.server.ServerEndpointConfig;
-@aQute.bnd.annotation.spi.ServiceProvider(value=ServerEndpointConfig.Configurator.class)
-public class DefaultServerEndpointConfigurator
-extends ServerEndpointConfig.Configurator {
+@aQute.bnd.annotation.spi.ServiceProvider(value =
ServerEndpointConfig.Configurator.class)
+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) {
@@ -46,8 +44,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)) {
@@ -59,8 +56,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());
@@ -81,8 +77,7 @@ public class DefaultServerEndpointConfigurator
}
@Override
-public void modifyHandshake(ServerEndpointConfig sec,
-
[tomcat] branch main 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 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 95487f9312 Code clean-up. Formatting. No functional change.
95487f9312 is described below
commit 95487f93128ebc68953416e1a23c47fa61be0212
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:27:43 2023 +
Code clean-up. Formatting. No functional change.
---
.../tomcat/websocket/server/TestAsyncMessages.java | 21 +++---
.../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 ++---
11 files changed, 98 insertions(+), 140 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
b/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
index e9a5893781..ed47f05af3 100644
--- a/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
+++ b/test/org/apache/tomcat/websocket/server/TestAsyncMessages.java
@@ -54,9 +54,7 @@ public class TestAsyncMessages extends TomcatBaseTest {
WebSocketContainer wsContainer =
ContainerProvider.getWebSocketContainer();
ClientEndpointConfig clientEndpointConfig =
ClientEndpointConfig.Builder.create().build();
-Session wsSession = wsContainer.connectToServer(
-TesterProgrammaticEndpoint.class,
-clientEndpointConfig,
+Session wsSession =
wsContainer.connectToServer(TesterProgrammaticEndpoint.class,
clientEndpointConfig,
new URI("ws://localhost:" + getPort() +
TesterAsyncTiming.Config.PATH));
AsyncTimingClientHandler handler = new AsyncTimingClientHandler();
@@ -80,7 +78,7 @@ public class TestAsyncMessages extends TomcatBaseTest {
public void onMessage(ByteBuffer message, boolean last) {
if (lastMessage == 0) {
// First message. Don't check
-sequence ++;
+sequence++;
lastMessage = System.nanoTime();
} else {
long newTime = System.nanoTime();
@@ -88,9 +86,10 @@ public class TestAsyncMessages extends TomcatBaseTest {
lastMessage = newTime;
if (sequence == 0) {
-sequence ++;
+sequence++;
if (message.capacity() != 8192) {
-System.out.println("Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
+System.out.println(
+"Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
fail = true;
}
if (diff < 4000) {
@@ -98,9 +97,10 @@ public class TestAsyncMessages extends TomcatBaseTest {
fail = true;
}
} else if (sequence == 1) {
-sequence ++;
+sequence++;
if (message.capacity() != 8192) {
-System.out.println("Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
+System.out.println(
+"Expected size 8192 but was [" +
message.capacity() + "], count [" + count + "]");
fail = true;
}
if (diff > 50) {
@@ -110,7 +110,8 @@ public class TestAsyncMessages extends TomcatBaseTest {
} else if (sequence == 2) {
sequence = 0;
if (message.capacity() != 4096) {
-System.out.println("Expected size 4096 but was [" +
message.capacity() + "], count [" + count + "]");
+System.out.println(
+"Expected size 4096 but was [" +
message.capacity() + "], count [" + count + "]");
fail = true;
}
if (diff > 50) {
@@ -120,7 +121,7 @@ public class TestAsyncMessages extends TomcatBaseTest {
}
}
-count ++;
+count++;
if (count >= TesterAsyncTiming.Config.ITERATIONS * 3) {
latch.countDown();
}
diff --git
[tomcat] branch main 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 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 597dcea653 Code clean-up. Formatting. No functional change.
597dcea653 is described below
commit 597dcea65324b44c5bcd9cbb0971fbc640b47805
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:27:25 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 | 41 +++
.../websocket/TestWebSocketFrameClientSSL.java | 54 -
test/org/apache/tomcat/websocket/TestWsFrame.java | 6 +-
.../tomcat/websocket/TestWsPingPongMessages.java | 19 ++-
.../tomcat/websocket/TestWsRemoteEndpoint.java | 18 +--
.../websocket/TestWsSessionSuspendResume.java | 6 +-
.../tomcat/websocket/TestWsSubprotocols.java | 28 ++---
.../tomcat/websocket/TestWsWebSocketContainer.java | 134 -
.../TestWsWebSocketContainerGetOpenSessions.java | 23 ++--
.../websocket/TestWsWebSocketContainerSSL.java | 24 ++--
...WsWebSocketContainerSessionExpiryContainer.java | 19 ++-
...stWsWebSocketContainerSessionExpirySession.java | 16 +--
.../TestWsWebSocketContainerTimeoutClient.java | 16 +--
.../TestWsWebSocketContainerTimeoutServer.java | 38 +++---
.../TestWsWebSocketContainerWithProxy.java | 2 +-
.../apache/tomcat/websocket/TesterAsyncTiming.java | 4 +-
.../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 +-
27 files changed, 244 insertions(+), 396 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/TestConnectionLimit.java
b/test/org/apache/tomcat/websocket/TestConnectionLimit.java
index 80b4045bda..2408f1a3e5 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 0c6a17ed20..fd62f976a6 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 = perMessageDeflateRx.getMoreData(
-compressedPart.getOpCode(), compressedPart.isFin(),
compressedPart.getRsv(), received);
+TransformationResult tr =
perMessageDeflateRx.getMoreData(compressedPart.getOpCode(),
compressedPart.isFin(),
+compressedPart.getRsv(), received);
Assert.assertEquals(8192, received.position());
-Assert.assertEquals(TransformationResult.END_OF_FRAME , tr);
+Assert.assertEquals(TransformationResult.END_OF_FRAME, tr);
}
/*
- * Minimal implementation to enable other transformations to be tested. It
- * is NOT robust.
+ * Minimal implementation to enable other transformations to be tested. It
is NOT robust.
*/
private static class
[tomcat] branch main 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 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 33c6a2edc1 Code clean-up. Formatting. No functional change.
33c6a2edc1 is described below
commit 33c6a2edc1f7f23206c2cd20af1ce90a677dc835
Author: Mark Thomas
AuthorDate: Wed Mar 8 18:26:52 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 | 10 +-
.../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 | 318 -
.../tomcat/websocket/pojo/PojoPathParam.java | 12 +-
.../apache/tomcat/websocket/pojo/package-info.java | 4 +-
15 files changed, 216 insertions(+), 329 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 98e45cc0e1..8067b72325 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
