⚡ use trie mapping replace regex mapping

Author: hellokaton

blade-core/src/main/java/com/hellokaton/blade/mvc/route/Route.java

@@ -5,10 +5,10 @@
 import com.hellokaton.blade.mvc.ui.ResponseType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.EqualsAndHashCode;
+import lombok.Data;
 
 import java.lang.reflect.Method;
-import java.util.HashMap;
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -19,11 +19,11 @@
  * the Http method, and the method of executing the route
  *
  * @author <a href="mailto:hellokaton@gmail.com" target="_blank">hellokaton</a>
- * @since 1.5
+ * @since 2.1.2.RELEASE
  */
+@Data
 @Builder
 @AllArgsConstructor
-@EqualsAndHashCode
 public class Route {
 
     /**
@@ -36,6 +36,8 @@ public class Route {
      */
     private String path;
 
+    private String rewritePath;
+
     /**
      * Logical controller object
      */
@@ -61,16 +63,18 @@ public class Route {
      * Url path params
      */
     @Builder.Default
-    private Map<String, String> pathParams = new HashMap<>(2);
+    private Map<String, String> pathParams = Collections.emptyMap();
 
     public Route() {
         this.sort = Integer.MAX_VALUE;
     }
 
     public Route(HttpMethod httpMethod, String path, Class<?> targetType, Method action) {
-        super();
         this.httpMethod = httpMethod;
         this.path = PathKit.fixPath(path);
+        if (this.path.contains("*")) {
+            this.rewritePath = this.path.replaceAll("\\*", "");
+        }
         this.targetType = targetType;
         this.action = action;
         this.sort = Integer.MAX_VALUE;
@@ -81,6 +85,9 @@ public Route(HttpMethod httpMethod, String path, Object target,
         super();
         this.httpMethod = httpMethod;
         this.path = PathKit.fixPath(path);
+        if (this.path.contains("*")) {
+            this.rewritePath = this.path.replaceAll("\\*", "");
+        }
         this.target = target;
         this.targetType = targetType;
         this.action = action;
@@ -91,124 +98,21 @@ public Route(HttpMethod httpMethod, String path, Object target,
     public Route(Route route) {
         this.httpMethod = route.httpMethod;
         this.path = route.path;
+        if (this.path.contains("*")) {
+            this.rewritePath = this.path.replaceAll("\\*", "");
+        }
         this.target = route.target;
         this.targetType = route.targetType;
         this.action = route.action;
+        this.isWildcard = route.isWildcard;
         this.responseType = route.responseType;
         this.sort = route.sort;
     }
 
-    /**
-     * Return http method
-     *
-     * @return HttpMethod
-     */
-    public HttpMethod getHttpMethod() {
-        return httpMethod;
-    }
-
-    /**
-     * Return route path
-     *
-     * @return path string
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * Set route path
-     *
-     * @param path string path
-     */
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    /**
-     * Return route controller instance
-     *
-     * @return route handler instance
-     */
-    public Object getTarget() {
-        return target;
-    }
-
-    /**
-     * Set route handler instance
-     *
-     * @param target target bean
-     */
-    public void setTarget(Object target) {
-        this.target = target;
-    }
-
-    public void setWildcard(boolean wildcard) {
-        this.isWildcard = wildcard;
-    }
-
-    /**
-     * Return route method
-     *
-     * @return route Method
-     */
-    public Method getAction() {
-        return action;
-    }
-
-    /**
-     * Get route handler type
-     *
-     * @return return target type
-     */
-    public Class<?> getTargetType() {
-        return targetType;
-    }
-
-    /**
-     * Get route path parameters
-     *
-     * @return return path params
-     */
-    public Map<String, String> getPathParams() {
-        return this.pathParams;
-    }
-
-    /**
-     * Set path params
-     *
-     * @param pathParams path params map
-     */
-    public void setPathParams(Map<String, String> pathParams) {
-        this.pathParams = pathParams;
-    }
-
-    /**
-     * Get route execution sort, default is Integer.MAX_VALUE
-     *
-     * @return return sort
-     */
-    public int getSort() {
-        return sort;
-    }
-
-    /**
-     * Set route execution sort
-     *
-     * @param sort sort number
-     */
-    public void setSort(int sort) {
-        this.sort = sort;
-    }
-
     public String getAllPath() {
         return this.path + "#" + this.httpMethod.name();
     }
 
-    public ResponseType getResponseType() {
-        return this.responseType;
-    }
-
     /**
      * Route to string
      *

blade-core/src/main/java/com/hellokaton/blade/mvc/route/RouteBuilder.java

@@ -98,7 +98,7 @@ private void parseRoute(RouteStruct routeStruct) {
         for (String path : paths) {
             String pathV = getRoutePath(path, routeStruct.nameSpace, routeStruct.suffix);
 
-            routeMatcher.addRoute(com.hellokaton.blade.mvc.route.Route.builder()
+            routeMatcher.addRoute(Route.builder()
                     .target(routeStruct.controller)
                     .targetType(routeStruct.routeType)
                     .action(routeStruct.method)

blade-core/src/main/java/com/hellokaton/blade/mvc/route/RouteMatcher.java

@@ -74,9 +74,6 @@ private Route addRoute(HttpMethod httpMethod, String path, Object controller,
             if (null != order) {
                 route.setSort(order.value());
             }
-            if (route.getPath().contains("*")) {
-                route.setPath(route.getPath().replaceAll("\\*", ""));
-            }
             if (this.hooks.containsKey(key)) {
                 this.hooks.get(key).add(route);
             } else {
@@ -121,7 +118,7 @@ public void route(String path, Class<?> clazz, String methodName, HttpMethod htt
             for (Method method : methods) {
                 if (method.getName().equals(methodName)) {
                     Object controller = controllerPool.computeIfAbsent(clazz, k -> ReflectKit.newInstance(clazz));
-                    addRoute(httpMethod, path, controller, clazz, method, null);
+                    this.addRoute(httpMethod, path, controller, clazz, method, null);
                 }
             }
         } catch (Exception e) {
@@ -161,7 +158,8 @@ public List<Route> getBefore(String path) {
         List<Route> collect = hooks.values().stream()
                 .flatMap(Collection::stream)
                 .sorted(Comparator.comparingInt(Route::getSort))
-                .filter(route -> route.getHttpMethod() == HttpMethod.BEFORE && matchesPath(route.getPath(), cleanPath))
+                .filter(route -> route.getHttpMethod() == HttpMethod.BEFORE)
+                .filter(route -> matchesPath(route.getPath(), cleanPath))
                 .collect(Collectors.toList());
 
         this.giveMatch(path, collect);
@@ -179,7 +177,8 @@ public List<Route> getAfter(String path) {
         List<Route> afters = hooks.values().stream()
                 .flatMap(Collection::stream)
                 .sorted(Comparator.comparingInt(Route::getSort))
-                .filter(route -> route.getHttpMethod() == HttpMethod.AFTER && matchesPath(route.getPath(), cleanPath))
+                .filter(route -> route.getHttpMethod() == HttpMethod.AFTER)
+                .filter(route -> matchesPath(route.getPath(), cleanPath))
                 .collect(Collectors.toList());
 
         this.giveMatch(path, afters);
@@ -220,9 +219,6 @@ private void giveMatch(final String uri, List<Route> routes) {
      * @return return match is success
      */
     private boolean matchesPath(String routePath, String pathToMatch) {
-        if ("/".equals(routePath)) {
-            return true;
-        }
         return pathToMatch.startsWith(routePath);
     }
 

blade-core/src/main/java/com/hellokaton/blade/mvc/route/mapping/dynamic/TrieMapping.java

@@ -12,18 +12,18 @@
 
 /**
  * Trie tree based url route
- *
+ * <p>
  * Support:
- *  - * : match any one part
- *  - /* : match suffix with any number of parts
- *  - :xxx : match one part as path variable
- *
+ * - * : match any one part
+ * - /* : match suffix with any number of parts
+ * - :xxx : match one part as path variable
+ * <p>
  * Example:
- *  - /aaa/* :   /aaa/bbb, /aaa/bbb/ccc
- *  - /aaa/*\/ccc : /aaa/bbb/ccc, /aaa/ddd/ccc
- *  - /aaa/*\/ccc/*
- *  - /aaa/bbb/:id : /aaa/bbb/ccc
- *  - /aaa/bbb/:name/:id
+ * - /aaa/* :   /aaa/bbb, /aaa/bbb/ccc
+ * - /aaa/*\/ccc : /aaa/bbb/ccc, /aaa/ddd/ccc
+ * - /aaa/*\/ccc/*
+ * - /aaa/bbb/:id : /aaa/bbb/ccc
+ * - /aaa/bbb/:name/:id
  *
  * @author: dqyuan
  * @date: 2020/06/25
@@ -107,15 +107,16 @@ public Node putChildIfAbsent(Node child, boolean isEnd) {
                         return staticChildren.computeIfAbsent(child.getPart(), ignore -> child);
                     }
                     throw new IllegalStateException(
-                      String.format("%s conflict with path %s", child.getPart(),
-                              dynamicChild.getPart())
+                            String.format("%s conflict with path %s", child.getPart(),
+                                    dynamicChild.getPart())
                     );
             }
             throw new IllegalStateException();
         }
 
         /**
          * is end of a url
+         *
          * @return
          */
         public boolean isEnd() {
@@ -147,19 +148,14 @@ public void addRoute(HttpMethod httpMethod, Route route, List<String> uriVariabl
 
         Node prev = root;
 
-        if ("/".equals(route.getPath())) {
-            Node nodeByPart = getNodeByPart(path);
-            if (NodeType.WILD.equals(nodeByPart.type)) {
-                route.setWildcard(true);
-            }
-            prev = prev.putChildIfAbsent(nodeByPart, true);
-            prev.getRouteMap().put(httpMethod, route);
-            return;
+        String[] parts;
+        if ("/".equals(path)) {
+            parts = new String[]{"/"};
+        } else {
+            path = StringKit.strip(path, "/");
+            parts = path.split("/");
         }
 
-        path = StringKit.strip(route.getPath(), "/");
-
-        String[] parts = path.split("/");
         for (int i = 0; i < parts.length; i++) {
             String part = parts[i];
             if (StringKit.isBlank(part)) {
@@ -201,7 +197,7 @@ public void register() {
     @Override
     public Route findRoute(String httpMethod, String path) {
         HttpMethod requestMethod = HttpMethod.valueOf(httpMethod);
-        Map<String, String> uriVariables = new LinkedHashMap<>(2);
+        Map<String, String> uriVariables = null;
         Iterator<String> partIter = partIter(path);
         Node prev = root;
         walk:
@@ -227,6 +223,9 @@ public Route findRoute(String httpMethod, String path) {
                     }
                     prev = prev.getDynamicChild();
                     if (prev.getType() == NodeType.PARAM) {
+                        if (null == uriVariables) {
+                            uriVariables = new LinkedHashMap<>(2);
+                        }
                         uriVariables.put(prev.getPart().substring(1), part);
                     }
                     break;
@@ -243,7 +242,9 @@ public Route findRoute(String httpMethod, String path) {
                 return null;
             }
             Route route = new Route(selectedRoute);
-            route.setPathParams(uriVariables);
+            if (null != uriVariables) {
+                route.setPathParams(uriVariables);
+            }
             return route;
         }
 
@@ -257,6 +258,11 @@ protected Iterator<String> partIter(String path) {
 
             @Override
             public boolean hasNext() {
+                if (this.start == 1 && "/".equals(path)) {
+//                    return true;
+                    this.start = 0;
+                    this.end = 1;
+                }
                 return end <= path.length();
             }
 

blade-core/src/main/java/com/hellokaton/blade/server/StaticFileHandler.java

@@ -105,11 +105,12 @@ public void handle(WebContext webContext) throws Exception {
 
         Instant start = Instant.now();
 
-        Route route = webContext.getRoute();
-
         String uri = request.attribute(REQUEST_TO_STATIC_ATTR);
         if (null != uri) {
-
+            Route route = webContext.getRoute();
+            if (route.isWildcard()) {
+                uri = uri + request.uri().replace(route.getRewritePath(), "");
+            }
         } else {
             uri = URLDecoder.decode(request.uri(), "UTF-8");
         }
@@ -314,7 +315,7 @@ private File getGradleResourcesDirectory() {
     private String getCleanURL(Request request, String uri) {
         uri = PathKit.cleanPath(uri.replaceFirst(request.contextPath(), "/"));
         if (uri.endsWith("/")) {
-            uri = uri.substring(0, uri.length() - 1);
+            uri = StringKit.stripEnd(uri, "/");
         }
         return uri;
     }