(tomcat) 12/16: Use constant for MOVE

[markt]

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

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

commit 3e4f3f7166e32a88fc75735457cded76911c85ed
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 11 12:31:14 2025 +0100

    Use constant for MOVE
---
 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 a08c0c68b0..c944943b50 100644
--- a/java/org/apache/coyote/ajp/Constants.java
+++ b/java/org/apache/coyote/ajp/Constants.java
@@ -108,7 +108,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, Method.TRACE, Method.PROPPATCH, 
Method.MKCOL, Method.COPY,
-                    "MOVE", "LOCK", "UNLOCK", "ACL", "REPORT", 
"VERSION-CONTROL", "CHECKIN", "CHECKOUT", "UNCHECKOUT",
+                    Method.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 d353a2f466..0ca34e23ff 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,
-                Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, "MOVE", 
Method.PROPFIND, Method.PROPPATCH };
+                Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, Method.MOVE, 
Method.PROPFIND, Method.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 caac6132d1..b978b60af3 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,
-                Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, "MOVE", 
Method.PROPFIND, Method.PROPPATCH };
+                Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, Method.MOVE, 
Method.PROPFIND, Method.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 eaa7b7eaa4..afae9df3d0 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,
-                Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, "MOVE", 
Method.PROPFIND, Method.PROPPATCH };
+                Method.MKCOL, "LOCK", "UNLOCK", Method.COPY, Method.MOVE, 
Method.PROPFIND, Method.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 8dda78532b..37c4fd8dcb 100644
--- a/test/org/apache/coyote/ajp/SimpleAjpClient.java
+++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java
@@ -109,7 +109,7 @@ public class SimpleAjpClient {
             case Method.COPY:
                 this.method = 11;
                 break;
-            case "MOVE":
+            case Method.MOVE:
                 this.method = 12;
                 break;
             case "LOCK":
@@ -187,7 +187,7 @@ public class SimpleAjpClient {
             case 11:
                 return Method.COPY;
             case 12:
-                return "MOVE";
+                return Method.MOVE;
             case 13:
                 return "LOCK";
             case 14:


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