You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/03/08 11:59:18 UTC
svn commit: r1734054 - in /tomcat/trunk: java/javax/servlet/http/
java/org/apache/catalina/connector/ test/org/apache/catalina/filters/
Author: markt
Date: Tue Mar 8 10:59:18 2016
New Revision: 1734054
URL: http://svn.apache.org/viewvc?rev=1734054&view=rev
Log:
As per EG discussion, start to implement SERVLET_SPEC-73
This adds the stubs. Implementation to follow
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java?rev=1734054&r1=1734053&r2=1734054&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequest.java Tue Mar 8 10:59:18 2016
@@ -170,6 +170,26 @@ public interface HttpServletRequest exte
*/
public int getIntHeader(String name);
+ public default Mapping getMapping() {
+ return new Mapping() {
+
+ @Override
+ public String getMatchValue() {
+ return "";
+ }
+
+ @Override
+ public String getPattern() {
+ return "";
+ }
+
+ @Override
+ public MappingMatch getMatchType() {
+ return MappingMatch.UNKNOWN;
+ }
+ };
+ }
+
/**
* Returns the name of the HTTP method with which this request was made, for
* example, GET, POST, or PUT. Same as the value of the CGI variable
Modified: tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java?rev=1734054&r1=1734053&r2=1734054&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServletRequestWrapper.java Tue Mar 8 10:59:18 2016
@@ -115,6 +115,15 @@ public class HttpServletRequestWrapper e
}
/**
+ * The default behavior of this method is to return getMapping() on the
+ * wrapped request object.
+ */
+ @Override
+ public Mapping getMapping() {
+ return this._getHttpServletRequest().getMapping();
+ }
+
+ /**
* The default behavior of this method is to return getMethod() on the
* wrapped request object.
*/
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1734054&r1=1734053&r2=1734054&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Mar 8 10:59:18 2016
@@ -63,6 +63,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Mapping;
import javax.servlet.http.Part;
import javax.servlet.http.PushBuilder;
@@ -75,6 +76,7 @@ import org.apache.catalina.Realm;
import org.apache.catalina.Session;
import org.apache.catalina.TomcatPrincipal;
import org.apache.catalina.Wrapper;
+import org.apache.catalina.core.ApplicationMapping;
import org.apache.catalina.core.ApplicationPart;
import org.apache.catalina.core.ApplicationPushBuilder;
import org.apache.catalina.core.ApplicationSessionCookieConfig;
@@ -2175,6 +2177,12 @@ public class Request implements HttpServ
}
+ @Override
+ public Mapping getMapping() {
+ return new ApplicationMapping();
+ }
+
+
/**
* @return the HTTP request method used in this Request.
*/
Modified: tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java?rev=1734054&r1=1734053&r2=1734054&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/RequestFacade.java Tue Mar 8 10:59:18 2016
@@ -38,6 +38,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Mapping;
import javax.servlet.http.Part;
import javax.servlet.http.PushBuilder;
@@ -736,6 +737,18 @@ public class RequestFacade implements Ht
}
+ @Override
+ public Mapping getMapping() {
+
+ if (request == null) {
+ throw new IllegalStateException(
+ sm.getString("requestFacade.nullRequest"));
+ }
+
+ return request.getMapping();
+ }
+
+
@Override
public String getMethod() {
Modified: tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java?rev=1734054&r1=1734053&r2=1734054&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TesterHttpServletRequest.java Tue Mar 8 10:59:18 2016
@@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpUpgradeHandler;
+import javax.servlet.http.Mapping;
import javax.servlet.http.Part;
import javax.servlet.http.PushBuilder;
@@ -263,6 +264,11 @@ public class TesterHttpServletRequest im
throw new RuntimeException("Not implemented");
}
+ @Override
+ public Mapping getMapping() {
+ throw new RuntimeException("Not implemented");
+ }
+
@Override
public String getMethod() {
return method;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org