This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit eb2c56ed3320cc0a3925ee3949b3bb000cb80e75
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 12:19:32 2023 +0100
Code clean-up - formatting. No functional change.
---
java/org/apache/tomcat/util/http/FastHttpDateFormat.java | 12 ++++++------
java/org/apache/tomcat/util/http/HttpMessages.java | 6 +++---
java/org/apache/tomcat/util/http/LegacyCookieProcessor.java | 8 ++++----
java/org/apache/tomcat/util/http/Parameters.java | 8 ++++----
java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java | 4 ++--
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index 6c941c984e..cbb7be9151 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -35,8 +35,8 @@ public final class FastHttpDateFormat {
// -------------------------------------------------------------- Variables
- private static final int CACHE_SIZE = Integer
-
.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE",
1000).intValue();
+ private static final int CACHE_SIZE =
+
Integer.getInteger("org.apache.tomcat.util.http.FastHttpDateFormat.CACHE_SIZE",
1000).intValue();
/**
@@ -66,8 +66,8 @@ public final class FastHttpDateFormat {
FORMAT_OBSOLETE_RFC850 = new
ConcurrentDateFormat(DATE_OBSOLETE_RFC850, Locale.US, tz);
FORMAT_OBSOLETE_ASCTIME = new
ConcurrentDateFormat(DATE_OBSOLETE_ASCTIME, Locale.US, tz);
- httpParseFormats = new ConcurrentDateFormat[] { FORMAT_RFC5322,
FORMAT_OBSOLETE_RFC850,
- FORMAT_OBSOLETE_ASCTIME };
+ httpParseFormats =
+ new ConcurrentDateFormat[] { FORMAT_RFC5322,
FORMAT_OBSOLETE_RFC850, FORMAT_OBSOLETE_ASCTIME };
}
/**
@@ -85,13 +85,13 @@ public final class FastHttpDateFormat {
/**
* Formatter cache.
*/
- private static final Map<Long, String> formatCache = new
ConcurrentHashMap<>(CACHE_SIZE);
+ private static final Map<Long,String> formatCache = new
ConcurrentHashMap<>(CACHE_SIZE);
/**
* Parser cache.
*/
- private static final Map<String, Long> parseCache = new
ConcurrentHashMap<>(CACHE_SIZE);
+ private static final Map<String,Long> parseCache = new
ConcurrentHashMap<>(CACHE_SIZE);
// --------------------------------------------------------- Public Methods
diff --git a/java/org/apache/tomcat/util/http/HttpMessages.java
b/java/org/apache/tomcat/util/http/HttpMessages.java
index dee85c18fd..816b0e9cb5 100644
--- a/java/org/apache/tomcat/util/http/HttpMessages.java
+++ b/java/org/apache/tomcat/util/http/HttpMessages.java
@@ -33,10 +33,10 @@ import org.apache.tomcat.util.res.StringManager;
*/
public class HttpMessages {
- private static final Map<Locale, HttpMessages> instances = new
ConcurrentHashMap<>();
+ private static final Map<Locale,HttpMessages> instances = new
ConcurrentHashMap<>();
- private static final HttpMessages DEFAULT = new HttpMessages(
- StringManager.getManager("org.apache.tomcat.util.http.res",
Locale.getDefault()));
+ private static final HttpMessages DEFAULT =
+ new
HttpMessages(StringManager.getManager("org.apache.tomcat.util.http.res",
Locale.getDefault()));
// XXX move message resources in this package
diff --git a/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
b/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
index d41b829ae3..6494ba75f1 100644
--- a/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/LegacyCookieProcessor.java
@@ -52,8 +52,8 @@ public final class LegacyCookieProcessor extends
CookieProcessorBase {
// Excludes '/' since configuration controls whether or not to treat '/' as
// a separator
- private static final char[] HTTP_SEPARATORS = new char[] { '\t', ' ',
'\"', '(', ')', ',', ':', ';', '<', '=', '>',
- '?', '@', '[', '\\', ']', '{', '}' };
+ private static final char[] HTTP_SEPARATORS =
+ new char[] { '\t', ' ', '\"', '(', ')', ',', ':', ';', '<', '=',
'>', '?', '@', '[', '\\', ']', '{', '}' };
static {
for (char c : V0_SEPARATORS) {
@@ -61,8 +61,8 @@ public final class LegacyCookieProcessor extends
CookieProcessorBase {
}
}
- private final boolean STRICT_SERVLET_COMPLIANCE = Boolean
- .getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
+ private final boolean STRICT_SERVLET_COMPLIANCE =
+
Boolean.getBoolean("org.apache.catalina.STRICT_SERVLET_COMPLIANCE");
private boolean allowEqualsInValue = false;
diff --git a/java/org/apache/tomcat/util/http/Parameters.java
b/java/org/apache/tomcat/util/http/Parameters.java
index 66fdc9302a..b5eb54e98d 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -46,7 +46,7 @@ public final class Parameters {
private static final StringManager sm =
StringManager.getManager("org.apache.tomcat.util.http");
- private final Map<String, ArrayList<String>> paramHashValues = new
LinkedHashMap<>();
+ private final Map<String,ArrayList<String>> paramHashValues = new
LinkedHashMap<>();
private boolean didQueryParameters = false;
private MessageBytes queryMB;
@@ -460,8 +460,8 @@ public final class Parameters {
} else if (log.isInfoEnabled()) {
UserDataHelper.Mode logMode =
userDataLog.getNextMode();
if (logMode != null) {
- String message =
sm.getString("parameters.decodeFail.info", tmpName.toString(),
- tmpValue.toString());
+ String message =
+ sm.getString("parameters.decodeFail.info",
tmpName.toString(), tmpValue.toString());
switch (logMode) {
case INFO_THEN_DEBUG:
message +=
sm.getString("parameters.fallToDebug");
@@ -551,7 +551,7 @@ public final class Parameters {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
- for (Map.Entry<String, ArrayList<String>> e :
paramHashValues.entrySet()) {
+ for (Map.Entry<String,ArrayList<String>> e :
paramHashValues.entrySet()) {
sb.append(e.getKey()).append('=');
StringUtils.join(e.getValue(), ',', sb);
sb.append('\n');
diff --git a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
index 53339c2429..41a66717b5 100644
--- a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
@@ -35,8 +35,8 @@ public class Rfc6265CookieProcessor extends
CookieProcessorBase {
private static final Log log =
LogFactory.getLog(Rfc6265CookieProcessor.class);
- private static final StringManager sm = StringManager
- .getManager(Rfc6265CookieProcessor.class.getPackage().getName());
+ private static final StringManager sm =
+
StringManager.getManager(Rfc6265CookieProcessor.class.getPackage().getName());
private static final BitSet domainValid = new BitSet(128);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
