fast-classpath-scanner updated to 2.0.17 (refs #128)

Author: vojtechhabarta

typescript-generator-core/pom.xml

@@ -41,7 +41,7 @@
         <dependency>
             <groupId>io.github.lukehutch</groupId>
             <artifactId>fast-classpath-scanner</artifactId>
-            <version>1.9.19</version>
+            <version>2.0.17</version>
         </dependency>
         <!--test dependencies-->
         <dependency>

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

@@ -4,6 +4,7 @@
 import cz.habarta.typescript.generator.parser.*;
 import cz.habarta.typescript.generator.util.Predicate;
 import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
+import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult;
 import java.lang.reflect.*;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -61,28 +62,28 @@ public static Input fromClassNamesAndJaxrsApplication(List<String> classNames, L
 
     private static class ClasspathScanner {
 
-        private FastClasspathScanner fastClasspathScanner = null;
+        private ScanResult scanResult = null;
 
-        public FastClasspathScanner scanClasspath() {
-            if (fastClasspathScanner == null) {
+        public ScanResult scanClasspath() {
+            if (scanResult == null) {
                 System.out.println("Scanning classpath");
                 final Date scanStart = new Date();
-                final FastClasspathScanner scanner = new FastClasspathScanner().scan();
-                final int count = scanner.getNamesOfAllClasses().size();
+                final ScanResult result = new FastClasspathScanner().scan();
+                final int count = result.getNamesOfAllClasses().size();
                 final Date scanEnd = new Date();
                 final double timeInSeconds = (scanEnd.getTime() - scanStart.getTime()) / 1000.0;
                 System.out.println(String.format("Scanning finished in %.2f seconds. Total number of classes: %d.", timeInSeconds, count));
-                fastClasspathScanner = scanner;
+                scanResult = result;
             }
-            return fastClasspathScanner;
+            return scanResult;
         }
 
     }
 
-    private static Input fromClassNamePatterns(FastClasspathScanner scanner, List<String> classNamePatterns) {
+    private static Input fromClassNamePatterns(ScanResult scanResult, List<String> classNamePatterns) {
         final List<String> allClassNames = new ArrayList<>();
-        allClassNames.addAll(scanner.getNamesOfAllStandardClasses());
-        allClassNames.addAll(scanner.getNamesOfAllInterfaceClasses());
+        allClassNames.addAll(scanResult.getNamesOfAllStandardClasses());
+        allClassNames.addAll(scanResult.getNamesOfAllInterfaceClasses());
         Collections.sort(allClassNames);
         final List<String> classNames = filterClassNames(allClassNames, classNamePatterns);
         System.out.println(String.format("Found %d classes matching pattern.", classNames.size()));

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

@@ -3,7 +3,7 @@
 
 import cz.habarta.typescript.generator.parser.*;
 import cz.habarta.typescript.generator.util.Predicate;
-import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
+import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult;
 import java.lang.reflect.*;
 import java.util.*;
 import javax.ws.rs.*;
@@ -30,9 +30,9 @@ public static List<SourceType<Type>> scanJaxrsApplication(Class<?> jaxrsApplicat
         }
     }
 
-    public static List<SourceType<Type>> scanAutomaticJaxrsApplication(FastClasspathScanner scanner, Predicate<String> isClassNameExcluded) {
+    public static List<SourceType<Type>> scanAutomaticJaxrsApplication(ScanResult scanResult, Predicate<String> isClassNameExcluded) {
         try {
-            final List<String> namesOfResourceClasses = scanner.getNamesOfClassesWithAnnotation(Path.class);
+            final List<String> namesOfResourceClasses = scanResult.getNamesOfClassesWithAnnotation(Path.class);
             final List<Class<?>> resourceClasses = new ArrayList<>();
             for (String className : namesOfResourceClasses) {
                 resourceClasses.add(Thread.currentThread().getContextClassLoader().loadClass(className));

typescript-generator-core/src/test/java/cz/habarta/typescript/generator/InputTest.java

@@ -2,6 +2,7 @@
 package cz.habarta.typescript.generator;
 
 import io.github.lukehutch.fastclasspathscanner.FastClasspathScanner;
+import io.github.lukehutch.fastclasspathscanner.scanner.ScanResult;
 import java.util.*;
 import org.junit.Assert;
 import org.junit.Test;
@@ -11,8 +12,8 @@ public class InputTest {
 
     @Test
     public void testScanner() {
-        final FastClasspathScanner scanner = new FastClasspathScanner().scan();
-        final List<String> allClassNames = scanner.getNamesOfAllClasses();
+        final ScanResult scanResult = new FastClasspathScanner().scan();
+        final List<String> allClassNames = scanResult.getNamesOfAllClasses();
         final List<String> testClassNames = Input.filterClassNames(allClassNames, Arrays.asList("cz.habarta.typescript.generator.**Test"));
         Assert.assertTrue("Typescript-generator must have at least 20 tests :-)", testClassNames.size() > 20);
     }