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 <[email protected]>
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<String, Cache> formatCache = new HashMap<>();
+ private final Map<String,Cache> 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<DateFormatCache> localDateCache =
ThreadLocal
- .withInitial(() -> new DateFormatCache(localCacheSize,
Locale.getDefault(), globalDateCache));
+ private static final ThreadLocal<DateFormatCache> 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<String, String> clientIdSessionId = new
ConcurrentHashMap<>();
- private final Map<String, String> sessionIdClientId = new
ConcurrentHashMap<>();
+ private final Map<String,String> clientIdSessionId = new
ConcurrentHashMap<>();
+ private final Map<String,String> 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<String, String> getClientIpSessionId() {
+ public Map<String,String> getClientIpSessionId() {
return clientIdSessionId;
}
@@ -272,10 +272,10 @@ public class CrawlerSessionManagerValve extends ValveBase
{
private static class CrawlerHttpSessionBindingListener implements
HttpSessionBindingListener, Serializable {
private static final long serialVersionUID = 1L;
- private final transient Map<String, String> clientIdSessionId;
+ private final transient Map<String,String> clientIdSessionId;
private final transient String clientIdentifier;
- private CrawlerHttpSessionBindingListener(Map<String, String>
clientIdSessionId, String clientIdentifier) {
+ private CrawlerHttpSessionBindingListener(Map<String,String>
clientIdSessionId, String clientIdentifier) {
this.clientIdSessionId = clientIdSessionId;
this.clientIdentifier = clientIdentifier;
}
diff --git a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
index 0b7a6fe5bd..166275a6a3 100644
--- a/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
+++ b/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
@@ -171,8 +171,8 @@ public class ExtendedAccessLogValve extends AccessLogValve {
// Milli-seconds in 24 hours
private static final long INTERVAL = (1000 * 60 * 60 * 24);
- private static final ThreadLocal<ElementTimestampStruct> currentDate =
ThreadLocal
- .withInitial(() -> new ElementTimestampStruct("yyyy-MM-dd"));
+ private static final ThreadLocal<ElementTimestampStruct> currentDate =
+ ThreadLocal.withInitial(() -> new
ElementTimestampStruct("yyyy-MM-dd"));
@Override
public void addElement(CharArrayWriter buf, Date date, Request
request, Response response, long time) {
@@ -190,8 +190,8 @@ public class ExtendedAccessLogValve extends AccessLogValve {
// Milli-seconds in a second
private static final long INTERVAL = 1000;
- private static final ThreadLocal<ElementTimestampStruct> currentTime =
ThreadLocal
- .withInitial(() -> new ElementTimestampStruct("HH:mm:ss"));
+ private static final ThreadLocal<ElementTimestampStruct> currentTime =
+ ThreadLocal.withInitial(() -> new
ElementTimestampStruct("HH:mm:ss"));
@Override
public void addElement(CharArrayWriter buf, Date date, Request
request, Response response, long time) {
@@ -542,7 +542,7 @@ public class ExtendedAccessLogValve extends AccessLogValve {
if ("ns".equals(nextToken)) {
return new
ElapsedTimeElement(ElapsedTimeElement.Style.NANOSECONDS);
- } else if("us".equals(nextToken)) {
+ } else if ("us".equals(nextToken)) {
return new
ElapsedTimeElement(ElapsedTimeElement.Style.MICROSECONDS);
} else if ("ms".equals(nextToken)) {
return new
ElapsedTimeElement(ElapsedTimeElement.Style.MILLISECONDS);
diff --git a/java/org/apache/catalina/valves/FilterValve.java
b/java/org/apache/catalina/valves/FilterValve.java
index 031ab52887..bf6d2cabee 100644
--- a/java/org/apache/catalina/valves/FilterValve.java
+++ b/java/org/apache/catalina/valves/FilterValve.java
@@ -134,7 +134,7 @@ public class FilterValve extends ValveBase implements
FilterConfig {
/**
* @return the ServletContext. Note that this will be of limited use if
the Valve/Filter is not attached to a
- * <code><Context></code>.
+ * <code><Context></code>.
*/
@Override
public ServletContext getServletContext() {
@@ -186,7 +186,8 @@ public class FilterValve extends ValveBase implements
FilterConfig {
ScheduledThreadPoolExecutor.class.getName().equals(args[0])) {
return executor;
} else {
- throw new
UnsupportedOperationException(sm.getString("filterValve.proxyServletContext"));
+ throw new UnsupportedOperationException(
+
sm.getString("filterValve.proxyServletContext"));
}
}
});
diff --git a/java/org/apache/catalina/valves/JsonAccessLogValve.java
b/java/org/apache/catalina/valves/JsonAccessLogValve.java
index 61ca3d00da..7777d94770 100644
--- a/java/org/apache/catalina/valves/JsonAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JsonAccessLogValve.java
@@ -32,7 +32,9 @@ import org.apache.tomcat.util.json.JSONFilter;
/**
* Access log valve derivative that rewrites entries as JSON.
- * <b>Important note: the attribute names are not final</b>
+ * <p>
+ * <b>Important note: the attribute names are not final.</b>
+ * <p>
* Patterns are mapped to attributes as followed:
* <ul>
* <li>a: remoteAddr</li>
@@ -66,14 +68,13 @@ import org.apache.tomcat.util.json.JSONFilter;
* <li>%{xxx}r: requestAttributes</li>
* <li>%{xxx}s: sessionAttributes</li>
* </ul>
- * The attribute list is based on
- *
https://github.com/fluent/fluentd/blob/master/lib/fluent/plugin/parser_apache2.rb#L72
+ * The attribute list is based on
https://github.com/fluent/fluentd/blob/master/lib/fluent/plugin/parser_apache2.rb#L72
*/
public class JsonAccessLogValve extends AccessLogValve {
- private static final Map<Character, String> PATTERNS;
+ private static final Map<Character,String> PATTERNS;
static {
- Map<Character, String> pattern2AttributeName = new HashMap<>();
+ Map<Character,String> pattern2AttributeName = new HashMap<>();
pattern2AttributeName.put(Character.valueOf('a'), "remoteAddr");
pattern2AttributeName.put(Character.valueOf('A'), "localAddr");
pattern2AttributeName.put(Character.valueOf('b'), "size");
@@ -99,9 +100,9 @@ public class JsonAccessLogValve extends AccessLogValve {
PATTERNS = Collections.unmodifiableMap(pattern2AttributeName);
}
- private static final Map<Character, String> SUB_OBJECT_PATTERNS;
+ private static final Map<Character,String> SUB_OBJECT_PATTERNS;
static {
- Map<Character, String> pattern2AttributeName = new HashMap<>();
+ Map<Character,String> pattern2AttributeName = new HashMap<>();
pattern2AttributeName.put(Character.valueOf('c'), "cookies");
pattern2AttributeName.put(Character.valueOf('i'), "requestHeaders");
pattern2AttributeName.put(Character.valueOf('o'), "responseHeaders");
@@ -126,10 +127,11 @@ public class JsonAccessLogValve extends AccessLogValve {
}
}
- private boolean addSubkeyedItems(ListIterator<AccessLogElement> iterator,
List<JsonWrappedElement> elements, String patternAttribute) {
- if (! elements.isEmpty()) {
+ private boolean addSubkeyedItems(ListIterator<AccessLogElement> iterator,
List<JsonWrappedElement> elements,
+ String patternAttribute) {
+ if (!elements.isEmpty()) {
iterator.add(new StringElement("\"" + patternAttribute + "\": {"));
- for (JsonWrappedElement element: elements) {
+ for (JsonWrappedElement element : elements) {
iterator.add(element);
iterator.add(new CharElement(','));
}
@@ -143,8 +145,8 @@ public class JsonAccessLogValve extends AccessLogValve {
@Override
protected AccessLogElement[] createLogElements() {
- Map<Character, List<JsonWrappedElement>> subTypeLists = new
HashMap<>();
- for (Character pattern: SUB_OBJECT_PATTERNS.keySet()) {
+ Map<Character,List<JsonWrappedElement>> subTypeLists = new HashMap<>();
+ for (Character pattern : SUB_OBJECT_PATTERNS.keySet()) {
subTypeLists.put(pattern, new ArrayList<>());
}
boolean hasSub = false;
@@ -160,7 +162,7 @@ public class JsonAccessLogValve extends AccessLogValve {
}
// Remove items which should be written as
// Json objects and add them later in correct order
- JsonWrappedElement wrappedLogElement =
(JsonWrappedElement)logElement;
+ JsonWrappedElement wrappedLogElement = (JsonWrappedElement)
logElement;
AccessLogElement ale = wrappedLogElement.getDelegate();
if (ale instanceof HeaderElement) {
subTypeLists.get(Character.valueOf('i')).add(wrappedLogElement);
@@ -183,7 +185,7 @@ public class JsonAccessLogValve extends AccessLogValve {
}
}
// Add back the items that are output as Json objects
- for (Character pattern: SUB_OBJECT_PATTERNS.keySet()) {
+ for (Character pattern : SUB_OBJECT_PATTERNS.keySet()) {
if (addSubkeyedItems(lit, subTypeLists.get(pattern),
SUB_OBJECT_PATTERNS.get(pattern))) {
hasSub = true;
}
@@ -229,7 +231,7 @@ public class JsonAccessLogValve extends AccessLogValve {
if (patternAttribute == null) {
patternAttribute = "other-" + Character.toString(pattern);
}
- if (key != null && ! "".equals(key)) {
+ if (key != null && !"".equals(key)) {
if
(SUB_OBJECT_PATTERNS.containsKey(Character.valueOf(pattern))) {
this.attributeName = escapeJsonString(key);
} else {
diff --git a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
index 09214f2b54..69b1133f68 100644
--- a/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
+++ b/java/org/apache/catalina/valves/LoadBalancerDrainingValve.java
@@ -202,8 +202,8 @@ public class LoadBalancerDrainingValve extends ValveBase {
sessionCookie.setMaxAge(0); // Delete
sessionCookie.setValue(""); // Purge the cookie's value
// Replicate logic used to set secure attribute for session
cookies
- SessionCookieConfig sessionCookieConfig =
request.getContext().getServletContext()
- .getSessionCookieConfig();
+ SessionCookieConfig sessionCookieConfig =
+
request.getContext().getServletContext().getSessionCookieConfig();
sessionCookie.setSecure(request.isSecure() ||
sessionCookieConfig.isSecure());
response.addCookie(sessionCookie);
}
diff --git a/java/org/apache/catalina/valves/PersistentValve.java
b/java/org/apache/catalina/valves/PersistentValve.java
index b20f20213d..7364c0d0fc 100644
--- a/java/org/apache/catalina/valves/PersistentValve.java
+++ b/java/org/apache/catalina/valves/PersistentValve.java
@@ -141,7 +141,8 @@ public class PersistentValve extends ValveBase {
mustReleaseSemaphore = false;
onSemaphoreNotAcquired(request, response);
if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("persistentValve.acquireInterrupted",
request.getDecodedRequestURI()));
+
containerLog.debug(sm.getString("persistentValve.acquireInterrupted",
+ request.getDecodedRequestURI()));
}
return;
}
@@ -150,7 +151,8 @@ public class PersistentValve extends ValveBase {
if (!semaphore.tryAcquire()) {
onSemaphoreNotAcquired(request, response);
if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("persistentValve.acquireFailed",
request.getDecodedRequestURI()));
+ containerLog.debug(
+
sm.getString("persistentValve.acquireFailed", request.getDecodedRequestURI()));
}
return;
}
@@ -231,9 +233,8 @@ public class PersistentValve extends ValveBase {
}
if (!stored) {
if (containerLog.isTraceEnabled()) {
- containerLog
- .trace("newsessionId store: " +
store + " session: " + session +
- " valid: " +
+ containerLog.trace(
+ "newsessionId store: " + store + "
session: " + session + " valid: " +
(session == null ? "N/A" :
Boolean.toString(session.isValid())) +
" stale: " +
isSessionStale(session, System.currentTimeMillis()));
}
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java
b/java/org/apache/catalina/valves/RemoteIpValve.java
index 27ee43cda4..18b33514f6 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -383,8 +383,8 @@ public class RemoteIpValve extends ValveBase {
/**
* @see #setInternalProxies(String)
*/
- private Pattern internalProxies = Pattern
- .compile("10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
"192\\.168\\.\\d{1,3}\\.\\d{1,3}|" +
+ private Pattern internalProxies =
+ Pattern.compile("10\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
"192\\.168\\.\\d{1,3}\\.\\d{1,3}|" +
"169\\.254\\.\\d{1,3}\\.\\d{1,3}|" +
"127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.6[4-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.[7-9]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.1[0-1]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" +
"100\\.12[0-7]{1}\\.\\d{1,3}\\.\\d{1,3}|" +
diff --git a/java/org/apache/catalina/valves/SemaphoreValve.java
b/java/org/apache/catalina/valves/SemaphoreValve.java
index 6b4b5830ef..9db961de2c 100644
--- a/java/org/apache/catalina/valves/SemaphoreValve.java
+++ b/java/org/apache/catalina/valves/SemaphoreValve.java
@@ -114,8 +114,7 @@ public class SemaphoreValve extends ValveBase {
/**
- * High concurrency status. This status code is returned as an
- * error if concurrency is too high.
+ * High concurrency status. This status code is returned as an error if
concurrency is too high.
*/
protected int highConcurrencyStatus = -1;
diff --git a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
index 0e451d5a0c..119129e8ff 100644
--- a/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
+++ b/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
@@ -78,7 +78,7 @@ public class StuckThreadDetectionValve extends ValveBase {
* invoke()s finally clause). That way, Threads can be GC'ed, even though
the Valve still thinks they are stuck
* (caused by a long monitor interval)
*/
- private final Map<Long, MonitoredThread> activeThreads = new
ConcurrentHashMap<>();
+ private final Map<Long,MonitoredThread> activeThreads = new
ConcurrentHashMap<>();
private final Queue<CompletedStuckThread> completedStuckThreadsQueue = new
ConcurrentLinkedQueue<>();
@@ -179,8 +179,8 @@ public class StuckThreadDetectionValve extends ValveBase {
requestUrl.append('?');
requestUrl.append(request.getQueryString());
}
- MonitoredThread monitoredThread = new MonitoredThread(currentThread,
requestUrl.toString(),
- interruptThreadThreshold > 0);
+ MonitoredThread monitoredThread =
+ new MonitoredThread(currentThread, requestUrl.toString(),
interruptThreadThreshold > 0);
activeThreads.put(key, monitoredThread);
try {
@@ -217,8 +217,9 @@ public class StuckThreadDetectionValve extends ValveBase {
}
}
// Check if any threads previously reported as stuck, have finished.
- for (CompletedStuckThread completedStuckThread =
completedStuckThreadsQueue
- .poll(); completedStuckThread != null; completedStuckThread =
completedStuckThreadsQueue.poll()) {
+ for (CompletedStuckThread completedStuckThread =
+ completedStuckThreadsQueue.poll(); completedStuckThread !=
null; completedStuckThread =
+ completedStuckThreadsQueue.poll()) {
int numStuckThreads = stuckCount.decrementAndGet();
notifyStuckThreadCompleted(completedStuckThread, numStuckThreads);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
