Extending routes fix #365

Author: jknack

coverage-report/src/test/java/org/jooby/issues/Issue365.java

@@ -0,0 +1,61 @@
+package org.jooby.issues;
+
+import org.jooby.mvc.GET;
+import org.jooby.mvc.Path;
+import org.jooby.test.ServerFeature;
+import org.junit.Test;
+
+public class Issue365 extends ServerFeature {
+
+  public static class Base {
+
+    @GET
+    public String list() {
+      return "base.list";
+    }
+
+    @GET
+    @Path("/:id")
+    public String findById(final String id) {
+      return "base.findById";
+    }
+
+  }
+
+  @Path("/api/users")
+  public static class Users extends Base {
+
+    @Override
+    @GET
+    public String list() {
+      return "users.list";
+    }
+
+    @GET
+    @Path("/q/:q")
+    public String query(final String q) {
+      return "users.query";
+    }
+
+  }
+
+  {
+    use(Users.class);
+  }
+
+  @Test
+  public void list() throws Exception {
+    request()
+        .get("/api/users/1")
+        .expect("base.findById");
+
+    request()
+        .get("/api/users")
+        .expect("users.list");
+
+    request()
+        .get("/api/users/q/q")
+        .expect("users.query");
+  }
+
+}

jooby/src/main/java/org/jooby/Jooby.java

@@ -3473,8 +3473,7 @@ private String configTree(final String[] sources, final int i) {
   }
 
   private static List<Object> normalize(final List<Object> services, final Env env,
-      final RouteMetadata classInfo,
-      final String prefix) {
+      final RouteMetadata classInfo, final String prefix) {
     List<Object> result = new ArrayList<>();
     List<Object> snapshot = services;
     /** modules, routes, parsers, renderers and websockets */

jooby/src/main/java/org/jooby/internal/mvc/MvcRoutes.java

@@ -21,7 +21,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -82,7 +81,7 @@ public static List<Route.Definition> routes(final Env env, final RouteMetadata c
     String[] rootExcludes = excludes(routeClass, EMPTY);
 
     Map<Method, List<Class<?>>> methods = new HashMap<>();
-    for (Method method : routeClass.getDeclaredMethods()) {
+    for (Method method : routeClass.getMethods()) {
       List<Class<?>> annotations = new ArrayList<>();
       for (Class annotationType : VERBS) {
         Annotation annotation = method.getAnnotation(annotationType);
@@ -91,9 +90,6 @@ public static List<Route.Definition> routes(final Env env, final RouteMetadata c
         }
       }
       if (annotations.size() > 0) {
-        if (!Modifier.isPublic(method.getModifiers())) {
-          throw new IllegalArgumentException("Not a public method: " + method);
-        }
         methods.put(method, annotations);
       }
     }

jooby/src/test/java/org/jooby/internal/mvc/MvcRoutesTest.java

@@ -2,25 +2,17 @@
 
 import static org.easymock.EasyMock.expect;
 
+import java.util.List;
+
 import org.jooby.Env;
+import org.jooby.Route.Definition;
 import org.jooby.internal.RouteMetadata;
 import org.jooby.mvc.GET;
-import org.jooby.mvc.Path;
 import org.jooby.test.MockUnit;
 import org.junit.Test;
 
 public class MvcRoutesTest {
 
-  @Path("/")
-  public static class NoPublicMethod {
-
-    @GET
-    private void privateMethod() {
-
-    }
-
-  }
-
   public static class NoPath {
 
     @GET
@@ -30,17 +22,10 @@ public void nopath() {
 
   }
 
-  @Test(expected = IllegalArgumentException.class)
-  public void noPublicMethod() throws Exception {
-    new MockUnit(Env.class)
-        .expect(unit -> {
-          Env env = unit.get(Env.class);
-          expect(env.name()).andReturn("dev");
-        })
-        .run(unit -> {
-          Env env = unit.get(Env.class);
-          MvcRoutes.routes(env, new RouteMetadata(env), "", NoPublicMethod.class);
-        });
+  @Test
+  public void emptyConstructor() throws Exception {
+    new MvcRoutes();
+
   }
 
   @Test(expected = IllegalArgumentException.class)
@@ -52,7 +37,8 @@ public void nopath() throws Exception {
         })
         .run(unit -> {
           Env env = unit.get(Env.class);
-          MvcRoutes.routes(env, new RouteMetadata(env), "", NoPath.class);
+          List<Definition> routes = MvcRoutes.routes(env, new RouteMetadata(env), "", NoPath.class);
+          System.out.println(routes);
         });
   }
 }