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 aa73a727aa0eeb355048a19527bb81be89910ff4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 11 12:18:21 2025 +0100
Use constant for DELETE
---
java/org/apache/coyote/ajp/Constants.java | 2 +-
test/org/apache/catalina/realm/TestRealmBase.java | 4 ++--
test/org/apache/catalina/servlets/TestDefaultServletOptions.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 ++--
test/org/apache/tomcat/util/descriptor/web/TestWebXml.java | 3 ++-
8 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index 1be8f1baa6..a33b752557 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, "DELETE", "TRACE", "PROPFIND", "PROPPATCH", "MKCOL", "COPY",
+ { Method.OPTIONS, Method.GET, Method.HEAD, Method.POST,
Method.PUT, Method.OPTIONS, "TRACE", "PROPFIND", "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/realm/TestRealmBase.java
b/test/org/apache/catalina/realm/TestRealmBase.java
index fa287ac108..c10662213d 100644
--- a/test/org/apache/catalina/realm/TestRealmBase.java
+++ b/test/org/apache/catalina/realm/TestRealmBase.java
@@ -660,7 +660,7 @@ public class TestRealmBase {
SecurityConstraint deleteConstraint = new SecurityConstraint();
deleteConstraint.addAuthRole(ROLE1);
SecurityCollection deleteCollection = new SecurityCollection();
- deleteCollection.addMethod("DELETE");
+ deleteCollection.addMethod(Method.OPTIONS);
deleteCollection.addPatternDecoded("/*");
deleteConstraint.addCollection(deleteCollection);
@@ -772,7 +772,7 @@ public class TestRealmBase {
// Only user1 should be able to perform a DELETE as only that user has
// role1.
- request.setMethod("DELETE");
+ request.setMethod(Method.OPTIONS);
SecurityConstraint[] constraintsDelete =
mapRealm.findSecurityConstraints(request, context);
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
index b99d395941..e528cad9de 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
@@ -34,7 +34,7 @@ public class TestDefaultServletOptions extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
String[] urls = new String[] { COLLECTION_NAME, FILE_NAME,
UNKNOWN_NAME };
- String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, "DELETE" };
+ String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, Method.DELETE };
List<Object[]> result = new ArrayList<>();
diff --git
a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
index fdc450949b..5d1261800c 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionCollection.java
@@ -37,7 +37,7 @@ public class TestWebdavServletOptionCollection extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
- String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, "DELETE",
+ String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, Method.DELETE,
"MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "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 ee2ef719f6..8457b4ef52 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsFile.java
@@ -37,7 +37,7 @@ public class TestWebdavServletOptionsFile extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
- String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, "DELETE",
+ String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, Method.DELETE,
"MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "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 f01474ee33..a0443a30e7 100644
--- a/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
+++ b/test/org/apache/catalina/servlets/TestWebdavServletOptionsUnknown.java
@@ -37,7 +37,7 @@ public class TestWebdavServletOptionsUnknown extends
ServletOptionsBaseTest {
@Parameters
public static Collection<Object[]> inputs() {
- String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, "DELETE",
+ String[] methods = new String[] { Method.GET, Method.POST,
Method.HEAD, "TRACE", Method.PUT, Method.DELETE,
"MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "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 a4dfced50b..599c1e4eb6 100644
--- a/test/org/apache/coyote/ajp/SimpleAjpClient.java
+++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java
@@ -91,7 +91,7 @@ public class SimpleAjpClient {
case Method.PUT:
this.method = 5;
break;
- case "DELETE":
+ case Method.DELETE:
this.method = 6;
break;
case "TRACE":
@@ -175,7 +175,7 @@ public class SimpleAjpClient {
case 5:
return Method.PUT;
case 6:
- return "DELETE";
+ return Method.DELETE;
case 7:
return "TRACE";
case 8:
diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
index fa223aa2b0..874de4b6bf 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
@@ -32,6 +32,7 @@ import org.apache.tomcat.util.descriptor.DigesterFactory;
import org.apache.tomcat.util.descriptor.XmlErrorHandler;
import org.apache.tomcat.util.descriptor.XmlIdentifiers;
import org.apache.tomcat.util.digester.Digester;
+import org.apache.tomcat.util.http.Method;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -304,7 +305,7 @@ public class TestWebXml {
SecurityCollection collection = new SecurityCollection();
collection.setName("dummy");
collection.addPatternDecoded("/*");
- collection.addMethod("DELETE");
+ collection.addMethod(Method.DELETE);
sc.addCollection(collection);
webXmlDefaultFragment.addSecurityConstraint(sc);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
