svn commit: r1734056 - in /tomcat/trunk/java/org/apache/catalina: connector/Request.java core/ApplicationMapping.java mapper/MappingData.java

[ma...@apache.org]

Author: markt
Date: Tue Mar  8 11:12:56 2016
New Revision: 1734056

URL: http://svn.apache.org/viewvc?rev=1734056&view=rev
Log:
Plumbing to support the implementation of javax.servlet.http.Mapping
This commit populates Mapping instances from the MappingData populated by the Mapper. Currently the Mapper simply populates the MappingData with the 'unknown' values for this feature.

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Request.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
    tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java

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=1734056&r1=1734055&r2=1734056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue Mar  8 11:12:56 2016
@@ -2179,7 +2179,7 @@ public class Request implements HttpServ
 
     @Override
     public Mapping getMapping() {
-        return new ApplicationMapping();
+        return new ApplicationMapping(mappingData);
     }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java?rev=1734056&r1=1734055&r2=1734056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationMapping.java Tue Mar  8 11:12:56 2016
@@ -19,24 +19,32 @@ package org.apache.catalina.core;
 import javax.servlet.http.Mapping;
 import javax.servlet.http.MappingMatch;
 
+import org.apache.catalina.mapper.MappingData;
+
 public class ApplicationMapping implements Mapping {
 
+    private final String matchValue;
+    private final String pattern;
+    private final MappingMatch mappingMatch;
+
+    public ApplicationMapping(MappingData mappingData) {
+        matchValue = mappingData.matchValue;
+        pattern = mappingData.matchPattern;
+        mappingMatch = mappingData.matchType;
+    }
+
     @Override
     public String getMatchValue() {
-        // TODO Auto-generated method stub
-        return "";
+        return matchValue;
     }
 
     @Override
     public String getPattern() {
-        // TODO Auto-generated method stub
-        return "";
+        return pattern;
     }
 
     @Override
     public MappingMatch getMatchType() {
-        // TODO Auto-generated method stub
-        return MappingMatch.UNKNOWN;
+        return mappingMatch;
     }
-
 }

Modified: tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java?rev=1734056&r1=1734055&r2=1734056&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/MappingData.java Tue Mar  8 11:12:56 2016
@@ -17,6 +17,8 @@
 
 package org.apache.catalina.mapper;
 
+import javax.servlet.http.MappingMatch;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.Host;
 import org.apache.catalina.Wrapper;
@@ -43,6 +45,11 @@ public class MappingData {
 
     public final MessageBytes redirectPath = MessageBytes.newInstance();
 
+    // Fields used by ApplicationMapping to implement javax.servlet.http.Mapping
+    public String matchValue = "";
+    public String matchPattern = "";
+    public MappingMatch matchType = MappingMatch.UNKNOWN;
+
     public void recycle() {
         host = null;
         context = null;
@@ -55,6 +62,8 @@ public class MappingData {
         wrapperPath.recycle();
         pathInfo.recycle();
         redirectPath.recycle();
+        matchValue = "";
+        matchPattern= "";
+        matchType = MappingMatch.UNKNOWN;
     }
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org