[tomcat] 01/04: Code clean-up - formatting. No functional change.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 866e44ee4bbd0209c5e061aa2542703761af734e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 14 12:14:52 2023 +0100

    Code clean-up - formatting. No functional change.
---
 java/org/apache/tomcat/util/http/FastHttpDateFormat.java     | 12 ++++++------
 java/org/apache/tomcat/util/http/Parameters.java             |  8 ++++----
 java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java 
b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
index f33aa851a3..f48913bad8 100644
--- a/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
+++ b/java/org/apache/tomcat/util/http/FastHttpDateFormat.java
@@ -34,8 +34,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();
 
 
     // HTTP date formats
@@ -57,8 +57,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 };
     }
 
     /**
@@ -76,13 +76,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/Parameters.java 
b/java/org/apache/tomcat/util/http/Parameters.java
index debf968acf..e56793b3de 100644
--- a/java/org/apache/tomcat/util/http/Parameters.java
+++ b/java/org/apache/tomcat/util/http/Parameters.java
@@ -44,7 +44,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;
@@ -418,8 +418,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");
@@ -487,7 +487,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 32440dad4e..fc4e5cbe8a 100644
--- a/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
+++ b/java/org/apache/tomcat/util/http/Rfc6265CookieProcessor.java
@@ -38,8 +38,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);
 
@@ -178,7 +178,7 @@ public class Rfc6265CookieProcessor extends 
CookieProcessorBase {
         }
 
         // Add the remaining attributes
-        for (Map.Entry<String, String> entry : 
cookie.getAttributes().entrySet()) {
+        for (Map.Entry<String,String> entry : 
cookie.getAttributes().entrySet()) {
             switch (entry.getKey()) {
                 case Constants.COOKIE_COMMENT_ATTR:
                 case Constants.COOKIE_DOMAIN_ATTR:


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org