(tomcat) 08/16: Use constant for PROPFIND

[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 aa7f218f550a8c821267cf7d77fb1ace8bda51a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 11 12:26:27 2025 +0100

    Use constant for PROPFIND
---
 java/org/apache/coyote/ajp/Constants.java                             | 2 +-
 .../apache/catalina/servlets/TestWebdavServletOptionCollection.java   | 2 +-
 test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java   | 2 +-
 .../org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java | 2 +-
 test/org/apache/coyote/ajp/SimpleAjpClient.java                       | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/ajp/Constants.java 
b/java/org/apache/coyote/ajp/Constants.java
index 2514afb061..34ddba6569 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -107,7 +107,7 @@ public final class Constants {
 
     // Translates integer codes to names of HTTP methods
     private static final String[] methodTransArray =
-            { Method.OPTIONS, Method.GET, Method.HEAD, Method.POST, 
Method.PUT, Method.OPTIONS, Method.TRACE, "PROPFIND", "PROPPATCH", "MKCOL", 
"COPY",
+            { Method.OPTIONS, Method.GET, Method.HEAD, Method.POST, 
Method.PUT, Method.OPTIONS, Method.TRACE, Method.TRACE, "PROPPATCH", "MKCOL", 
"COPY",
                     "MOVE", "LOCK", "UNLOCK", "ACL", "REPORT", 
"VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
                     "SEARCH", "MKWORKSPACE", "UPDATE", "LABEL", "MERGE", 
"BASELINE-CONTROL", "MKACTIVITY" };
 
diff --git 
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java 
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
index df6edb3c2d..fec223fefd 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
@@ -38,7 +38,7 @@ public class TestWebdavServletOptionCollection extends 
ServletOptionsBaseTest {
     @Parameters
     public static Collection<Object[]> inputs() {
         String[] methods = new String[] { Method.GET, Method.POST, 
Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE,
-                "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND", 
"PROPPATCH" };
+                "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, 
"PROPPATCH" };
 
         List<Object[]> result = new ArrayList<>();
 
diff --git 
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java 
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
index b3f3f00165..b145e5d2cc 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
@@ -38,7 +38,7 @@ public class TestWebdavServletOptionsFile extends 
ServletOptionsBaseTest {
     @Parameters
     public static Collection<Object[]> inputs() {
         String[] methods = new String[] { Method.GET, Method.POST, 
Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE,
-                "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND", 
"PROPPATCH" };
+                "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, 
"PROPPATCH" };
 
         List<Object[]> result = new ArrayList<>();
 
diff --git 
a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java 
b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
index 236337ea86..597f357117 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
@@ -38,7 +38,7 @@ public class TestWebdavServletOptionsUnknown extends 
ServletOptionsBaseTest {
     @Parameters
     public static Collection<Object[]> inputs() {
         String[] methods = new String[] { Method.GET, Method.POST, 
Method.HEAD, Method.TRACE, Method.PUT, Method.DELETE,
-                "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND", 
"PROPPATCH" };
+                "MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", Method.PROPFIND, 
"PROPPATCH" };
 
         List<Object[]> result = new ArrayList<>();
 
diff --git a/test/org/apache/coyote/ajp/SimpleAjpClient.java 
b/test/org/apache/coyote/ajp/SimpleAjpClient.java
index b4398f3269..5465d80913 100644
--- a/test/org/apache/coyote/ajp/SimpleAjpClient.java
+++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java
@@ -97,7 +97,7 @@ public class SimpleAjpClient {
             case Method.TRACE:
                 this.method = 7;
                 break;
-            case "PROPFIND":
+            case Method.PROPFIND:
                 this.method = 8;
                 break;
             case "PROPPATCH":
@@ -179,7 +179,7 @@ public class SimpleAjpClient {
             case 7:
                 return Method.TRACE;
             case 8:
-                return "PROPFIND";
+                return Method.PROPFIND;
             case 9:
                 return "PROPPATCH";
             case 10:


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