remove: MvcFactory fix #3705

Author: jknack

jooby/src/main/java/io/jooby/Jooby.java

@@ -7,7 +7,6 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.StreamSupport.stream;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -26,8 +25,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
@@ -54,7 +51,6 @@
 import io.jooby.output.BufferedOutputFactory;
 import io.jooby.problem.ProblemDetailsHandler;
 import io.jooby.value.ValueFactory;
-import jakarta.inject.Provider;
 
 /**
  * Welcome to Jooby!
@@ -520,49 +516,6 @@ public Jooby mvc(@NonNull MvcExtension router) {
     }
   }
 
-  @NonNull @Override
-  @Deprecated(since = "3.8.0", forRemoval = true)
-  public Jooby mvc(@NonNull Object router) {
-    Provider provider = () -> router;
-    return mvc(router.getClass(), provider);
-  }
-
-  @NonNull @Override
-  @Deprecated(since = "3.8.0", forRemoval = true)
-  public Jooby mvc(@NonNull Class router) {
-    return mvc(router, () -> require(router));
-  }
-
-  @NonNull @Override
-  @Deprecated(since = "3.8.0", forRemoval = true)
-  public <T> Jooby mvc(@NonNull Class<T> router, @NonNull Provider<T> provider) {
-    try {
-      MvcFactory module = loadModule(router);
-      Extension extension = module.create(provider::get);
-      extension.install(this);
-      return this;
-    } catch (Exception x) {
-      throw SneakyThrows.propagate(x);
-    }
-  }
-
-  @Deprecated(since = "3.8.0", forRemoval = true)
-  private <T> MvcFactory<T> loadModule(Class<T> router) {
-    try {
-      ServiceLoader<MvcFactory> modules = ServiceLoader.load(MvcFactory.class);
-      return stream(modules.spliterator(), false)
-          .filter(it -> it.supports(router))
-          .findFirst()
-          .orElseGet(
-              () ->
-                  /* Make happy IDE incremental build: */
-                  mvcReflectionFallback(router, getClassLoader()));
-    } catch (ServiceConfigurationError notfound) {
-      /* Make happy IDE incremental build: */
-      return mvcReflectionFallback(router, getClassLoader());
-    }
-  }
-
   @NonNull @Override
   public Route ws(@NonNull String pattern, @NonNull WebSocket.Initializer handler) {
     return router.ws(pattern, handler);
@@ -1452,29 +1405,6 @@ private void joobyRunHook(ClassLoader loader, Server server) {
     }
   }
 
-  /**
-   * This method exists to integrate IDE incremental build with MVC annotation processor. It
-   * fallback to reflection to lookup for a generated mvc factory.
-   *
-   * @param source Controller class.
-   * @param classLoader Class loader.
-   * @return Mvc factory.
-   */
-  private MvcFactory mvcReflectionFallback(Class source, ClassLoader classLoader) {
-    try {
-      var moduleName =
-          System.getProperty("jooby.routerPrefix", "")
-              + source.getName()
-              + System.getProperty("jooby.routerSuffix", "_");
-      Class<?> moduleType = classLoader.loadClass(moduleName);
-      Constructor<?> constructor = moduleType.getDeclaredConstructor();
-      getLog().debug("Loading mvc using reflection: " + source);
-      return (MvcFactory) constructor.newInstance();
-    } catch (Exception x) {
-      throw Usage.mvcRouterNotFound(source);
-    }
-  }
-
   /**
    * Copy internal state from one application into other.
    *

jooby/src/main/java/io/jooby/MvcFactory.java

@@ -38,7 +38,6 @@
 import io.jooby.handler.AssetSource;
 import io.jooby.output.BufferedOutputFactory;
 import io.jooby.value.ValueFactory;
-import jakarta.inject.Provider;
 
 /**
  * Routing DSL functions.
@@ -425,39 +424,6 @@ default Object execute(@NonNull Context context) {
    */
   @NonNull Router mvc(@NonNull MvcExtension router);
 
-  /**
-   * Import all route method from the given controller class. At runtime the controller instance is
-   * resolved by calling {@link Jooby#require(Class)}.
-   *
-   * @param router Controller class.
-   * @return This router.
-   * @deprecated See {{@link #mvc(MvcExtension)}}
-   */
-  @Deprecated
-  @NonNull Router mvc(@NonNull Class router);
-
-  /**
-   * Import all route method from the given controller class.
-   *
-   * @param router Controller class.
-   * @param provider Controller provider.
-   * @param <T> Controller type.
-   * @return This router.
-   * @deprecated See {{@link #mvc(MvcExtension)}}
-   */
-  @Deprecated
-  @NonNull <T> Router mvc(@NonNull Class<T> router, @NonNull Provider<T> provider);
-
-  /**
-   * Import all route methods from given controller instance.
-   *
-   * @param router Controller instance.
-   * @return This routes.
-   * @deprecated See {{@link #mvc(MvcExtension)}}
-   */
-  @Deprecated
-  @NonNull Router mvc(@NonNull Object router);
-
   /**
    * Add a websocket handler.
    *

jooby/src/main/java/io/jooby/Router.java

@@ -333,21 +333,6 @@ public Router mvc(@NonNull MvcExtension router) {
     throw new UnsupportedOperationException();
   }
 
-  @NonNull @Override
-  public Router mvc(@NonNull Object router) {
-    throw new UnsupportedOperationException();
-  }
-
-  @NonNull @Override
-  public Router mvc(@NonNull Class router) {
-    throw new UnsupportedOperationException();
-  }
-
-  @NonNull @Override
-  public <T> Router mvc(@NonNull Class<T> router, @NonNull Provider<T> provider) {
-    throw new UnsupportedOperationException();
-  }
-
   @NonNull @Override
   public Router encoder(@NonNull MessageEncoder encoder) {
     this.encoder.add(MediaType.all, encoder);

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

@@ -16,7 +16,6 @@
   exports io.jooby.output;
   exports io.jooby.internal.output;
 
-  uses io.jooby.MvcFactory;
   uses io.jooby.Server;
   uses io.jooby.SslProvider;
   uses io.jooby.LoggingService;

jooby/src/main/java/module-info.java

@@ -143,20 +143,6 @@ open class Kooby() : Jooby() {
     this.init()
   }
 
-  @RouterDsl
-  @Deprecated(message = "Use mvc(io.jooby.MvcExtension)")
-  fun <T : Any> mvc(router: KClass<T>): Kooby {
-    super.mvc(router.java)
-    return this
-  }
-
-  @RouterDsl
-  @Deprecated(message = "Use mvc(io.jooby.MvcExtension)")
-  fun <T : Any> mvc(router: KClass<T>, provider: () -> T): Kooby {
-    super.mvc(router.java, provider)
-    return this
-  }
-
   @RouterDsl
   fun use(handler: FilterContext.() -> Any): Kooby {
     super.use { next -> Route.Handler { ctx -> FilterContext(ctx, next).handler() } }

modules/jooby-kotlin/src/main/kotlin/io/jooby/kt/Kooby.kt

@@ -127,6 +127,12 @@
       <artifactId>kotlinx-coroutines-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy</artifactId>
+      <version>1.17.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

modules/jooby-openapi/pom.xml

@@ -185,7 +185,7 @@ public static List<OperationExt> parse(
                       new IllegalStateException(
                           "Mvc class not found: " + InsnSupport.toString(node)));
       return parse(ctx, prefix, type);
-    } else if (signature.matches(MVC_EXTENSION) || signature.matches(Object.class)) {
+    } else if (signature.matches(MVC_EXTENSION)) {
       AbstractInsnNode previous = node.getPrevious();
       if (previous instanceof MethodInsnNode) {
         MethodInsnNode methodInsnNode = (MethodInsnNode) previous;
@@ -220,8 +220,36 @@ public static List<OperationExt> parse(
             Type type = (Type) (ldcInsnNode).cst;
             return parse(ctx, prefix, type);
           } else {
-            // mvc(some.myController());
             Type type = Type.getReturnType(methodInsnNode.desc);
+            if (type.equals(MVC_EXTENSION)) {
+              // support test code: toMvcExtension() but also any other thing that generate an
+              // extension from controller class
+              type =
+                  InsnSupport.prev(methodInsnNode.getPrevious())
+                      .filter(
+                          e ->
+                              (e instanceof LdcInsnNode ldcInsnNode
+                                      && (ldcInsnNode.cst instanceof Type))
+                                  || (e instanceof MethodInsnNode method)
+                                      && (!Type.getReturnType(method.desc)
+                                          .getClassName()
+                                          .equals(Object.class.getName())))
+                      .findFirst()
+                      .map(
+                          e -> {
+                            if (e instanceof LdcInsnNode ldcInsnNode) {
+                              return ldcInsnNode.cst;
+                            } else if (e instanceof MethodInsnNode method) {
+                              return Type.getReturnType(method.desc);
+                            } else {
+                              return e;
+                            }
+                          })
+                      .filter(it -> it instanceof Type)
+                      .map(it -> (Type) it)
+                      .orElse(type);
+            }
+            // mvc(some.myController());
             return parse(ctx, prefix, type);
           }
         }

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/AnnotationParser.java

@@ -8,12 +8,13 @@
 import java.util.List;
 import java.util.Optional;
 
+import org.jetbrains.annotations.NotNull;
+
 import io.jooby.Context;
+import io.jooby.Jooby;
+import io.jooby.MvcExtension;
 import io.jooby.Session;
-import io.jooby.annotation.GET;
-import io.jooby.annotation.POST;
-import io.jooby.annotation.Path;
-import io.jooby.annotation.QueryParam;
+import io.jooby.annotation.*;
 
 @Path("/api")
 public class ControllerExample {
@@ -63,3 +64,9 @@ public ABean save(ABean bean) {
     return bean;
   }
 }
+
+@Generated(ControllerExample.class)
+class COntrollerExample_ implements MvcExtension {
+  @Override
+  public void install(@NotNull Jooby application) throws Exception {}
+}

modules/jooby-openapi/src/test/java/examples/ControllerExample.java

@@ -5,11 +5,13 @@
  */
 package examples;
 
+import static io.jooby.openapi.MvcExtensionGenerator.toMvcExtension;
+
 import io.jooby.Jooby;
 
 public class FormMvcApp extends Jooby {
 
   {
-    mvc(new FormController());
+    mvc(toMvcExtension(FormController.class));
   }
 }