MVC: multiple path values

Author: jknack

jooby/src/main/java/io/jooby/annotations/GET.java

@@ -225,4 +225,11 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
 public @interface GET {
+  String[] value() default {};
+
+  String[] path() default {};
+
+  String[] produces() default {};
+
+  String[] consumes() default {};
 }

jooby/src/main/java/io/jooby/internal/RouterImpl.java

@@ -44,6 +44,7 @@
 import javax.inject.Provider;
 import java.io.FileNotFoundException;
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -71,17 +72,12 @@ private static class Stack {
     private String pattern;
     private Executor executor;
     private List<Route.Decorator> filters = new ArrayList<>();
-    private List<Renderer> renderers = new ArrayList<>();
     private List<Route.After> afters = new ArrayList<>();
 
     public Stack(String pattern) {
       this.pattern = pattern;
     }
 
-    public void then(Renderer renderer) {
-      renderers.add(renderer);
-    }
-
     public void then(Route.Decorator filter) {
       filters.add(filter);
     }
@@ -98,13 +94,8 @@ public Stream<Route.After> toAfter() {
       return afters.stream();
     }
 
-    public Stream<Renderer> toRenderer() {
-      return renderers.stream();
-    }
-
     public void clear() {
       this.filters.clear();
-      this.renderers.clear();
       this.afters.clear();
       executor = null;
     }
@@ -133,7 +124,6 @@ public Stack executor(Executor executor) {
     }
   };
 
-
   private ErrorHandler err;
 
   private Map<String, StatusCode> errorCodes;
@@ -593,19 +583,21 @@ private void mvc(String prefix, Class type, Provider provider) {
   }
 
   private void find(String prefix, Class type, Throwing.Consumer<MvcMethod> consumer) {
-    String classPath = prefix == null ? path(type) : prefix + "/" + path(type);
     MvcMetadata mvcMetadata = new MvcMetadata(source);
     mvcMetadata.parse(type);
     List<MvcMethod> routes = new ArrayList<>();
     Stream.of(type.getDeclaredMethods())
         .forEach(method -> {
           if (Modifier.isPublic(method.getModifiers())) {
             mvcAnnotations.httpMethod(method).forEach(httpMethod -> {
-              MvcMethod mvc = mvcMetadata.get(method);
-              mvc.setPattern(classPath + "/" + path(method));
-              mvc.setMethod(method);
-              mvc.setHttpMethod(httpMethod);
-              routes.add(mvc);
+              String[] paths = pathPrefix(prefix, path(method));
+              for (String path : paths) {
+                MvcMethod mvc = mvcMetadata.create(method);
+                mvc.setPattern(path);
+                mvc.setMethod(method);
+                mvc.setHttpMethod(httpMethod);
+                routes.add(mvc);
+              }
             });
           }
         });
@@ -614,9 +606,38 @@ private void find(String prefix, Class type, Throwing.Consumer<MvcMethod> consum
     mvcMetadata.destroy();
   }
 
-  private String path(AnnotatedElement type) {
-    String path = mvcAnnotations.pathPattern(type);
-    return path == null ? "" : path;
+  private String[] pathPrefix(String prefix, String[] path) {
+    if (prefix == null) {
+      return path;
+    }
+    String[] result = new String[path.length];
+    for (int i = 0; i < path.length; i++) {
+      result[i] = prefix + "/" + path[i];
+    }
+    return result;
+  }
+
+  private String[] path(Method m) {
+    String[] path = mvcAnnotations.pathPattern(m);
+    String[] root = mvcAnnotations.pathPattern(m.getDeclaringClass());
+    if (root == null) {
+      if (path == null) {
+        return new String[] {"/"};
+      }
+      return path;
+    }
+    if (path == null) {
+      return root;
+    }
+    String[] result = new String[root.length * path.length];
+    int k = 0;
+    for (String base : root) {
+      for (String element : path) {
+        result[k] = base + "/" + element;
+        k += 1;
+      }
+    }
+    return result;
   }
 
   private void checkMvcAnnotations() {

jooby/src/main/java/io/jooby/internal/mvc/DefaultMvcAnnotation.java

@@ -68,9 +68,9 @@ public class DefaultMvcAnnotation implements MvcAnnotation {
     return Collections.singletonList(Path.class);
   }
 
-  @Override public String pathPattern(AnnotatedElement type) {
+  @Override public String[] pathPattern(AnnotatedElement type) {
     Path path = type.getAnnotation(Path.class);
-    return path == null ? null : path.value()[0];
+    return path == null ? null : path.value();
   }
 
   @Override public boolean isQueryParam(Parameter parameter) {

jooby/src/main/java/io/jooby/internal/mvc/JaxrsAnnotation.java

@@ -64,9 +64,9 @@ public class JaxrsAnnotation implements MvcAnnotation {
     return M_ANN;
   }
 
-  @Override public String pathPattern(AnnotatedElement type) {
+  @Override public String[] pathPattern(AnnotatedElement type) {
     Path path = type.getAnnotation(Path.class);
-    return path == null ? null : path.value();
+    return path == null ? null : new String[]{path.value()};
   }
 
   @Override public List<Class<? extends Annotation>> pathAnnotation() {

jooby/src/main/java/io/jooby/internal/mvc/MvcAnnotation.java

@@ -45,7 +45,7 @@ public interface MvcAnnotation {
 
   boolean isFormParam(Parameter parameter);
 
-  String pathPattern(AnnotatedElement type);
+  String[] pathPattern(AnnotatedElement type);
 
   default String paramName(AnnotatedElement type) {
     try {
@@ -108,8 +108,8 @@ static MvcAnnotation create(ClassLoader loader) {
           return methodAnnotations;
         }
 
-        @Override public String pathPattern(AnnotatedElement type) {
-          String path = jaxrs.pathPattern(type);
+        @Override public String[] pathPattern(AnnotatedElement type) {
+          String[] path = jaxrs.pathPattern(type);
           return path == null ? def.pathPattern(type) : path;
         }
 

jooby/src/main/java/io/jooby/internal/mvc/MvcMetadata.java

@@ -43,7 +43,7 @@ public void parse(Class router) {
     reader.accept(visitor(metadata), 0);
   }
 
-  public MvcMethod get(Method method) {
+  public MvcMethod create(Method method) {
     String key =
         Type.getType(method.getDeclaringClass()).getInternalName() + "." + method.getName() + Type
             .getMethodDescriptor(method);