Changeset 14782 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2019-02-11T22:52:05+01:00 (6 years ago)

Author:

Don-vip

Message:

replace reflections library (unmaintained) by classgraph.

This allows us to update Guava to current version (27.0.1) with its only dependency (failureaccess 1.0.1).

File:

• trunk/test/unit/org/openstreetmap/josm/TestUtils.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/TestUtils.java

@@ -30 +30 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -55 +56 @@
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.WikiReader;
-import org.reflections.Reflections;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
@@ -62 +62 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import io.github.classgraph.ClassGraph;
+import io.github.classgraph.ClassInfoList;
+import io.github.classgraph.ScanResult;
 import mockit.integration.TestRunnerDecorator;
 
@@ -571 +574 @@
      */
     public static <T> Set<Class<? extends T>> getJosmSubtypes(Class<T> superClass) {
-        return new Reflections("org.openstreetmap.josm").getSubTypesOf(superClass);
+        try (ScanResult scan = new ClassGraph().whitelistPackages("org.openstreetmap.josm").ignoreClassVisibility().scan()) {
+            Function<String, ClassInfoList> lambda = superClass.isInterface() ? scan::getClassesImplementing : scan::getSubclasses;
+            return lambda.apply(superClass.getName())
+                    .asMap().values().stream().map(x -> x.loadClass(superClass)).collect(Collectors.toSet());
+        }
     }