openapi: clean up

- remove unused `META-INF` scanning, we dont generate that anymore
- ref #2403

Author: jknack

modules/jooby-maven-plugin/src/main/java/io/jooby/maven/OpenAPIMojo.java

@@ -50,20 +50,12 @@ protected void doExecute(@NonNull List<MavenProject> projects, @NonNull String m
     ClassLoader classLoader = createClassLoader(projects);
     Path outputDir = Paths.get(project.getBuild().getOutputDirectory());
     // Reduce lookup to current project: See https://github.com/jooby-project/jooby/issues/2756
-    String metaInf =
-        outputDir
-            .resolve("META-INF")
-            .resolve("services")
-            .resolve("io.jooby.MvcFactory")
-            .toAbsolutePath()
-            .toString();
 
     getLog().info("Generating OpenAPI: " + mainClass);
     getLog().debug("Using classloader: " + classLoader);
     getLog().debug("Output directory: " + outputDir);
-    getLog().debug("META-INF: " + metaInf);
 
-    OpenAPIGenerator tool = new OpenAPIGenerator(metaInf);
+    OpenAPIGenerator tool = new OpenAPIGenerator();
     tool.setClassLoader(classLoader);
     tool.setOutputDir(outputDir);
     trim(includes).ifPresent(tool::setIncludes);

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

@@ -17,15 +17,12 @@
 import static io.jooby.internal.openapi.TypeFactory.STRING_ARRAY;
 import static org.objectweb.asm.Opcodes.GETSTATIC;
 
-import java.io.IOException;
 import java.lang.reflect.Modifier;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -59,23 +56,9 @@
 
 public class RouteParser {
 
-  private String metaInf;
-
-  public RouteParser(String metaInf) {
-    this.metaInf = metaInf;
-  }
-
   public List<OperationExt> parse(ParserContext ctx, OpenAPIExt openapi) {
     List<OperationExt> operations = parse(ctx, null, ctx.classNode(ctx.getRouter()));
 
-    // Checkout controllers without explicit mapping, just META-INF
-    Set<String> controllers =
-        operations.stream()
-            .map(OperationExt::getControllerName)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toSet());
-    operations.addAll(metaInf(ctx, null, name -> !controllers.contains(name)));
-
     operations.addAll(parseManuallyRegisteredControllers(ctx));
 
     String applicationName =
@@ -280,28 +263,6 @@ public List<OperationExt> parse(ParserContext ctx, String prefix, ClassNode node
     return handlerList;
   }
 
-  private List<OperationExt> metaInf(
-      ParserContext ctx, String prefix, Predicate<String> predicate) {
-    // META-INF (Spring or similar)
-    try {
-      String content = new String(ctx.loadResource(metaInf), StandardCharsets.UTF_8);
-      String[] lines = content.split("\\n");
-      List<OperationExt> handlerList = new ArrayList<>();
-      for (String line : lines) {
-        String controller = line.replace("$Module", "").trim();
-        if (!controller.isEmpty()) {
-          Type type = TypeFactory.fromJavaName(controller);
-          if (predicate.test(type.getInternalName())) {
-            handlerList.addAll(AnnotationParser.parse(ctx, prefix, type));
-          }
-        }
-      }
-      return handlerList;
-    } catch (IOException ex) {
-      return Collections.emptyList();
-    }
-  }
-
   private List<OperationExt> parseManuallyRegisteredControllers(ParserContext ctx) {
     List<OperationExt> handlerList = new ArrayList<>();
     ClassNode classNode = ctx.classNode(ctx.getRouter());

modules/jooby-openapi/src/main/java/io/jooby/openapi/OpenAPIGenerator.java

@@ -100,22 +100,6 @@ public String toString(OpenAPIGenerator tool, OpenAPI result) {
 
   private String excludes;
 
-  private String metaInf;
-
-  /**
-   * Test Only.
-   *
-   * @param metaInf Location of meta-inf directory.
-   */
-  public OpenAPIGenerator(String metaInf) {
-    this.metaInf = metaInf;
-  }
-
-  /** Creates a new instance. */
-  public OpenAPIGenerator() {
-    this("META-INF/services/io.jooby.MvcFactory");
-  }
-
   /**
    * Export an {@link OpenAPI} model to the given format.
    *
@@ -169,7 +153,7 @@ public OpenAPIGenerator() {
     OpenAPIExt openapi =
         OpenApiTemplate.fromTemplate(basedir, classLoader, templateName).orElseGet(OpenAPIExt::new);
 
-    RouteParser routes = new RouteParser(metaInf);
+    RouteParser routes = new RouteParser();
     ParserContext ctx = new ParserContext(source, TypeFactory.fromJavaName(classname), debug);
     List<OperationExt> operations = routes.parse(ctx, openapi);
 

modules/jooby-openapi/src/test/java/io/jooby/openapi/OpenAPIExtension.java

@@ -82,14 +82,7 @@ public void afterEach(ExtensionContext ctx) {
   }
 
   private OpenAPIGenerator newTool(Set<DebugOption> debug, Class klass) {
-    String metaInf =
-        Optional.ofNullable(klass.getPackage())
-                .map(Package::getName)
-                .map(name -> name.replace(".", "/") + "/")
-                .orElse("")
-            + klass.getSimpleName();
-
-    OpenAPIGenerator tool = new OpenAPIGenerator(metaInf);
+    OpenAPIGenerator tool = new OpenAPIGenerator();
     tool.setDebug(debug);
     return tool;
   }