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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 0df94e05b0 Fix IDE warnings
0df94e05b0 is described below
commit 0df94e05b0bd2420c22036717fcb38191f23c127
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Mar 3 14:45:58 2023 +0000
Fix IDE warnings
---
.../apache/catalina/valves/JsonAccessLogValve.java | 46 +++++++++++-----------
java/org/apache/tomcat/util/json/JSONFilter.java | 6 +--
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/valves/JsonAccessLogValve.java
b/java/org/apache/catalina/valves/JsonAccessLogValve.java
index aae85b824f..c2564f9778 100644
--- a/java/org/apache/catalina/valves/JsonAccessLogValve.java
+++ b/java/org/apache/catalina/valves/JsonAccessLogValve.java
@@ -68,28 +68,28 @@ public class JsonAccessLogValve extends AccessLogValve {
static {
// FIXME: finalize attribute names
Map<Character, String> pattern2AttributeName = new HashMap<>();
- pattern2AttributeName.put('a', "remoteAddr");
- pattern2AttributeName.put('A', "localAddr");
- pattern2AttributeName.put('b', "size"); /* byteSent -> size */
- pattern2AttributeName.put('B', "byteSentNC");
- pattern2AttributeName.put('D', "elapsedTime");
- pattern2AttributeName.put('F', "firstByteTime");
- pattern2AttributeName.put('h', "host");
- pattern2AttributeName.put('H', "protocol");
- pattern2AttributeName.put('l', "logicalUserName");
- pattern2AttributeName.put('m', "method");
- pattern2AttributeName.put('p', "port");
- pattern2AttributeName.put('q', "query");
- pattern2AttributeName.put('r', "request");
- pattern2AttributeName.put('s', "statusCode");
- pattern2AttributeName.put('S', "sessionId");
- pattern2AttributeName.put('t', "time"); /* dateTime -> time */
- pattern2AttributeName.put('T', "elapsedTimeS");
- pattern2AttributeName.put('u', "user");
- pattern2AttributeName.put('U', "path"); /* requestURI -> path */
- pattern2AttributeName.put('v', "localServerName");
- pattern2AttributeName.put('I', "threadName");
- pattern2AttributeName.put('X', "connectionStatus");
+ 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'), "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('l'), "logicalUserName");
+ pattern2AttributeName.put(Character.valueOf('m'), "method");
+ pattern2AttributeName.put(Character.valueOf('p'), "port");
+ pattern2AttributeName.put(Character.valueOf('q'), "query");
+ 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'), "elapsedTimeS");
+ pattern2AttributeName.put(Character.valueOf('u'), "user");
+ pattern2AttributeName.put(Character.valueOf('U'), "path"); /*
requestURI -> path */
+ pattern2AttributeName.put(Character.valueOf('v'), "localServerName");
+ pattern2AttributeName.put(Character.valueOf('I'), "threadName");
+ pattern2AttributeName.put(Character.valueOf('X'), "connectionStatus");
PATTERNS = Collections.unmodifiableMap(pattern2AttributeName);
}
@@ -129,7 +129,7 @@ public class JsonAccessLogValve extends AccessLogValve {
@Override
protected AccessLogElement createAccessLogElement(char pattern) {
AccessLogElement ale = super.createAccessLogElement(pattern);
- String attributeName = PATTERNS.get(pattern);
+ String attributeName = PATTERNS.get(Character.valueOf(pattern));
if (attributeName == null) {
attributeName = "other-" + new String(JSONFilter.escape(pattern));
}
diff --git a/java/org/apache/tomcat/util/json/JSONFilter.java
b/java/org/apache/tomcat/util/json/JSONFilter.java
index 43c23f331b..176867407d 100644
--- a/java/org/apache/tomcat/util/json/JSONFilter.java
+++ b/java/org/apache/tomcat/util/json/JSONFilter.java
@@ -29,8 +29,7 @@ public class JSONFilter {
* @return a char array with the escaped sequence
*/
public static char[] escape(char c) {
- if (c < 0x20 || c == 0x22 || c == 0x5c
- || Character.isHighSurrogate((char) c) ||
Character.isLowSurrogate((char) c)) {
+ if (c < 0x20 || c == 0x22 || c == 0x5c || Character.isHighSurrogate(c)
|| Character.isLowSurrogate(c)) {
char popular = getPopularChar(c);
if (popular > 0) {
return new char[] { '\\', popular };
@@ -82,8 +81,7 @@ public class JSONFilter {
int lastUnescapedStart = off;
for (int i = off; i < length; i++) {
char c = input.charAt(i);
- if (c < 0x20 || c == 0x22 || c == 0x5c
- || Character.isHighSurrogate((char) c) ||
Character.isLowSurrogate((char) c)) {
+ if (c < 0x20 || c == 0x22 || c == 0x5c ||
Character.isHighSurrogate(c) || Character.isLowSurrogate(c)) {
if (escaped == null) {
escaped = new StringBuilder(length + 20);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
