This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 6eb21142ad40a18e20e320ca028b17a8798e8338
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 11 12:06:37 2025 +0100
Use constant for PUT
---
.../apache/catalina/ant/AbstractCatalinaTask.java | 2 +-
java/org/apache/coyote/ajp/Constants.java | 2 +-
.../authenticator/TestFormAuthenticatorA.java | 4 +--
.../org/apache/catalina/connector/TestRequest.java | 4 +--
.../apache/catalina/filters/TestCorsFilter.java | 30 +++++++++++-----------
test/org/apache/catalina/realm/TestRealmBase.java | 2 +-
.../catalina/realm/TesterServletSecurity01.java | 2 +-
.../servlets/TestDefaultServletOptions.java | 2 +-
.../TestWebdavServletOptionCollection.java | 2 +-
.../servlets/TestWebdavServletOptionsFile.java | 2 +-
.../servlets/TestWebdavServletOptionsUnknown.java | 2 +-
.../apache/catalina/startup/TomcatBaseTest.java | 2 +-
test/org/apache/coyote/ajp/SimpleAjpClient.java | 4 +--
.../coyote/ajp/TestAbstractAjpProcessor.java | 4 +--
test/org/apache/jasper/servlet/TestJspServlet.java | 7 ++---
15 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 5c5542aa86..3e8b94fa88 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -188,7 +188,7 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
preAuthenticate();
hconn.setDoOutput(true);
- hconn.setRequestMethod("PUT");
+ hconn.setRequestMethod(Method.PUT);
if (contentType != null) {
hconn.setRequestProperty("Content-Type", contentType);
}
diff --git a/java/org/apache/coyote/ajp/Constants.java
b/java/org/apache/coyote/ajp/Constants.java
index f9ca973355..c979f2f9c7 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 =
- { "OPTIONS", Method.GET, "HEAD", Method.POST, "PUT", "DELETE",
"TRACE", "PROPFIND", "PROPPATCH", "MKCOL", "COPY",
+ { "OPTIONS", Method.GET, "HEAD", Method.POST, Method.PUT,
"DELETE", "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/authenticator/TestFormAuthenticatorA.java
b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
index 9e81406574..4ca6374d55 100644
--- a/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
+++ b/test/org/apache/catalina/authenticator/TestFormAuthenticatorA.java
@@ -178,7 +178,7 @@ public class TestFormAuthenticatorA extends TomcatBaseTest {
FormAuthClientSelectedMethods client = new
FormAuthClientSelectedMethods(true, true, true, true);
// First request for protected resource gets the login page
- client.doResourceRequest("PUT", true,
+ client.doResourceRequest(Method.PUT, true,
"/test?" + SelectedMethodsServlet.PARAM + "=" +
SelectedMethodsServlet.VALUE, null);
Assert.assertTrue(client.getResponseLine(), client.isResponse200());
Assert.assertTrue(client.isResponseBodyOK());
@@ -604,7 +604,7 @@ public class TestFormAuthenticatorA extends TomcatBaseTest {
SecurityConstraint constraint = new SecurityConstraint();
SecurityCollection collection = new SecurityCollection();
collection.setName("Protect PUT");
- collection.addMethod("PUT");
+ collection.addMethod(Method.PUT);
collection.addPatternDecoded("/test");
constraint.addCollection(collection);
constraint.addAuthRole("tomcat");
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 16747bd62f..f2a1bbb5c6 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -395,7 +395,7 @@ public class TestRequest extends TomcatBaseTest {
client.reset();
// PUT without POST-style parsing
- client.doRequest("PUT", "foo=bar&bar=foo",
Globals.CONTENT_TYPE_FORM_URL_ENCODING, "bar=baz&foo=baz", false);
+ client.doRequest(Method.PUT, "foo=bar&bar=foo",
Globals.CONTENT_TYPE_FORM_URL_ENCODING, "bar=baz&foo=baz", false);
Assert.assertTrue("Non-200 response for PUT/noparse request",
client.isResponse200());
Assert.assertEquals("Incorrect response for PUT request",
"bar=foo,foo=bar", client.getResponseBody());
@@ -403,7 +403,7 @@ public class TestRequest extends TomcatBaseTest {
client.reset();
// PUT with POST-style parsing
- client.doRequest("PUT", "foo=bar&bar=foo",
Globals.CONTENT_TYPE_FORM_URL_ENCODING, "bar=baz&foo=baz", true);
+ client.doRequest(Method.PUT, "foo=bar&bar=foo",
Globals.CONTENT_TYPE_FORM_URL_ENCODING, "bar=baz&foo=baz", true);
Assert.assertTrue("Non-200 response for PUT request",
client.isResponse200());
Assert.assertEquals("Incorrect response for PUT/parse request",
"bar=baz,bar=foo,foo=bar,foo=baz",
diff --git a/test/org/apache/catalina/filters/TestCorsFilter.java
b/test/org/apache/catalina/filters/TestCorsFilter.java
index 5e145cadcc..71308370d6 100644
--- a/test/org/apache/catalina/filters/TestCorsFilter.java
+++ b/test/org/apache/catalina/filters/TestCorsFilter.java
@@ -237,7 +237,7 @@ public class TestCorsFilter {
public void testDoFilterPreflight() throws IOException, ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -269,7 +269,7 @@ public class TestCorsFilter {
public void testDoFilterPreflightAnyOrigin() throws IOException,
ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -301,7 +301,7 @@ public class TestCorsFilter {
public void testDoFilterPreflightInvalidOrigin() throws IOException,
ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
"http://www.example.com";);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -317,7 +317,7 @@ public class TestCorsFilter {
public void testDoFilterPreflightNegativeMaxAge() throws IOException,
ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -343,7 +343,7 @@ public class TestCorsFilter {
public void testDoFilterPreflightWithCredentials() throws IOException,
ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -370,7 +370,7 @@ public class TestCorsFilter {
public void testDoFilterPreflightWithoutCredentialsAndSpecificOrigin()
throws IOException, ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -627,7 +627,7 @@ public class TestCorsFilter {
public void testNotSimple() throws IOException, ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
TesterHttpServletResponse response = new TesterHttpServletResponse();
@@ -739,7 +739,7 @@ public class TestCorsFilter {
public void testCheckActualRequestType() throws ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTP_TOMCAT_APACHE_ORG);
- request.setMethod("PUT");
+ request.setMethod(Method.PUT);
CorsFilter corsFilter = new CorsFilter();
corsFilter.init(TesterFilterConfigs.getDefaultFilterConfig());
CorsFilter.CORSRequestType requestType =
corsFilter.checkRequestType(request);
@@ -772,7 +772,7 @@ public class TestCorsFilter {
public void testCheckPreFlightRequestType() throws ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTP_TOMCAT_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Content-Type");
request.setMethod("OPTIONS");
CorsFilter corsFilter = new CorsFilter();
@@ -820,7 +820,7 @@ public class TestCorsFilter {
public void testCheckPreFlightRequestTypeNoHeaders() throws
ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTP_TOMCAT_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setMethod("OPTIONS");
CorsFilter corsFilter = new CorsFilter();
corsFilter.init(TesterFilterConfigs.getDefaultFilterConfig());
@@ -880,7 +880,7 @@ public class TestCorsFilter {
TesterHttpServletRequest request = new TesterHttpServletRequest();
TesterHttpServletResponse response = new TesterHttpServletResponse();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTPS_WWW_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"X-ANSWER");
request.setMethod("OPTIONS");
CorsFilter corsFilter = new CorsFilter();
@@ -901,7 +901,7 @@ public class TestCorsFilter {
TesterHttpServletRequest request = new TesterHttpServletRequest();
TesterHttpServletResponse response = new TesterHttpServletResponse();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTP_TOMCAT_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS,
"Origin");
request.setMethod("OPTIONS");
CorsFilter corsFilter = new CorsFilter();
@@ -916,7 +916,7 @@ public class TestCorsFilter {
TesterHttpServletRequest request = new TesterHttpServletRequest();
TesterHttpServletResponse response = new TesterHttpServletResponse();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN, "www.ebay.com");
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setMethod("OPTIONS");
CorsFilter corsFilter = new CorsFilter();
corsFilter.init(TesterFilterConfigs.getSecureFilterConfig());
@@ -933,7 +933,7 @@ public class TestCorsFilter {
public void testCheckPreFlightRequestTypeEmptyHeaders() throws
ServletException {
TesterHttpServletRequest request = new TesterHttpServletRequest();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
TesterFilterConfigs.HTTP_TOMCAT_APACHE_ORG);
-
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
"PUT");
+
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_METHOD,
Method.PUT);
request.setHeader(CorsFilter.REQUEST_HEADER_ACCESS_CONTROL_REQUEST_HEADERS, "");
request.setMethod("OPTIONS");
CorsFilter corsFilter = new CorsFilter();
@@ -1023,7 +1023,7 @@ public class TestCorsFilter {
TesterHttpServletRequest request = new TesterHttpServletRequest();
TesterHttpServletResponse response = new TesterHttpServletResponse();
request.setHeader(CorsFilter.REQUEST_HEADER_ORIGIN,
"http://tomcat.apache.org";);
- request.setMethod("PUT");
+ request.setMethod(Method.PUT);
CorsFilter corsFilter = new CorsFilter();
corsFilter.init(TesterFilterConfigs.getDefaultFilterConfig());
corsFilter.doFilter(request, response, filterChain);
diff --git a/test/org/apache/catalina/realm/TestRealmBase.java
b/test/org/apache/catalina/realm/TestRealmBase.java
index 8bb580eedf..1706a009bc 100644
--- a/test/org/apache/catalina/realm/TestRealmBase.java
+++ b/test/org/apache/catalina/realm/TestRealmBase.java
@@ -733,7 +733,7 @@ public class TestRealmBase {
// Only users with application roles (role1 or role2 so user1 or user2)
// should be able to perform a PUT.
- request.setMethod("PUT");
+ request.setMethod(Method.PUT);
SecurityConstraint[] constraintsPut =
mapRealm.findSecurityConstraints(request, context);
diff --git a/test/org/apache/catalina/realm/TesterServletSecurity01.java
b/test/org/apache/catalina/realm/TesterServletSecurity01.java
index e397088d79..9cf0501ae6 100644
--- a/test/org/apache/catalina/realm/TesterServletSecurity01.java
+++ b/test/org/apache/catalina/realm/TesterServletSecurity01.java
@@ -27,7 +27,7 @@ import org.apache.tomcat.util.http.Method;
httpMethodConstraints={
@HttpMethodConstraint(value=Method.POST,
rolesAllowed=TestRealmBase.ROLE1),
- @HttpMethodConstraint(value="PUT",
+ @HttpMethodConstraint(value=Method.PUT,
rolesAllowed=SecurityConstraint.ROLE_ALL_ROLES),
@HttpMethodConstraint(value="TRACE",
rolesAllowed=SecurityConstraint.ROLE_ALL_AUTHENTICATED_USERS)})
diff --git a/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
b/test/org/apache/catalina/servlets/TestDefaultServletOptions.java
index 8a41e3cb5a..53795940c6 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, "HEAD",
"TRACE", "PUT", "DELETE" };
+ String[] methods = new String[] { Method.GET, Method.POST, "HEAD",
"TRACE", Method.PUT, "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 83046c5d2d..9ff5d248a3 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, "HEAD",
"TRACE", "PUT", "DELETE",
+ String[] methods = new String[] { Method.GET, Method.POST, "HEAD",
"TRACE", Method.PUT, "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 b934082c2a..88565011e6 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, "HEAD",
"TRACE", "PUT", "DELETE",
+ String[] methods = new String[] { Method.GET, Method.POST, "HEAD",
"TRACE", Method.PUT, "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 dc979cdc19..21e3024c8e 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, "HEAD",
"TRACE", "PUT", "DELETE",
+ String[] methods = new String[] { Method.GET, Method.POST, "HEAD",
"TRACE", Method.PUT, "DELETE",
"MKCOL", "LOCK", "UNLOCK", "COPY", "MOVE", "PROPFIND",
"PROPPATCH" };
List<Object[]> result = new ArrayList<>();
diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java
b/test/org/apache/catalina/startup/TomcatBaseTest.java
index 66662db310..93f4f8a552 100644
--- a/test/org/apache/catalina/startup/TomcatBaseTest.java
+++ b/test/org/apache/catalina/startup/TomcatBaseTest.java
@@ -597,7 +597,7 @@ public abstract class TomcatBaseTest extends
LoggingBaseTest {
}
int bodySize = 0;
- if ("PUT".equals(request.getMethod())) {
+ if (Method.PUT.equals(request.getMethod())) {
InputStream is = request.getInputStream();
int read = 0;
byte[] buffer = new byte[8192];
diff --git a/test/org/apache/coyote/ajp/SimpleAjpClient.java
b/test/org/apache/coyote/ajp/SimpleAjpClient.java
index a2c3dd1088..c7d401df13 100644
--- a/test/org/apache/coyote/ajp/SimpleAjpClient.java
+++ b/test/org/apache/coyote/ajp/SimpleAjpClient.java
@@ -88,7 +88,7 @@ public class SimpleAjpClient {
case Method.POST:
this.method = 4;
break;
- case "PUT":
+ case Method.PUT:
this.method = 5;
break;
case "DELETE":
@@ -173,7 +173,7 @@ public class SimpleAjpClient {
case 4:
return Method.POST;
case 5:
- return "PUT";
+ return Method.PUT;
case 6:
return "DELETE";
case 7:
diff --git a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
index d3caac615b..4664382dd3 100644
--- a/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
+++ b/test/org/apache/coyote/ajp/TestAbstractAjpProcessor.java
@@ -485,7 +485,7 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
@Test
public void testSmallBody() throws Exception {
RequestDescriptor desc = new RequestDescriptor();
- desc.putRequestInfo("REQUEST-METHOD", "PUT");
+ desc.putRequestInfo("REQUEST-METHOD", Method.PUT);
desc.putRequestInfo("REQUEST-CONTENT-LENGTH", "100");
desc.putRequestInfo("REQUEST-BODY-SIZE", "100");
desc.putRequestInfo("REQUEST-URI", "/testSmallBody");
@@ -495,7 +495,7 @@ public class TestAbstractAjpProcessor extends
TomcatBaseTest {
@Test
public void testLargeBody() throws Exception {
RequestDescriptor desc = new RequestDescriptor();
- desc.putRequestInfo("REQUEST-METHOD", "PUT");
+ desc.putRequestInfo("REQUEST-METHOD", Method.PUT);
desc.putRequestInfo("REQUEST-CONTENT-LENGTH", "10000");
desc.putRequestInfo("REQUEST-BODY-SIZE", "10000");
desc.putRequestInfo("REQUEST-URI", "/testLargeBody");
diff --git a/test/org/apache/jasper/servlet/TestJspServlet.java
b/test/org/apache/jasper/servlet/TestJspServlet.java
index bb77086e14..8f5558254e 100644
--- a/test/org/apache/jasper/servlet/TestJspServlet.java
+++ b/test/org/apache/jasper/servlet/TestJspServlet.java
@@ -32,6 +32,7 @@ import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.descriptor.web.ErrorPage;
+import org.apache.tomcat.util.http.Method;
public class TestJspServlet extends TomcatBaseTest {
@@ -60,7 +61,7 @@ public class TestJspServlet extends TomcatBaseTest {
// When using JaCoCo, the CI system seems to need a longer timeout
int rc = methodUrl("http://localhost:"; + getPort() + "/test/bug56568",
- new ByteChunk(), 30000, null, null, "PUT");
+ new ByteChunk(), 30000, null, null, Method.PUT);
// Make sure we get the original 500 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
@@ -74,7 +75,7 @@ public class TestJspServlet extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
int rc = methodUrl("http://localhost:"; + getPort() +
"/test/jsp/error.jsp",
- new ByteChunk(), 500000, null, null, "PUT");
+ new ByteChunk(), 500000, null, null, Method.PUT);
// Make sure we get a 200 response and not a 405 response
// which would indicate that error.jsp is complaining about being
called
@@ -88,7 +89,7 @@ public class TestJspServlet extends TomcatBaseTest {
getTomcatInstanceTestWebapp(false, true);
int rc = methodUrl("http://localhost:"; + getPort() +
"/test/jsp/test.jsp",
- new ByteChunk(), 500000, null, null, "PUT");
+ new ByteChunk(), 500000, null, null, Method.PUT);
// Make sure we get a 405 response which indicates that test.jsp is
// complaining about being called with the PUT method.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
