open-api: make it a real java module fix #3803

Author: jknack

modules/jooby-openapi/pom.xml

@@ -18,12 +18,6 @@
       <version>${jooby.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>io.jooby</groupId>
-      <artifactId>jooby-kotlin</artifactId>
-      <version>${jooby.version}</version>
-    </dependency>
-
     <!-- JAXRS -->
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
@@ -34,13 +28,11 @@
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm</artifactId>
-      <optional>true</optional>
     </dependency>
 
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-util</artifactId>
-      <optional>true</optional>
     </dependency>
 
     <dependency>
@@ -106,6 +98,13 @@
     </dependency>
 
     <!-- kotlin -->
+    <dependency>
+      <groupId>io.jooby</groupId>
+      <artifactId>jooby-kotlin</artifactId>
+      <version>${jooby.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
@@ -191,40 +190,33 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>fat-jar</id>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <minimizeJar>true</minimizeJar>
-              <artifactSet>
-                <includes>
-                  <include>org.ow2.asm:*</include>
-                </includes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>io.jooby.internal.openapi.asm</shadedPattern>
-                </relocation>
-              </relocations>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <manifestEntries>
-                    <Automatic-Module-Name>io.jooby.openapi</Automatic-Module-Name>
-                  </manifestEntries>
-                </transformer>
-              </transformers>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+<!--      <plugin>-->
+<!--        <groupId>org.apache.maven.plugins</groupId>-->
+<!--        <artifactId>maven-shade-plugin</artifactId>-->
+<!--        <executions>-->
+<!--          <execution>-->
+<!--            <id>fat-jar</id>-->
+<!--            <goals>-->
+<!--              <goal>shade</goal>-->
+<!--            </goals>-->
+<!--            <phase>package</phase>-->
+<!--            <configuration>-->
+<!--              <minimizeJar>true</minimizeJar>-->
+<!--              <artifactSet>-->
+<!--                <includes>-->
+<!--                  <include>org.ow2.asm:*</include>-->
+<!--                </includes>-->
+<!--              </artifactSet>-->
+<!--              <relocations>-->
+<!--                <relocation>-->
+<!--                  <pattern>org.objectweb.asm</pattern>-->
+<!--                  <shadedPattern>io.jooby.internal.openapi.asm</shadedPattern>-->
+<!--                </relocation>-->
+<!--              </relocations>-->
+<!--            </configuration>-->
+<!--          </execution>-->
+<!--        </executions>-->
+<!--      </plugin>-->
 
     </plugins>
   </build>

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

@@ -15,7 +15,6 @@
 import io.jooby.Jooby;
 import io.jooby.Router;
 import io.jooby.ServiceRegistry;
-import io.jooby.kt.Kooby;
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverter;
 import io.swagger.v3.core.converter.ModelConverterContext;
@@ -26,8 +25,12 @@
 
 public class ModelConverterExt extends AbstractModelConverter {
 
-  private static final Set<Class<?>> IGNORE =
-      Set.of(Jooby.class, Kooby.class, ServiceRegistry.class, Router.class);
+  private static final Set<String> IGNORE =
+      Set.of(
+          Jooby.class.getName(),
+          "io.jooby.kt.Kooby",
+          ServiceRegistry.class.getName(),
+          Router.class.getName());
 
   public ModelConverterExt(ObjectMapper mapper) {
     super(mapper);
@@ -46,7 +49,7 @@ public Schema resolve(
       return new FileSchema();
     }
     // Skip base apps
-    if (IGNORE.contains(javaType.getRawClass())) {
+    if (IGNORE.contains(javaType.getRawClass().getName())) {
       return null;
     }
     return super.resolve(type, context, chain);

modules/jooby-openapi/src/main/java/io/jooby/internal/openapi/javadoc/JavaDocTag.java

@@ -29,8 +29,6 @@
 import io.swagger.v3.oas.models.tags.Tag;
 
 public class JavaDocTag {
-  private static final Predicate<DetailNode> CUSTOM_TAG =
-      javadocToken(JavadocCommentsTokenTypes.CUSTOM_BLOCK_TAG);
   private static final Predicate<DetailNode> TAG_SHORT = it -> it.getText().equals("tag");
   private static final Predicate<DetailNode> TAG = it -> it.getText().startsWith("tag.");
   private static final Predicate<DetailNode> SERVER = it -> it.getText().startsWith("server.");

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

@@ -0,0 +1,19 @@
+module io.jooby.openapi {
+  exports io.jooby.openapi;
+
+  requires io.jooby;
+  requires static com.github.spotbugs.annotations;
+  requires typesafe.config;
+  requires org.slf4j;
+  requires com.fasterxml.jackson.databind;
+  requires com.fasterxml.jackson.datatype.jdk8;
+  requires io.swagger.v3.core;
+  requires io.swagger.v3.oas.models;
+  requires io.swagger.v3.oas.annotations;
+  requires com.puppycrawl.tools.checkstyle;
+  requires jakarta.inject;
+  requires jakarta.ws.rs;
+  requires org.objectweb.asm;
+  requires org.objectweb.asm.tree;
+  requires org.objectweb.asm.util;
+}