added registerAllDAOInPackage()

matches NodeFactory.registerAllNodesInPackage()

Author: i-make-robots

src/main/java/com/marginallyclever/nodegraphcore/BuiltInRegistry.java

@@ -1,6 +1,5 @@
 package com.marginallyclever.nodegraphcore;
 
-import com.marginallyclever.nodegraphcore.json.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,12 +32,6 @@ public void registerNodes() {
     @Override
     public void registerDAO() {
         logger.info("Registering core DAOs");
-        DAO4JSONFactory.registerDAO(new RectangleDAO4JSON());
-        DAO4JSONFactory.registerDAO(new StringDAO4JSON());
-        DAO4JSONFactory.registerDAO(new DoubleDAO4JSON());
-        DAO4JSONFactory.registerDAO(new IntegerDAO4JSON());
-        DAO4JSONFactory.registerDAO(new NumberDAO4JSON());
-        DAO4JSONFactory.registerDAO(new BooleanDAO4JSON());
-        DAO4JSONFactory.registerDAO(new ObjectDAO4JSON());
+        DAO4JSONFactory.registerAllDAOInPackage("com.marginallyclever.nodegraphcore.json");
     }
 }

src/main/java/com/marginallyclever/nodegraphcore/DAO4JSONFactory.java

@@ -1,13 +1,12 @@
 package com.marginallyclever.nodegraphcore;
 
 import org.json.JSONException;
+import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ServiceLoader;
-import java.util.Set;
+import java.lang.reflect.InvocationTargetException;
+import java.util.*;
 
 /**
  * Maintains a map of Classes and their {@link DAO4JSON}.
@@ -40,7 +39,9 @@ public static void registerDAO(DAO4JSON<?> dao) {
      */
     public static Object toJSON(Class<?> aClass,Object object) throws JSONException {
         DAO4JSON<?> dao = daoRegistry.get(aClass);
-        if(dao==null) throw new JSONException("no DAO for "+aClass.getName());
+        if(dao==null) {
+            throw new JSONException("no DAO for "+aClass.getName());
+        }
         return dao.toJSON(object);
     }
 
@@ -71,7 +72,6 @@ public static void loadRegistries() {
         loadRegistries(helper.getExtensionClassLoader());
     }
 
-
     public static void loadRegistries(ClassLoader classLoader) {
         ServiceLoader<DAORegistry> serviceLoader = ServiceLoader.load(DAORegistry.class, classLoader);
         for (DAORegistry registry : serviceLoader) {
@@ -88,4 +88,28 @@ public static String[] getNames() {
         }
         return names;
     }
+
+    public static void registerAllDAOInPackage(String packageName) throws GraphException {
+        // Use Reflections to find all subtypes of Node in the package
+        Reflections reflections = new Reflections(packageName);
+        Set<Class<? extends DAO4JSON>> subTypes = reflections.getSubTypesOf(DAO4JSON.class);
+        var list = new ArrayList<>();
+        subTypes.stream().sorted(Comparator.comparing(Class::getName)).forEach(typeFound ->{
+            if(!typeFound.getName().startsWith(packageName)) return;
+            list.add(typeFound.getName().substring(packageName.length() + 1));
+        });
+        String str = packageName + " contains DAO " + Arrays.toString(list.toArray());
+        logger.info(str);
+
+        for (var typeFound : subTypes) {
+            if(!typeFound.getName().startsWith(packageName)) continue;
+
+            try {
+                DAO4JSON<?> daoInstance = typeFound.getDeclaredConstructor().newInstance();
+                registerDAO(daoInstance);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                throw new GraphException("Failed to register DAO: " + typeFound.getName(), e);
+            }
+        }
+    }
 }