Jakarta JAX-RS 3.0 (vojtechhabarta#645)

Author: vojtechhabarta

typescript-generator-core/pom.xml

@@ -59,6 +59,11 @@
             <artifactId>javax.ws.rs-api</artifactId>
             <version>2.1.1</version>
         </dependency>
+        <dependency>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>io.github.classgraph</groupId>
             <artifactId>classgraph</artifactId>
@@ -233,6 +238,47 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>jaxrs-v2-test</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <copy
+                                    file="src/test/java/cz/habarta/typescript/generator/JaxrsApplicationTest.java"
+                                    tofile="src/test/java/cz/habarta/typescript/generator/JaxrsV2ApplicationTest.java"/>
+                                <replace
+                                    file="src/test/java/cz/habarta/typescript/generator/JaxrsV2ApplicationTest.java"
+                                    token="JaxrsApplicationTest"
+                                    value="JaxrsV2ApplicationTest"/>
+                                <replace
+                                    file="src/test/java/cz/habarta/typescript/generator/JaxrsV2ApplicationTest.java"
+                                    token="jakarta.ws.rs"
+                                    value="javax.ws.rs"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>jaxrs-v2-test-delete</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <delete file="src/test/java/cz/habarta/typescript/generator/JaxrsV2ApplicationTest.java"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

typescript-generator-core/src/main/java/cz/habarta/typescript/generator/JaxrsApplicationScanner.java

@@ -2,16 +2,15 @@
 package cz.habarta.typescript.generator;
 
 import cz.habarta.typescript.generator.parser.SourceType;
+import cz.habarta.typescript.generator.util.Utils;
 import io.github.classgraph.ScanResult;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Predicate;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Application;
 
 
 public class JaxrsApplicationScanner {
@@ -23,10 +22,18 @@ public static List<SourceType<Type>> scanJaxrsApplication(Class<?> jaxrsApplicat
             TypeScriptGenerator.getLogger().info("Scanning JAX-RS application: " + jaxrsApplicationClass.getName());
             final Constructor<?> constructor = jaxrsApplicationClass.getDeclaredConstructor();
             constructor.setAccessible(true);
-            final Application application = (Application) constructor.newInstance();
+            final Object instance = constructor.newInstance();
+            final Set<Class<?>> applicationClasses;
+            if (instance instanceof jakarta.ws.rs.core.Application) {
+                applicationClasses = ((jakarta.ws.rs.core.Application) instance).getClasses();
+            } else if (instance instanceof javax.ws.rs.core.Application) {
+                applicationClasses = ((javax.ws.rs.core.Application) instance).getClasses();
+            } else {
+                applicationClasses = Collections.emptySet();
+            }
             final List<Class<?>> resourceClasses = new ArrayList<>();
-            for (Class<?> cls : application.getClasses()) {
-                if (cls.isAnnotationPresent(Path.class)) {
+            for (Class<?> cls : applicationClasses) {
+                if (cls.isAnnotationPresent(jakarta.ws.rs.Path.class) || cls.isAnnotationPresent(javax.ws.rs.Path.class)) {
                     resourceClasses.add(cls);
                 }
             }
@@ -39,7 +46,10 @@ public static List<SourceType<Type>> scanJaxrsApplication(Class<?> jaxrsApplicat
     }
 
     public static List<SourceType<Type>> scanAutomaticJaxrsApplication(ScanResult scanResult, Predicate<String> isClassNameExcluded) {
-        final List<String> namesOfResourceClasses = scanResult.getClassesWithAnnotation(Path.class.getName()).getNames();
+        final List<String> namesOfResourceClasses = Utils.concat(
+                scanResult.getClassesWithAnnotation(jakarta.ws.rs.Path.class.getName()).getNames(),
+                scanResult.getClassesWithAnnotation(javax.ws.rs.Path.class.getName()).getNames()
+        );
         final List<Class<?>> resourceClasses = Input.loadClasses(namesOfResourceClasses);
         TypeScriptGenerator.getLogger().info(String.format("Found %d root resources.", resourceClasses.size()));
         return new JaxrsApplicationScanner().scanJaxrsApplication(null, resourceClasses, isClassNameExcluded);
@@ -53,19 +63,14 @@ private static RuntimeException reportError(ReflectiveOperationException e) {
     }
 
     List<SourceType<Type>> scanJaxrsApplication(Class<?> applicationClass, List<Class<?>> resourceClasses, Predicate<String> isClassNameExcluded) {
-        Collections.sort(resourceClasses, new Comparator<Class<?>>() {
-            @Override
-            public int compare(Class<?> o1, Class<?> o2) {
-                return o1.getName().compareToIgnoreCase(o2.getName());
-            }
-        });
+        Collections.sort(resourceClasses, (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()));
         final List<SourceType<Type>> sourceTypes = new ArrayList<>();
         if (applicationClass != null) {
-            sourceTypes.add(new SourceType<Type>(applicationClass));
+            sourceTypes.add(new SourceType<>(applicationClass));
         }
         for (Class<?> resourceClass : resourceClasses) {
             if (isClassNameExcluded == null || !isClassNameExcluded.test(resourceClass.getName())) {
-                sourceTypes.add(new SourceType<Type>(resourceClass));
+                sourceTypes.add(new SourceType<>(resourceClass));
             }
         }
         return sourceTypes;