tudo ou nad

Softawii · Aug 29, 2024 · dea1c47 · dea1c47
1 parent 7244424
commit dea1c47
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/com/softawii/curupira/v2/core/InteractionMapper.java b/src/main/java/com/softawii/curupira/v2/core/InteractionMapper.java
@@ -78,7 +78,7 @@ public void scan() {
     }
 
     private void scanPackage(String packageName) {
-        List<Class> classes = ScanUtils.getClassesInPackage(packageName, DiscordController.class).stream().toList();
+        List<Class<?>> classes = ScanUtils.getClassesInPackage(packageName, DiscordController.class).stream().toList();
 
         for(Class clazz : classes) {
             Object instance = context.getInstance(clazz);

diff --git a/src/main/java/com/softawii/curupira/v2/utils/ScanUtils.java b/src/main/java/com/softawii/curupira/v2/utils/ScanUtils.java
@@ -18,15 +18,25 @@ public class ScanUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ScanUtils.class);
 
-    public static Set<Class> getClassesInPackage(String pkg, Class annotation) {
+    public static Set<Class<?>> getClassesInPackage(String pkg, Class annotation) {
         LOGGER.info("Scanning package: {}, annotation: {}", pkg, annotation);
         Reflections reflections = new Reflections(
                 new ConfigurationBuilder()
                         .forPackages(pkg)
                         .setScanners(Scanners.SubTypes, Scanners.TypesAnnotated)
                         .filterInputsBy((input) -> input.endsWith(".class") && input.startsWith(pkg.replace('.', '/')))
         );
-        return new HashSet<>(reflections.getTypesAnnotatedWith(annotation));
+        HashSet<Class<?>> set = new HashSet<Class<?>>(reflections.getTypesAnnotatedWith(annotation));
+
+        for(Class<?> clazz : set.stream().toList()) {
+            if(clazz.getPackage().getName().startsWith(pkg)) {
+                LOGGER.info("Found class: {}", clazz.getName());
+            } else {
+                set.remove(clazz);
+            }
+        }
+
+        return set;
     }
 
     public static List<Method> getMethodsAnnotatedWith(Class clazz, Class filtering) {