feat(factory): add Identifier Generic

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 
 allprojects {
     group = "net.tomatentum.cutin"
-    version = "0.1.0" + (if (!project.hasProperty("release")) ("-" + getGitHash()) else "")
+    version = "0.1.1" + (if (!project.hasProperty("release")) ("-" + getGitHash()) else "")
     description = "A lightweight Reflection abstraction specifically but not exclusively made for tueem/Marinara."
     plugins.withType<JavaPlugin> {
         tasks.withType<Jar>().configureEach {

lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactory.java

@@ -5,14 +5,14 @@ import java.util.List;
 import java.util.Optional;
 
 
-public interface ReflectedMethodFactory {
+public interface ReflectedMethodFactory<I extends Object> {
-    Optional<ReflectedMethod> produce(Method method, Object containingClass);
+    Optional<ReflectedMethod<I>> produce(Method method, Object containingClass);
-    ReflectedMethodFactory addFactory(Factory factory);
+    ReflectedMethodFactory<I> addFactory(Factory<I> factory);
 
-    public interface Factory {
+    public interface Factory<I extends Object> {
 
-        Optional<ReflectedMethod> produce(Method method, Object containingObject);
+        Optional<ReflectedMethod<I>> produce(Method method, Object containingObject);
-        void addParser(ReflectedMethod method, List<MethodParser> parser);
+        void addParser(ReflectedMethod<I> method, List<MethodParser> parser);
 
     }
 }

lib/src/main/java/net/tomatentum/cutin/ReflectedMethodFactoryImpl.java

@@ -11,23 +11,23 @@ import org.slf4j.LoggerFactory;
 import net.tomatentum.cutin.util.ReflectionUtil;
 
 
-public class ReflectedMethodFactoryImpl implements ReflectedMethodFactory {
+public class ReflectedMethodFactoryImpl<I extends Object> implements ReflectedMethodFactory<I> {
 
     private Logger logger = LoggerFactory.getLogger(getClass());
 
-    private List<Factory> factories;
+    private List<Factory<I>> factories;
 
     public ReflectedMethodFactoryImpl() {
         this(new ArrayList<>());
     }
 
-    public ReflectedMethodFactoryImpl(List<Factory> factories) {
+    public ReflectedMethodFactoryImpl(List<Factory<I>> factories) {
         this.factories = factories;
     }
 
     @Override
-    public Optional<ReflectedMethod> produce(Method method, Object containingClass) {
+    public Optional<ReflectedMethod<I>> produce(Method method, Object containingClass) {
-        Optional<ReflectedMethod> rmethod = this.factories.stream()
+        Optional<ReflectedMethod<I>> rmethod = this.factories.stream()
             .map(f -> factoryProduce(f, method, containingClass))
             .filter(Optional::isPresent)
             .map(Optional::get)
@@ -41,14 +41,14 @@ public class ReflectedMethodFactoryImpl implements ReflectedMethodFactory {
     }
 
     @Override
-    public ReflectedMethodFactory addFactory(Factory factory) {
+    public ReflectedMethodFactory<I> addFactory(Factory<I> factory) {
         this.factories.add(factory);
         return this;
     }
 
-    private Optional<ReflectedMethod> factoryProduce(Factory factory, Method method, Object containingClass) {
+    private Optional<ReflectedMethod<I>> factoryProduce(Factory<I> factory, Method method, Object containingClass) {
         List<MethodParser> parser = new ArrayList<>();
-        Optional<ReflectedMethod> m = factory.produce(method, containingClass);
+        Optional<ReflectedMethod<I>> m = factory.produce(method, containingClass);
         m.ifPresent(x -> {
             factory.addParser(x, parser); 
             parser.forEach(MethodParser::parse);

lib/src/main/java/net/tomatentum/cutin/container/LoneMethodContainer.java

@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
 import net.tomatentum.cutin.ReflectedMethod;
 import net.tomatentum.cutin.ReflectedMethodFactory;
@@ -13,23 +14,30 @@ import net.tomatentum.cutin.ReflectedMethodFactory;
 public class LoneMethodContainer<I extends Object> implements MethodContainer<I> {
 
     private Map<I, ReflectedMethod<I>> methodStore;
-    private ReflectedMethodFactory factory;
+    private ReflectedMethodFactory<I> factory;
 
-    public LoneMethodContainer(ReflectedMethodFactory factory) {
+    public LoneMethodContainer(ReflectedMethodFactory<I> factory) {
         this.methodStore = new HashMap<>();
         this.factory = factory;
     }
 
     @Override
-    public void addMethods(ReflectedMethod<I>... methods) {
+    public MethodContainer<I> addMethod(ReflectedMethod<I> method) {
-        for (ReflectedMethod<I> reflectedMethod : methods)
+        this.methodStore.put(method.identifier(), method);
-            this.methodStore.put(reflectedMethod.identifier(), reflectedMethod);
+        return this;
     }
 
     @Override
-    public void addMethods(Object containingObject, Method... methods) {
+    public MethodContainer<I> addMethods(Object containingObject, Method... methods) {
         for (Method method : methods)
-            this.addMethods(this.factory.produce(method, containingObject));
+            this.factory.produce(method, containingObject)
+                .ifPresent(this::addMethod);
+        return this;
+    }
+
+    @Override
+    public Set<I> identifiers() {
+        return methodStore.keySet();
     }
 
     @Override

lib/src/main/java/net/tomatentum/cutin/container/MethodContainer.java

@@ -3,17 +3,26 @@ package net.tomatentum.cutin.container;
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.Set;
 
 import net.tomatentum.cutin.ReflectedMethod;
 
 public interface MethodContainer<I extends Object> {
 
-    void addMethods(ReflectedMethod<I>... methods);
+    MethodContainer<I> addMethod(ReflectedMethod<I> method);
-    void addMethods(Object containingObject, Method... methods);
+    default MethodContainer<I> addMethods(ReflectedMethod<I>[] methods) {
-    default void addAllMethods(Object containingObject) {
+        for (ReflectedMethod<I> reflectedMethod : methods) {
+            this.addMethod(reflectedMethod);
+        }
+        return this;
+    }
+    MethodContainer<I> addMethods(Object containingObject, Method... methods);
+    default MethodContainer<I> addAllMethods(Object containingObject) {
         this.addMethods(containingObject, containingObject.getClass().getDeclaredMethods());
-    };
+        return this;
+    }
 
+    Set<I> identifiers();
     Collection<ReflectedMethod<I>> methods();
     Collection<ReflectedMethod<I>> findFor(I identifier);
     Optional<ReflectedMethod<I>> findFirstFor(I identifier);

lib/src/main/java/net/tomatentum/cutin/container/MultiMethodContainer.java

@@ -5,6 +5,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,28 +17,36 @@ import net.tomatentum.cutin.util.ReflectionUtil;
 public class MultiMethodContainer<I extends Object> implements MethodContainer<I> {
 
     private Set<Entry<I>> entries;
-    private ReflectedMethodFactory factory;
+    private ReflectedMethodFactory<I> factory;
 
-    public MultiMethodContainer(ReflectedMethodFactory factory) {
+    public MultiMethodContainer(ReflectedMethodFactory<I> factory) {
         this.entries = new HashSet<>();
         this.factory = factory;
     }
 
     @Override
-    public void addMethods(ReflectedMethod<I>... methods) {
+    public MethodContainer<I> addMethod(ReflectedMethod<I> method) {
-        for (ReflectedMethod<I> rMethod : methods) {
             Optional<Entry<I>> oentry = this.entries.stream()
-                .filter(e -> rMethod.identifier().equals(e.identifier()))
+                .filter(e -> method.identifier().equals(e.identifier()))
                 .findFirst();
-            Entry<I> entry = oentry.orElse(new Entry<>(rMethod.identifier())).addMethod(rMethod);
+            Entry<I> entry = oentry.orElse(new Entry<>(method.identifier())).addMethod(method);
             if (oentry.isEmpty()) this.entries.add(entry);
-        }   
+            return this;
     }
 
     @Override
-    public void addMethods(Object containingObject, Method... methods) {
+    public MethodContainer<I> addMethods(Object containingObject, Method... methods) {
         for (Method method : methods)
-            this.addMethods(this.factory.produce(method, containingObject));
+            this.factory.produce(method, containingObject)
+                .ifPresent(this::addMethod);
+        return this;
+    }
+
+    @Override
+    public Set<I> identifiers() {
+        return entries().stream()
+            .map(Entry::identifier)
+            .collect(Collectors.toSet());
     }
 
     @Override
@@ -63,6 +72,10 @@ public class MultiMethodContainer<I extends Object> implements MethodContainer<I
             .findFirst();
     }
 
+    protected Set<Entry<I>> entries() {
+        return this.entries;
+    }
+
     public static record Entry<I extends Object>(I identifier, Set<ReflectedMethod<I>> methods) {
 
         public Entry(I identifier) {