From f3efded0658a983a2b85dc297e4769cd8a1f440c Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 21 Jul 2016 17:07:10 +1000
Subject: [PATCH] Servlet 4.0 getMappings rough implementation #746

---
 .../org/eclipse/jetty/server/Request.java     | 66 +++++++++++++------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
index 6e1131a193f..3de0ce4387f 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
@@ -2416,13 +2416,51 @@ public class Request implements HttpServletRequest
     public Mapping getMapping() 
     {
         final PathSpec pathSpec = _pathSpec;
-        final String servletPath = _servletPath;
+        final MappingMatch match;
+        final String mapping;
+        if (pathSpec instanceof ServletPathSpec)
+        {
+            switch(((ServletPathSpec)pathSpec).getGroup())
+            {
+                case ROOT:
+                    match = MappingMatch.CONTEXT_ROOT;
+                    mapping = "";
+                    break;
+                case DEFAULT:
+                    match = MappingMatch.DEFAULT;
+                    mapping = "/";
+                    break;
+                case EXACT:
+                    match = MappingMatch.EXACT;
+                    mapping = _servletPath;
+                    break;
+                case SUFFIX_GLOB:
+                    match = MappingMatch.EXTENSION;
+                    int dot = _servletPath.lastIndexOf('.');
+                    mapping = _servletPath.substring(0,dot);
+                    break;
+                case PREFIX_GLOB:
+                    match = MappingMatch.PATH;
+                    mapping = _servletPath;
+                    break;
+                default:
+                    match = MappingMatch.UNKNOWN;
+                    mapping = _servletPath;
+                    break;
+            }
+        }
+        else
+        {
+            match = MappingMatch.UNKNOWN;
+            mapping = _servletPath;
+        }
+        
         return new Mapping()
         {
             @Override
             public String getMatchValue()
             {   
-                return servletPath;
+                return mapping;
             }
 
             @Override
@@ -2436,27 +2474,13 @@ public class Request implements HttpServletRequest
             @Override
             public MappingMatch getMatchType()
             {
-                if (pathSpec instanceof ServletPathSpec)
-                {
-                    switch(((ServletPathSpec)pathSpec).getGroup())
-                    {
-                        case EXACT:
-                            return MappingMatch.EXACT;
-                        case ROOT:
-                            return MappingMatch.CONTEXT_ROOT;
-                        case PREFIX_GLOB:
-                            return MappingMatch.PATH;
-                        case SUFFIX_GLOB:
-                            return MappingMatch.EXTENSION;
-                                                        
-                        default:
-                            return MappingMatch.UNKNOWN;
-                    }
-                }
-                else
-                    return MappingMatch.UNKNOWN;
+                return match;
             }
             
+            public String getServletName() 
+            {
+                return null;
+            }
         };
     }