#400 Routing error in case controller and package has the same names

Author: ipolevoy

activeweb/src/main/java/org/javalite/activeweb/Router.java

@@ -25,7 +25,6 @@
 
 import static org.javalite.activeweb.ControllerFactory.createControllerInstance;
 import static org.javalite.activeweb.ControllerFactory.getControllerClassName;
-import static org.javalite.common.Collections.map;
 
 /**
  * Responsible for looking at a URI and creating a route to controller if one is found.
@@ -298,7 +297,7 @@ protected ControllerPath getControllerPath(String uri) {
             return new ControllerPath();
         } else {
             String controllerPackage;
-            if ((controllerPackage = findPackagePrefix(uri)) != null) {
+            if ((controllerPackage = findPackageSuffix(uri)) != null) {
                 String controllerName = findControllerNamePart(controllerPackage, uri);
                 return new ControllerPath(controllerName, controllerPackage);
             } else {
@@ -354,7 +353,7 @@ protected static String findControllerNamePart(String pack, String uri) {
             temp = temp.substring(pack.length() + 1);
 
         if (temp.equals("") || temp.equals(pack))
-            throw new ControllerException("You defined a controller package '" + pack + "', but this request does not specify controller name");
+            throw new ControllerException("You defined a controller package '" + pack + "', but did not specify controller name");
 
         return temp.split("\\.")[0];
     }
@@ -366,7 +365,7 @@ protected static String findControllerNamePart(String pack, String uri) {
      * @return a part of a package name which can be found in between "app.controllers" and short name of class, or null
      *         if not found
      */
-    protected String findPackagePrefix(String uri) {
+    protected String findPackageSuffix(String uri) {
 
         String temp = uri.startsWith("/") ? uri.substring(1) : uri;
         temp = temp.replace(".", "_");

activeweb/src/test/java/app/controllers/ApiController.java

@@ -0,0 +1,14 @@
+package app.controllers;
+
+import org.javalite.activeweb.AppController;
+
+/**
+ * @author igor on 9/26/18.
+ */
+public class ApiController extends AppController {
+
+    public void index() {
+        respond("ApiController#index");
+    }
+
+}

activeweb/src/test/java/org/javalite/activeweb/RouterControllerPathSpec.java

@@ -36,8 +36,6 @@ public void before(){
 
     @Test
     public void shouldFindHomeControllerFromPath() {
-
-
         a(router.getControllerPath("/").getControllerName()).shouldBeEqual("home");
         a(router.getControllerPath("/").getControllerPackage()).shouldBeNull();
         a(router.getControllerPath("/hello").getControllerName()).shouldBeEqual("hello");

activeweb/src/test/java/org/javalite/activeweb/RouterCustomSpec.java

@@ -325,4 +325,19 @@ public void init(AppContext appContext) {
         the(responseContent()).shouldNotContain("IndexOutOfBoundsException");
         the(responseContent()).shouldContain("TestController#index");
     }
+
+    @Test
+    public void should_issue400() {
+
+        routeConfig = new AbstractRouteConfig() {
+            public void init(AppContext appContext) {
+                route("/api").to(ApiController.class).action("index").get();
+
+            }
+        };
+
+        request.setServletPath("/api");
+        execDispatcher();
+        System.out.println(responseContent());
+    }
 }