svn commit: r1458216 - in /tomcat/trunk/java: javax/websocket/server/ServerEndpointConfig.java org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java

[markt]

Author: markt
Date: Tue Mar 19 10:46:19 2013
New Revision: 1458216

URL: http://svn.apache.org/r1458216
Log:
Remove matchesURI as per EG discussion

Modified:
    tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
    
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java

Modified: tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java?rev=1458216&r1=1458215&r2=1458216&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java 
(original)
+++ tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java Tue Mar 
19 10:46:19 2013
@@ -16,11 +16,9 @@
  */
 package javax.websocket.server;
 
-import java.net.URI;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.ServiceLoader;
 
 import javax.websocket.Decoder;
@@ -187,24 +185,15 @@ public interface ServerEndpointConfig ex
             return 
fetchContainerDefaultConfigurator().getNegotiatedSubprotocol(supported, 
requested);
         }
 
-
         public List<Extension> getNegotiatedExtensions(List<Extension> 
installed,
                 List<Extension> requested) {
             return 
fetchContainerDefaultConfigurator().getNegotiatedExtensions(installed, 
requested);
         }
 
-
         public boolean checkOrigin(String originHeaderValue) {
             return 
fetchContainerDefaultConfigurator().checkOrigin(originHeaderValue);
         }
 
-
-        public boolean matchesURI(String path, URI requestUri,
-                Map<String, String> templateExpansion) {
-            return fetchContainerDefaultConfigurator().matchesURI(path, 
requestUri, templateExpansion);
-        }
-
-
         public void modifyHandshake(ServerEndpointConfig sec,
                 HandshakeRequest request, HandshakeResponse response) {
             fetchContainerDefaultConfigurator().modifyHandshake(sec, request, 
response);

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java?rev=1458216&r1=1458215&r2=1458216&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
 Tue Mar 19 10:46:19 2013
@@ -16,10 +16,8 @@
  */
 package org.apache.tomcat.websocket.server;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.websocket.Extension;
 import javax.websocket.HandshakeResponse;
@@ -75,39 +73,6 @@ public class DefaultServerEndpointConfig
     }
 
     @Override
-    public boolean matchesURI(String path, URI requestUri,
-            Map<String, String> templateExpansion) {
-
-        String requestPath = requestUri.getPath();
-
-        if (path.indexOf('{') == -1) {
-            // Simple case - not a template
-            return requestPath.equals(path);
-        }
-
-        String servletPath = WsServerContainer.getServletPath(path);
-        if (!requestPath.startsWith(servletPath)) {
-            return false;
-        }
-
-        Map<String,String> params;
-        try {
-            params = WsServerContainer.getServerContainer().getPathParameters(
-                    servletPath, requestPath.substring(servletPath.length()));
-        } catch (IllegalArgumentException iae) {
-            return false;
-        }
-
-        if (params.size() == 0) {
-            return false;
-        }
-
-        templateExpansion.putAll(params);
-
-        return true;
-    }
-
-    @Override
     public void modifyHandshake(ServerEndpointConfig sec,
             HandshakeRequest request, HandshakeResponse response) {
         // NO-OP



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