This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 6f65b81e72 Revert unwanted jakarta changes due to record
6f65b81e72 is described below
commit 6f65b81e727adc1f1152976d13834b48967ae383
Author: remm <[email protected]>
AuthorDate: Thu Mar 20 01:32:32 2025 +0100
Revert unwanted jakarta changes due to record
---
java/jakarta/servlet/http/HttpServletMapping.java | 6 +++---
java/jakarta/servlet/http/HttpServletRequest.java | 6 +++---
.../apache/catalina/core/ApplicationMapping.java | 16 +++++++++++++++
...estApplicationContextGetRequestDispatcherB.java | 12 +++++------
.../catalina/core/TestApplicationMapping.java | 24 +++++++++++-----------
5 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/java/jakarta/servlet/http/HttpServletMapping.java
b/java/jakarta/servlet/http/HttpServletMapping.java
index eeee600ebf..ae88d321de 100644
--- a/java/jakarta/servlet/http/HttpServletMapping.java
+++ b/java/jakarta/servlet/http/HttpServletMapping.java
@@ -28,19 +28,19 @@ public interface HttpServletMapping {
/**
* @return The value that was matched or the empty String if not known.
*/
- String matchValue();
+ String getMatchValue();
/**
* @return The {@code url-pattern} that matched this request or the empty
String if not known.
*/
- String pattern();
+ String getPattern();
/**
* @return The name of the servlet (as specified in web.xml, {@link
WebServlet#name()},
* {@link jakarta.servlet.ServletContext#addServlet(String,
Class)} or one of the other
* <code>addServlet()</code> methods) that the request was
mapped to.
*/
- String servletName();
+ String getServletName();
/**
* @return The type of match ({@code null} if not known)
diff --git a/java/jakarta/servlet/http/HttpServletRequest.java
b/java/jakarta/servlet/http/HttpServletRequest.java
index e83e1a00cd..277bc32fbc 100644
--- a/java/jakarta/servlet/http/HttpServletRequest.java
+++ b/java/jakarta/servlet/http/HttpServletRequest.java
@@ -160,17 +160,17 @@ public interface HttpServletRequest extends
ServletRequest {
return new HttpServletMapping() {
@Override
- public String matchValue() {
+ public String getMatchValue() {
return "";
}
@Override
- public String pattern() {
+ public String getPattern() {
return "";
}
@Override
- public String servletName() {
+ public String getServletName() {
return "";
}
diff --git a/java/org/apache/catalina/core/ApplicationMapping.java
b/java/org/apache/catalina/core/ApplicationMapping.java
index 9a7b0369ec..61444f6920 100644
--- a/java/org/apache/catalina/core/ApplicationMapping.java
+++ b/java/org/apache/catalina/core/ApplicationMapping.java
@@ -82,6 +82,22 @@ public class ApplicationMapping {
private record MappingImpl(String matchValue, String pattern, MappingMatch
mappingType,
String servletName) implements
HttpServletMapping {
+
+ @Override
+ public String getMatchValue() {
+ return matchValue;
+ }
+
+ @Override
+ public String getPattern() {
+ return pattern;
+ }
+
+ @Override
+ public String getServletName() {
+ return servletName;
+ }
+
@Override
public MappingMatch getMappingMatch() {
return mappingType;
diff --git
a/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
b/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
index 7d0f3a93ad..401fd89933 100644
---
a/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
+++
b/test/org/apache/catalina/core/TestApplicationContextGetRequestDispatcherB.java
@@ -530,9 +530,9 @@ public class TestApplicationContextGetRequestDispatcherB
extends TomcatBaseTest
Assert.assertEquals(expectedQueryString, req.getQueryString());
HttpServletMapping mapping = req.getHttpServletMapping();
Assert.assertEquals(expectedMappingMatch,
mapping.getMappingMatch());
- Assert.assertEquals(expectedMappingPattern, mapping.pattern());
- Assert.assertEquals(expectedMappingMatchValue,
mapping.matchValue());
- Assert.assertEquals(expectedMappingServletName,
mapping.servletName());
+ Assert.assertEquals(expectedMappingPattern, mapping.getPattern());
+ Assert.assertEquals(expectedMappingMatchValue,
mapping.getMatchValue());
+ Assert.assertEquals(expectedMappingServletName,
mapping.getServletName());
for (DispatcherType type : DispatcherType.values()) {
if (type == dispatcherType) {
@@ -554,11 +554,11 @@ public class TestApplicationContextGetRequestDispatcherB
extends TomcatBaseTest
Assert.assertEquals(expectedDispatcherMappingMatch,
dispatcherMapping.getMappingMatch());
Assert.assertEquals(expectedDispatcherMappingPattern,
- dispatcherMapping.pattern());
+ dispatcherMapping.getPattern());
Assert.assertEquals(expectedDispatcherMappingMatchValue,
- dispatcherMapping.matchValue());
+ dispatcherMapping.getMatchValue());
Assert.assertEquals(expectedDispatcherMappingServletName,
- dispatcherMapping.servletName());
+ dispatcherMapping.getServletName());
} else if (type == DispatcherType.ERROR || type ==
DispatcherType.REQUEST) {
// Skip - not tested
} else {
diff --git a/test/org/apache/catalina/core/TestApplicationMapping.java
b/test/org/apache/catalina/core/TestApplicationMapping.java
index 4dcfb35ad2..39fcb9933b 100644
--- a/test/org/apache/catalina/core/TestApplicationMapping.java
+++ b/test/org/apache/catalina/core/TestApplicationMapping.java
@@ -341,34 +341,34 @@ public class TestApplicationMapping extends
TomcatBaseTest {
resp.setContentType("text/plain;charset=UTF-8");
PrintWriter pw = resp.getWriter();
HttpServletMapping mapping = req.getHttpServletMapping();
- pw.println("MatchValue=[" + mapping.matchValue() + "]");
- pw.println("Pattern=[" + mapping.pattern() + "]");
+ pw.println("MatchValue=[" + mapping.getMatchValue() + "]");
+ pw.println("Pattern=[" + mapping.getPattern() + "]");
pw.println("MatchType=[" + mapping.getMappingMatch() + "]");
- pw.println("ServletName=[" + mapping.servletName() + "]");
+ pw.println("ServletName=[" + mapping.getServletName() + "]");
HttpServletMapping includeMapping =
(HttpServletMapping)
req.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
if (includeMapping != null) {
- pw.println("IncludeMatchValue=[" + includeMapping.matchValue()
+ "]");
- pw.println("IncludePattern=[" + includeMapping.pattern() +
"]");
+ pw.println("IncludeMatchValue=[" +
includeMapping.getMatchValue() + "]");
+ pw.println("IncludePattern=[" + includeMapping.getPattern() +
"]");
pw.println("IncludeMatchType=[" +
includeMapping.getMappingMatch() + "]");
- pw.println("IncludeServletName=[" +
includeMapping.servletName() + "]");
+ pw.println("IncludeServletName=[" +
includeMapping.getServletName() + "]");
}
HttpServletMapping forwardMapping =
(HttpServletMapping)
req.getAttribute(RequestDispatcher.FORWARD_MAPPING);
if (forwardMapping != null) {
- pw.println("ForwardMatchValue=[" + forwardMapping.matchValue()
+ "]");
- pw.println("ForwardPattern=[" + forwardMapping.pattern() +
"]");
+ pw.println("ForwardMatchValue=[" +
forwardMapping.getMatchValue() + "]");
+ pw.println("ForwardPattern=[" + forwardMapping.getPattern() +
"]");
pw.println("ForwardMatchType=[" +
forwardMapping.getMappingMatch() + "]");
- pw.println("ForwardServletName=[" +
forwardMapping.servletName() + "]");
+ pw.println("ForwardServletName=[" +
forwardMapping.getServletName() + "]");
}
HttpServletMapping asyncMapping =
(HttpServletMapping)
req.getAttribute(AsyncContext.ASYNC_MAPPING);
if (asyncMapping != null) {
- pw.println("AsyncMatchValue=[" + asyncMapping.matchValue() +
"]");
- pw.println("AsyncPattern=[" + asyncMapping.pattern() + "]");
+ pw.println("AsyncMatchValue=[" + asyncMapping.getMatchValue()
+ "]");
+ pw.println("AsyncPattern=[" + asyncMapping.getPattern() + "]");
pw.println("AsyncMatchType=[" + asyncMapping.getMappingMatch()
+ "]");
- pw.println("AsyncServletName=[" + asyncMapping.servletName() +
"]");
+ pw.println("AsyncServletName=[" +
asyncMapping.getServletName() + "]");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
