Fix: 'Service not found' error on an mvc controller mounted over sub-application fix jooby-project#2457

jknack · jknack · commit 510cc8ebe288 · 2022-04-03T18:13:41.000-03:00
diff --git a/jooby/src/main/java/io/jooby/Jooby.java b/jooby/src/main/java/io/jooby/Jooby.java
@@ -298,16 +298,6 @@ public Router setLocales(Locale... locales) {
     return router.getContextPath();
   }
 
-  @Nonnull @Override
-  public Jooby mount(@Nonnull Router router) {
-    this.router.mount(router);
-    if (router instanceof Jooby) {
-      Jooby child = (Jooby) router;
-      child.registry  = this.registry;
-    }
-    return this;
-  }
-
   /**
    * Installs/imports a full application into this one. Applications share services, registry,
    * callbacks, etc.
@@ -323,7 +313,7 @@ public Jooby mount(@Nonnull Router router) {
    *
    * }</pre>
    *
-   * Lazy creation allows to configure and setup <code>SubApp</code> correctly, the next example
+   * Lazy creation configures and setup <code>SubApp</code> correctly, the next example
    * won't work:
    *
    * <pre>{@code
@@ -426,9 +416,18 @@ public Jooby mount(@Nonnull Predicate<Context> predicate, @Nonnull Router subrou
 
   @Nonnull @Override public Jooby mount(@Nonnull String path, @Nonnull Router router) {
     this.router.mount(path, router);
+    if (router instanceof Jooby) {
+      Jooby child = (Jooby) router;
+      child.registry  = this.registry;
+    }
     return this;
   }
 
+  @Nonnull @Override
+  public Jooby mount(@Nonnull Router router) {
+    return mount("/", router);
+  }
+
   @Nonnull @Override public Jooby mvc(@Nonnull Object router) {
     Provider provider = () -> router;
     return mvc(router.getClass(), provider);
diff --git a/jooby/src/main/java/io/jooby/internal/RouterImpl.java b/jooby/src/main/java/io/jooby/internal/RouterImpl.java
@@ -58,7 +58,6 @@
 import io.jooby.ServiceRegistry;
 import io.jooby.SessionStore;
 import io.jooby.StatusCode;
-import io.jooby.TemplateEngine;
 import io.jooby.ValueConverter;
 import io.jooby.WebSocket;
 import io.jooby.exception.RegistryException;
diff --git a/tests/src/test/java/io/jooby/i2457/ControllerV12457.java b/tests/src/test/java/io/jooby/i2457/ControllerV12457.java
@@ -0,0 +1,18 @@
+package io.jooby.i2457;
+
+import javax.inject.Inject;
+
+import io.jooby.annotations.GET;
+import io.jooby.annotations.Path;
+
+@Path("/")
+public class ControllerV12457 {
+
+  @Inject
+  private WelcomeService2457 welcomeService;
+
+  @GET("/welcome")
+  public String sayHi() {
+    return welcomeService.welcome("v1");
+  }
+}
diff --git a/tests/src/test/java/io/jooby/i2457/ControllerV22457.java b/tests/src/test/java/io/jooby/i2457/ControllerV22457.java
@@ -0,0 +1,18 @@
+package io.jooby.i2457;
+
+import javax.inject.Inject;
+
+import io.jooby.annotations.GET;
+import io.jooby.annotations.Path;
+
+@Path("/")
+public class ControllerV22457 {
+
+  @Inject
+  private WelcomeService2457 welcomeService;
+
+  @GET("/welcome")
+  public String sayHi() {
+    return welcomeService.welcome("v2");
+  }
+}
diff --git a/tests/src/test/java/io/jooby/i2457/ControllersAppV12457.java b/tests/src/test/java/io/jooby/i2457/ControllersAppV12457.java
@@ -0,0 +1,10 @@
+package io.jooby.i2457;
+
+import io.jooby.Jooby;
+
+public class ControllersAppV12457 extends Jooby {
+
+  public ControllersAppV12457() {
+    mvc(ControllerV12457.class);
+  }
+}
diff --git a/tests/src/test/java/io/jooby/i2457/ControllersAppV22457.java b/tests/src/test/java/io/jooby/i2457/ControllersAppV22457.java
@@ -0,0 +1,10 @@
+package io.jooby.i2457;
+
+import io.jooby.Jooby;
+
+public class ControllersAppV22457 extends Jooby {
+
+  public ControllersAppV22457() {
+    mvc(ControllerV22457.class);
+  }
+}
diff --git a/tests/src/test/java/io/jooby/i2457/HealthController2457.java b/tests/src/test/java/io/jooby/i2457/HealthController2457.java
@@ -0,0 +1,25 @@
+package io.jooby.i2457;
+
+import javax.inject.Inject;
+
+import com.google.common.collect.ImmutableMap;
+import io.jooby.Context;
+import io.jooby.annotations.GET;
+import io.jooby.annotations.Path;
+
+@Path("/")
+public class HealthController2457 {
+
+  @Inject
+  private WelcomeService2457 welcomeService;
+
+  @GET("/healthcheck")
+  public void healthCheck(Context ctx) {
+    String welcome = welcomeService.welcome("healthcheck");
+    ctx.setResponseCode(200)
+        .render(ImmutableMap.of(
+            "status", "Ok",
+            "welcome", welcome)
+        );
+  }
+}
diff --git a/tests/src/test/java/io/jooby/i2457/Issue2457.java b/tests/src/test/java/io/jooby/i2457/Issue2457.java
@@ -0,0 +1,38 @@
+package io.jooby.i2457;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.jooby.di.GuiceModule;
+import io.jooby.junit.ServerTest;
+import io.jooby.junit.ServerTestRunner;
+
+public class Issue2457 {
+
+  @ServerTest
+  public void shouldFindServiceOnMountedApp(ServerTestRunner runner) {
+    runner.define(app -> {
+      app.install(new GuiceModule());
+
+      app.mvc(HealthController2457.class);
+
+      app.mount("/api/v1", new ControllersAppV12457());
+      app.mount("/api/v2", new ControllersAppV22457());
+
+    }).ready(http -> {
+      http.get("/healthcheck", rsp -> {
+        assertEquals(200, rsp.code());
+        assertEquals("{status=Ok, welcome=[API healthcheck] Welcome Jooby!}", rsp.body().string());
+      });
+
+      http.get("/api/v1/welcome", rsp -> {
+            assertEquals(200, rsp.code());
+            assertEquals("[API v1] Welcome Jooby!", rsp.body().string());
+          });
+
+      http.get("/api/v2/welcome", rsp -> {
+            assertEquals(200, rsp.code());
+            assertEquals("[API v2] Welcome Jooby!", rsp.body().string());
+          });
+    });
+  }
+}
diff --git a/tests/src/test/java/io/jooby/i2457/WelcomeService2457.java b/tests/src/test/java/io/jooby/i2457/WelcomeService2457.java
@@ -0,0 +1,8 @@
+package io.jooby.i2457;
+
+public class WelcomeService2457 {
+
+  public String welcome(String version) {
+    return "[API " + version + "] Welcome Jooby!";
+  }
+}
