CoherentEventFactory.java: Use org.reflections in ReflectionsUtil.

Fixes asterisk-java#582
seanbright · Aug 12, 2024 · 5040217 · 5040217
1 parent ac3b72d
commit 5040217
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 25 deletions.
diff --git a/src/main/java/org/asteriskjava/pbx/internal/core/CoherentEventFactory.java b/src/main/java/org/asteriskjava/pbx/internal/core/CoherentEventFactory.java
@@ -9,6 +9,7 @@
 import org.asteriskjava.util.Log;
 import org.asteriskjava.util.LogFactory;
 import org.asteriskjava.util.ReflectionUtil;
+import org.reflections.Reflections;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -35,7 +36,7 @@ public class CoherentEventFactory {
     // static initialiser
     static {
 
-        Set<Class<ManagerEvent>> knownClasses = ReflectionUtil.loadClasses("org.asteriskjava.pbx.asterisk.wrap.events",
+        Set<Class<? extends ManagerEvent>> knownClasses = ReflectionUtil.loadClasses("org.asteriskjava.pbx.asterisk.wrap.events",
                 ManagerEvent.class);
 
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();

diff --git a/src/main/java/org/asteriskjava/util/ReflectionUtil.java b/src/main/java/org/asteriskjava/util/ReflectionUtil.java
@@ -16,6 +16,9 @@
  */
 package org.asteriskjava.util;
 
+import org.reflections.Reflections;
+import org.reflections.util.QueryFunction;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
@@ -30,6 +33,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 
 /**
  * Utility class that provides helper methods for reflection that is used by the
@@ -264,30 +268,11 @@ public static Object newInstance(String s) {
      * @param baseClassOrInterface
      * @return
      */
-    @SuppressWarnings("unchecked")
-    public static <T> Set<Class<T>> loadClasses(String packageName, Class<T> baseClassOrInterface) {
-        Set<Class<T>> result = new HashSet<>();
-
-        try {
-            Set<String> classNames = getClassNamesFromPackage(packageName);
-            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-            for (String className : classNames) {
-                try {
-                    Class<?> clazz = classLoader.loadClass(packageName + "." + className);
-                    if (!Modifier.isAbstract(clazz.getModifiers()) && baseClassOrInterface.isAssignableFrom(clazz)) {
-                        result.add((Class<T>) clazz);
-                    }
-                } catch (Throwable e) {
-                    logger.error(e, e);
-                }
-
-            }
-            logger.info("Loaded " + result.size());
-        } catch (Exception e) {
-            logger.error(e, e);
-        }
-
-        return result;
+    public static <T> Set<Class<? extends T>> loadClasses(String packageName, Class<T> baseClassOrInterface) {
+        Set<Class<? extends T>> result = new Reflections(packageName).getSubTypesOf(baseClassOrInterface);
+        return result.stream()
+            .filter(c -> !Modifier.isAbstract(c.getModifiers()))
+            .collect(Collectors.toSet());
     }
 
     /**