Fix - Receiving the Implentationm

itsaviu · Jun 10, 2019 · 91f2e74 · 91f2e74
1 parent e38d9dc
commit 91f2e74
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/com/firefly/dp/FactoryProducer.java b/src/main/java/com/firefly/dp/FactoryProducer.java
@@ -2,28 +2,30 @@
 
 import com.firefly.dp.annotations.FactoryMember;
 import com.firefly.dp.helper.FactoryMemberHelper;
+import lombok.Setter;
 
 import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
 
+@Setter
 public class FactoryProducer {
 
     private List<Class> factoryMembers;
 
-    public <T> T getImplemention(Class<T> clazz, String value) {
+    public <T> T getImplemention(Class<T> clazz, String value) throws IllegalAccessException, InstantiationException {
 
-        List<Object> implementedClazz = new FactoryMemberHelper(this.factoryMembers, clazz).accumulateByParent();
-        for (Object o : implementedClazz) {
-            Annotation[] annotations = o.getClass().getAnnotations();
+        List<Class> implementedClazz = new FactoryMemberHelper(this.factoryMembers, clazz).accumulateByParent();
+        for (Class o : implementedClazz) {
+            Annotation[] annotations = o.getAnnotations();
             Optional<Annotation> first = Stream.of(annotations)
                     .filter(annotation -> annotation.annotationType().equals(FactoryMember.class))
                     .findFirst();
             if (first.isPresent()) {
                 FactoryMember annotation = (FactoryMember) first.get();
                 if (annotation.key().equalsIgnoreCase(value))
-                    return (T) o;
+                    return (T) o.newInstance();
             }
         }
 

diff --git a/src/main/java/com/firefly/dp/helper/FactoryMemberHelper.java b/src/main/java/com/firefly/dp/helper/FactoryMemberHelper.java
@@ -12,7 +12,7 @@ public class FactoryMemberHelper {
 
     private Class parentClass;
 
-    public List<Object> accumulateByParent() {
+    public List<Class> accumulateByParent() {
         return this.fireFlyClazz.stream()
                 .filter(clazz -> parentClass.isAssignableFrom(clazz))
                 .collect(Collectors.toList());