Fix travis build error

markusmo3 · Nov 25, 2016 · 32addf6 · 32addf6
1 parent 64e25c8
commit 32addf6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/urm-core/src/main/java/de/markusmo3/urm/DomainClassFinder.java b/urm-core/src/main/java/de/markusmo3/urm/DomainClassFinder.java
@@ -8,6 +8,7 @@
 import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;
 
+import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.*;
 import java.util.logging.Logger;
@@ -18,8 +19,7 @@ public class DomainClassFinder {
     private static final Logger logger = Logger.getLogger(DomainClassFinder.class.getName());
 
     private static final String URM_PACKAGE = "de.markusmo3.urm";
-    private static final boolean ALLOW_FINDING_INTERNAL_CLASSES = Boolean.parseBoolean(
-            System.getProperty("de.markusmo3.urm.DomainClassFinder.allowFindingInternalClasses", "false"));
+    public static boolean ALLOW_FINDING_INTERNAL_CLASSES;
 
     public static ClassLoader[] classLoaders;
 
@@ -43,10 +43,12 @@ private static boolean isNotAnonymousClass(Class<?> clazz) {
     }
 
     private static Set<Class<?>> getClasses(URLClassLoader classLoader, String packageName) {
-        List<ClassLoader> classLoadersList = new LinkedList<ClassLoader>();
+        List<ClassLoader> classLoadersList = new LinkedList<>();
         classLoadersList.add(ClasspathHelper.contextClassLoader());
         classLoadersList.add(ClasspathHelper.staticClassLoader());
-        classLoadersList.add(classLoader);
+        if (classLoader != null) {
+            classLoadersList.add(classLoader);
+        }
 
         classLoaders = classLoadersList.toArray(new ClassLoader[0]);
 
@@ -56,16 +58,26 @@ private static Set<Class<?>> getClasses(URLClassLoader classLoader, String packa
             filter.exclude(FilterBuilder.prefix(URM_PACKAGE));
         }
 
+        Collection<URL> urls = ClasspathHelper.forClassLoader(classLoaders);
         Reflections reflections = new Reflections(new ConfigurationBuilder()
                 .setScanners(new SubTypesScanner(false /* don't exclude Object.class */), new ResourcesScanner())
-                .setUrls(ClasspathHelper.forClassLoader(classLoaders))
+                .setUrls(urls)
                 .filterInputsBy(filter)
                 .addClassLoaders(classLoadersList)
         );
+        logger.severe("#mo3-debug# ClassLoaders: " + classLoadersList.toString()
+                + "\n urls: " + urls
+                + "\n ALLOW_FINDING_INTERNAL_CLASSES: " + ALLOW_FINDING_INTERNAL_CLASSES
+        );
         return Sets.union(reflections.getSubTypesOf(Object.class),
                 reflections.getSubTypesOf(Enum.class));
     }
 
+    public static boolean isAllowFindingInternalClasses() {
+        return ALLOW_FINDING_INTERNAL_CLASSES |= Boolean.parseBoolean(
+                System.getProperty("de.markusmo3.urm.DomainClassFinder.allowFindingInternalClasses", "false"));
+    }
+
     private DomainClassFinder() {
         // private constructor for utility class
     }

diff --git a/urm-core/src/test/java/de/markusmo3/urm/DomainClassFinderTest.java b/urm-core/src/test/java/de/markusmo3/urm/DomainClassFinderTest.java
@@ -15,7 +15,7 @@ public class DomainClassFinderTest {
 
     @Before
     public void setup() {
-        System.setProperty("de.markusmo3.urm.DomainClassFinder.allowFindingInternalClasses", "true");
+        DomainClassFinder.ALLOW_FINDING_INTERNAL_CLASSES = true;
     }
 
     @Test

diff --git a/urm-core/src/test/java/de/markusmo3/urm/DomainMapperCliTest.java b/urm-core/src/test/java/de/markusmo3/urm/DomainMapperCliTest.java
@@ -19,7 +19,7 @@ public class DomainMapperCliTest extends DomainMapperCli { // extends to silence
     @Before
     public void setup() {
         MockitoAnnotations.initMocks(this);
-        System.setProperty("de.markusmo3.urm.DomainClassFinder.allowFindingInternalClasses", "true");
+        DomainClassFinder.ALLOW_FINDING_INTERNAL_CLASSES = true;
     }
 
     @Test

diff --git a/urm-core/src/test/java/de/markusmo3/urm/DomainMapperGraphvizTest.java b/urm-core/src/test/java/de/markusmo3/urm/DomainMapperGraphvizTest.java
@@ -32,7 +32,7 @@ public class DomainMapperGraphvizTest {
 
     @Before
     public void setup() {
-        System.setProperty("de.markusmo3.urm.DomainClassFinder.allowFindingInternalClasses", "true");
+        DomainClassFinder.ALLOW_FINDING_INTERNAL_CLASSES = true;
     }
 
     @Test