This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a4813f23bd Remove use of some deprecated methods
a4813f23bd is described below
commit a4813f23bd9837f024aea74f5a8d3730eb826fa5
Author: Mark Thomas <[email protected]>
AuthorDate: Tue Aug 11 16:11:39 2026 +0100
Remove use of some deprecated methods
---
test/org/apache/catalina/connector/TestRequest.java | 2 +-
test/org/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 +-
test/org/apache/tomcat/util/buf/TestMessageBytesIntegration.java | 2 +-
test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java | 4 ++--
test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/test/org/apache/catalina/connector/TestRequest.java
b/test/org/apache/catalina/connector/TestRequest.java
index 067e6e3c0c..c0537ef2fe 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/valves/TestParameterLimitValve.java
b/test/org/apache/catalina/valves/TestParameterLimitValve.java
index 8fdb3f4b18..f2c72ea66e 100644
--- a/test/org/apache/catalina/valves/TestParameterLimitValve.java
+++ b/test/org/apache/catalina/valves/TestParameterLimitValve.java
@@ -687,7 +687,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 c677aec844..c3385fbbdd 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 ae61fd31f1..ff4f87b255 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 831e0267c7..b8e084f92d 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 5087ccb1ee..92c3a10791 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/websocket/TestWebSocketFrameClientSSL.java
b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
index 6dec586ee9..5119afff31 100644
--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
@@ -87,7 +87,7 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
Context ctx = tomcat.addContext("", null);
ctx.addApplicationListener(TesterFirehoseServer.ConfigInline.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
- ctx.addServletMappingDecoded("/", "default");
+ ctx.addServletMapping("/", "default");
tomcat.start();
@@ -174,7 +174,7 @@ public class TestWebSocketFrameClientSSL extends
WebSocketBaseTest {
Context ctx = tomcat.addContext("", null);
ctx.addApplicationListener(TesterFirehoseServer.ConfigInline.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
- ctx.addServletMappingDecoded("/", "default");
+ ctx.addServletMapping("/", "default");
tomcat.start();
diff --git a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
index 8be6ff0faa..a9ef712073 100644
--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
+++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java
@@ -86,7 +86,7 @@ public class TestWsWebSocketContainerSSL extends
WebSocketBaseTest {
Context ctx = tomcat.addContext("", null);
ctx.addApplicationListener(TesterEchoServer.Config.class.getName());
Tomcat.addServlet(ctx, "default", new DefaultServlet());
- ctx.addServletMappingDecoded("/", "default");
+ ctx.addServletMapping("/", "default");
tomcat.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
