[tomcat] branch 8.5.x updated: Use alphabetical order, remove comment. No functional change.

[rjung]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 66a10e29f5 Use alphabetical order, remove comment. No functional 
change.
66a10e29f5 is described below

commit 66a10e29f54e3d20d47d8f49ee39adfe23571a64
Author: Rainer Jung <rainer.j...@kippdata.de>
AuthorDate: Thu Apr 27 10:20:25 2023 +0200

    Use alphabetical order, remove comment. No functional change.
---
 java/org/apache/catalina/valves/JsonAccessLogValve.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/valves/JsonAccessLogValve.java 
b/java/org/apache/catalina/valves/JsonAccessLogValve.java
index bd4fb91da4..4c71278fe9 100644
--- a/java/org/apache/catalina/valves/JsonAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JsonAccessLogValve.java
@@ -70,12 +70,13 @@ public class JsonAccessLogValve extends AccessLogValve {
         Map<Character, String> pattern2AttributeName = new HashMap<>();
         pattern2AttributeName.put(Character.valueOf('a'), "remoteAddr");
         pattern2AttributeName.put(Character.valueOf('A'), "localAddr");
-        pattern2AttributeName.put(Character.valueOf('b'), "size"); /* byteSent 
-> size */
+        pattern2AttributeName.put(Character.valueOf('b'), "size");
         pattern2AttributeName.put(Character.valueOf('B'), "byteSentNC");
         pattern2AttributeName.put(Character.valueOf('D'), "elapsedTime");
         pattern2AttributeName.put(Character.valueOf('F'), "firstByteTime");
         pattern2AttributeName.put(Character.valueOf('h'), "host");
         pattern2AttributeName.put(Character.valueOf('H'), "protocol");
+        pattern2AttributeName.put(Character.valueOf('I'), "threadName");
         pattern2AttributeName.put(Character.valueOf('l'), "logicalUserName");
         pattern2AttributeName.put(Character.valueOf('m'), "method");
         pattern2AttributeName.put(Character.valueOf('p'), "port");
@@ -83,12 +84,11 @@ public class JsonAccessLogValve extends AccessLogValve {
         pattern2AttributeName.put(Character.valueOf('r'), "request");
         pattern2AttributeName.put(Character.valueOf('s'), "statusCode");
         pattern2AttributeName.put(Character.valueOf('S'), "sessionId");
-        pattern2AttributeName.put(Character.valueOf('t'), "time"); /* dateTime 
-> time */
+        pattern2AttributeName.put(Character.valueOf('t'), "time");
         pattern2AttributeName.put(Character.valueOf('T'), "elapsedTimeS");
         pattern2AttributeName.put(Character.valueOf('u'), "user");
-        pattern2AttributeName.put(Character.valueOf('U'), "path"); /* 
requestURI -> path */
+        pattern2AttributeName.put(Character.valueOf('U'), "path");
         pattern2AttributeName.put(Character.valueOf('v'), "localServerName");
-        pattern2AttributeName.put(Character.valueOf('I'), "threadName");
         pattern2AttributeName.put(Character.valueOf('X'), "connectionStatus");
         PATTERNS = Collections.unmodifiableMap(pattern2AttributeName);
     }


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