This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new cc0510a5c2 Remove use of some deprecated methods
cc0510a5c2 is described below
commit cc0510a5c2aa32d2e19ecedb6a72666f394f0aec
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 11 16:17:24 2026 +0100
Remove use of some deprecated methods
---
test/org/apache/catalina/connector/TestRequest.java | 2 +-
test/org/apache/catalina/core/TestStandardWrapper.java | 4 ++--
.../apache/catalina/valves/TestParameterLimitValve.java | 2 +-
test/org/apache/coyote/http11/TestHttp11InputBuffer.java | 2 +-
test/org/apache/coyote/http2/TestHttp2Section_6_6.java | 4 ++--
test/org/apache/tomcat/security/TestSecurity2023.java | 2 +-
.../tomcat/util/buf/TestMessageBytesIntegration.java | 2 +-
test/org/apache/tomcat/util/http/CookiesBaseTest.java | 14 +++++++-------
test/org/apache/tomcat/util/http/TestBug49158.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/test/org/apache/catalina/connector/TestRequest.java b/test/org/apache/catalina/connector/TestRequest.java
index 82a17e4f8c..dfb25a2892 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -179,7 +179,7 @@ public class TestRequest extends TomcatBaseTest {
failedRequestFilter.setFilterClass(FailedRequestFilter.class.getName());
FilterMap failedRequestFilterMap = new FilterMap();
failedRequestFilterMap.setFilterName("failedRequestFilter");
- failedRequestFilterMap.addURLPatternDecoded("/*");
+ failedRequestFilterMap.addURLPattern("/*");
root.addFilterDef(failedRequestFilter);
root.addFilterMap(failedRequestFilterMap);
}
diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java b/test/org/apache/catalina/core/TestStandardWrapper.java
index 2c6cab3695..6b30949c8e 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -498,7 +498,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, "Bug51445", new Bug51445Servlet());
- ctx.addServletMappingDecoded("/", "Bug51445");
+ ctx.addServletMapping("/", "Bug51445");
tomcat.start();
@@ -544,7 +544,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
wrapper.setServletName("Bug51445");
wrapper.setServletClass(Bug51445Servlet.class.getName());
ctx.addChild(wrapper);
- ctx.addServletMappingDecoded("/", "Bug51445");
+ ctx.addServletMapping("/", "Bug51445");
tomcat.start();
diff --git a/test/org/apache/catalina/valves/TestParameterLimitValve.java b/test/org/apache/catalina/valves/TestParameterLimitValve.java
index 16a7f74bc6..5f5aab6eeb 100644
--- a/test/org/apache/catalina/valves/TestParameterLimitValve.java
+++ b/test/org/apache/catalina/valves/TestParameterLimitValve.java
@@ -688,7 +688,7 @@ public class TestParameterLimitValve extends TomcatBaseTest {
failedRequestFilter.setFilterClass(FailedRequestFilter.class.getName());
FilterMap failedRequestFilterMap = new FilterMap();
failedRequestFilterMap.setFilterName("failedRequestFilter");
- failedRequestFilterMap.addURLPatternDecoded("/*");
+ failedRequestFilterMap.addURLPattern("/*");
context.addFilterDef(failedRequestFilter);
context.addFilterMap(failedRequestFilterMap);
}
diff --git a/test/org/apache/coyote/http11/TestHttp11InputBuffer.java b/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
index 78ded9a48f..a5b896e862 100644
--- a/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
+++ b/test/org/apache/coyote/http11/TestHttp11InputBuffer.java
@@ -589,7 +589,7 @@ public class TestHttp11InputBuffer extends TomcatBaseTest {
Context root = tomcat.addContext("", TEMP_DIR);
Tomcat.addServlet(root, "Bug59089", new TesterServlet());
- root.addServletMappingDecoded("/test", "Bug59089");
+ root.addServletMapping("/test", "Bug59089");
try {
Connector connector = tomcat.getConnector();
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_6_6.java b/test/org/apache/coyote/http2/TestHttp2Section_6_6.java
index 85b68f52c2..1861808b31 100644
--- a/test/org/apache/coyote/http2/TestHttp2Section_6_6.java
+++ b/test/org/apache/coyote/http2/TestHttp2Section_6_6.java
@@ -89,10 +89,10 @@ public class TestHttp2Section_6_6 extends Http2TestBase {
Context ctxt = tomcat.addContext("", null);
Tomcat.addServlet(ctxt, "simple", new SimpleServlet());
- ctxt.addServletMappingDecoded("/simple", "simple");
+ ctxt.addServletMapping("/simple", "simple");
Tomcat.addServlet(ctxt, "push", new PushServlet());
- ctxt.addServletMappingDecoded("/push", "push");
+ ctxt.addServletMapping("/push", "push");
tomcat.start();
}
diff --git a/test/org/apache/tomcat/security/TestSecurity2023.java b/test/org/apache/tomcat/security/TestSecurity2023.java
index 268187f5c2..3e794dab64 100644
--- a/test/org/apache/tomcat/security/TestSecurity2023.java
+++ b/test/org/apache/tomcat/security/TestSecurity2023.java
@@ -83,7 +83,7 @@ public class TestSecurity2023 extends TomcatBaseTest {
context.addFilterDef(filterDef);
FilterMap filterMap = new FilterMap();
filterMap.setFilterName(filterDef.getFilterName());
- filterMap.addURLPatternDecoded("*");
+ filterMap.addURLPattern("*");
context.addFilterMap(filterMap);
tomcat.start();
diff --git a/test/org/apache/tomcat/util/buf/TestMessageBytesIntegration.java b/test/org/apache/tomcat/util/buf/TestMessageBytesIntegration.java
index 64be05e036..251962a54b 100644
--- a/test/org/apache/tomcat/util/buf/TestMessageBytesIntegration.java
+++ b/test/org/apache/tomcat/util/buf/TestMessageBytesIntegration.java
@@ -55,7 +55,7 @@ public class TestMessageBytesIntegration extends TomcatBaseTest {
// Add servlet
Tomcat.addServlet(ctx, "MixUpServlet", new MixUpServlet());
- ctx.addServletMappingDecoded("/mixup", "MixUpServlet");
+ ctx.addServletMapping("/mixup", "MixUpServlet");
tomcat.start();
diff --git a/test/org/apache/tomcat/util/http/CookiesBaseTest.java b/test/org/apache/tomcat/util/http/CookiesBaseTest.java
index 2fd435c26d..c81b3e6b22 100644
--- a/test/org/apache/tomcat/util/http/CookiesBaseTest.java
+++ b/test/org/apache/tomcat/util/http/CookiesBaseTest.java
@@ -72,21 +72,21 @@ public abstract class CookiesBaseTest extends TomcatBaseTest {
ctx.setCookieProcessor(new LegacyCookieProcessor());
Tomcat.addServlet(ctx, "invalid", new CookieServlet("na;me", "value"));
- ctx.addServletMappingDecoded("/invalid", "invalid");
+ ctx.addServletMapping("/invalid", "invalid");
Tomcat.addServlet(ctx, "null", new CookieServlet(null, "value"));
- ctx.addServletMappingDecoded("/null", "null");
+ ctx.addServletMapping("/null", "null");
Tomcat.addServlet(ctx, "blank", new CookieServlet("", "value"));
- ctx.addServletMappingDecoded("/blank", "blank");
+ ctx.addServletMapping("/blank", "blank");
Tomcat.addServlet(ctx, "invalidFwd",
new CookieServlet("na/me", "value"));
- ctx.addServletMappingDecoded("/invalidFwd", "invalidFwd");
+ ctx.addServletMapping("/invalidFwd", "invalidFwd");
Tomcat.addServlet(ctx, "invalidStrict",
new CookieServlet("$name", "value"));
- ctx.addServletMappingDecoded("/invalidStrict", "invalidStrict");
+ ctx.addServletMapping("/invalidStrict", "invalidStrict");
Tomcat.addServlet(ctx, "valid", new CookieServlet("name", "value"));
- ctx.addServletMappingDecoded("/valid", "valid");
+ ctx.addServletMapping("/valid", "valid");
Tomcat.addServlet(ctx, "switch", new CookieServlet("name", "val?ue"));
- ctx.addServletMappingDecoded("/switch", "switch");
+ ctx.addServletMapping("/switch", "switch");
}
diff --git a/test/org/apache/tomcat/util/http/TestBug49158.java b/test/org/apache/tomcat/util/http/TestBug49158.java
index 63d2addaaa..deed336d3a 100644
--- a/test/org/apache/tomcat/util/http/TestBug49158.java
+++ b/test/org/apache/tomcat/util/http/TestBug49158.java
@@ -62,7 +62,7 @@ public class TestBug49158 extends CookiesBaseTest {
Context ctx = tomcat.addContext("", null);
Tomcat.addServlet(ctx, path, new TestBug49158Servlet());
- ctx.addServletMappingDecoded("/"+path, path);
+ ctx.addServletMapping("/"+path, path);
}
public static class TestBug49158Servlet extends HttpServlet {
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.