(tomcat) 02/02: Java 17 fixes

[remm]

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

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

commit e46050712bca39dca551463357c0be7d17f98880
Author: remm <r...@apache.org>
AuthorDate: Sun Mar 16 14:38:39 2025 +0100

    Java 17 fixes
---
 java/org/apache/catalina/ssi/ExpressionParseTree.java  |  8 ++++----
 .../catalina/valves/rewrite/InternalRewriteMap.java    | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/catalina/ssi/ExpressionParseTree.java 
b/java/org/apache/catalina/ssi/ExpressionParseTree.java
index a9f99c6049..d20b273aca 100644
--- a/java/org/apache/catalina/ssi/ExpressionParseTree.java
+++ b/java/org/apache/catalina/ssi/ExpressionParseTree.java
@@ -225,7 +225,7 @@ public class ExpressionParseTree {
         if (!oppStack.isEmpty()) {
             throw new 
ParseException(sm.getString("expressionParseTree.unusedOpCodes"), 
et.getIndex());
         }
-        root = nodeStack.getFirst();
+        root = nodeStack.get(0);
     }
 
     /**
@@ -309,8 +309,8 @@ public class ExpressionParseTree {
          * @param values The list from which to pop the values
          */
         public void popValues(List<Node> values) {
-            right = values.removeFirst();
-            left = values.removeFirst();
+            right = values.remove(0);
+            left = values.remove(0);
         }
     }
 
@@ -332,7 +332,7 @@ public class ExpressionParseTree {
          */
         @Override
         public void popValues(List<Node> values) {
-            left = values.removeFirst();
+            left = values.remove(0);
         }
 
 
diff --git a/java/org/apache/catalina/valves/rewrite/InternalRewriteMap.java 
b/java/org/apache/catalina/valves/rewrite/InternalRewriteMap.java
index 1ae36b7c5b..b556e4cf3b 100644
--- a/java/org/apache/catalina/valves/rewrite/InternalRewriteMap.java
+++ b/java/org/apache/catalina/valves/rewrite/InternalRewriteMap.java
@@ -26,13 +26,17 @@ import org.apache.tomcat.util.buf.UDecoder;
 public class InternalRewriteMap {
 
     public static RewriteMap toMap(String name) {
-        return switch (name) {
-            case "toupper" -> new UpperCase();
-            case "tolower" -> new LowerCase();
-            case "escape" -> new Escape();
-            case "unescape" -> new Unescape();
-            case null, default -> null;
-        };
+        if ("toupper".equals(name)) {
+            return new UpperCase();
+        } else if ("tolower".equals(name)) {
+            return new LowerCase();
+        } else if ("escape".equals(name)) {
+            return new Escape();
+        } else if ("unescape".equals(name)) {
+            return new Unescape();
+        } else {
+            return null;
+        }
     }
 
     public static class LowerCase implements RewriteMap {


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