commited changes

src/main/java/com/zipcodewilmington/generic/group/Group.java

@@ -3,56 +3,89 @@ package com.zipcodewilmington.generic.group;
 import com.zipcodewilmington.generic.identifiables.IdentifiableInterface;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.function.Predicate;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * @author leon on 06/12/2018.
  */
-public class Group<ChangeThisTypeRespectively,ChangeThisOneToo> extends AbstractGroup{
-    @Override
+public class Group<TypeOfId extends Serializable ,TypeOfEntity extends IdentifiableInterface<TypeOfId>>
+        extends AbstractGroup<TypeOfId, TypeOfEntity>
+{
+    private ArrayList<TypeOfEntity> list;
+
+public Group()
+        {
+        this.list = new ArrayList<>();
+        }
+
+
+@Override
     public Integer count() {
-        return null;
+        return list.size();
     }
 
     @Override
-    public void insert(IdentifiableInterface object) {
-
+    public void insert(IdentifiableInterface object)
+    {
+        list.add((TypeOfEntity) object);
     }
 
     @Override
-    public void delete(IdentifiableInterface object) {
-
+    public void delete(IdentifiableInterface object)
+    {
+        list.remove(object);
     }
 
     @Override
-    public void delete(Serializable serializable) {
+    public void delete(Serializable serializable)
+    {
+        Iterator iterator = list.iterator();
+        while (iterator.hasNext()){
+            IdentifiableInterface next = (IdentifiableInterface) iterator.next();
+            if(next.getIdentity().equals(serializable)) iterator.remove();
+        }
 
     }
 
     @Override
     public Boolean has(IdentifiableInterface object) {
-        return null;
+        for (IdentifiableInterface id : list) {
+            if (list.contains(id)) return true;
+        }
+        return false;
     }
 
     @Override
     public Boolean has(Serializable serializable) {
-        return null;
+        Iterator iterator = list.iterator();
+        while (iterator.hasNext()){
+            IdentifiableInterface next = (IdentifiableInterface) iterator.next();
+            if(next.getIdentity().equals(serializable)) return true;
+        }
+        return false;
     }
 
     @Override
     public List filter(Predicate predicate) {
-        return null;
+        return (ArrayList<TypeOfEntity>)list.stream()
+                .filter(predicate)
+                .collect(Collectors.toList());
     }
 
     @Override
     public Class getIdentityType() {
-        return null;
+        return list.getClass();
     }
 
     @Override
     public Class getIdentifiableType() {
-        return null;
+        return this.getClass().getEnclosingClass();
     }
 
 }

src/main/java/com/zipcodewilmington/generic/identifiables/ActionFigure.java

@@ -5,14 +5,36 @@ import java.io.Serializable;
 /**
  * @author leon on 05/12/2018.
  */
-public class ActionFigure implements IdentifiableInterface {
+public class ActionFigure <TypeOfId extends Serializable> implements IdentifiableInterface<TypeOfId> {
+
+    private TypeOfId id;
+
+    @Override
+    public TypeOfId getIdentity() {
+        return id;
+    }
 
     @Override
-    public Serializable getIdentity() {
-        return null;
+    public void setId(TypeOfId typeOfId) {
+        this.id = typeOfId;
     }
 
-    public Class getIdentityType() {
-        return null;
+    public Class<? extends Serializable> getIdentityType() {
+        return id.getClass();
     }
+
+//    @Override
+//    public void setId(Long aLong) {
+//
+//    }
+
+
+//    @Override
+//    public Serializable getIdentity() {
+//        return null;
+//    }
+//
+//    public Class getIdentityType() {
+//        return null;
+//    }
 }

src/main/java/com/zipcodewilmington/generic/identifiables/IdentifiableInterface.java

@@ -8,5 +8,6 @@ import java.io.Serializable;
  */
 public interface IdentifiableInterface<TypeOfId extends Serializable> {
     TypeOfId getIdentity();
-    Class<? extends TypeOfId> getIdentityType();
+    void setId(TypeOfId id);
+    Class<? extends Serializable> getIdentityType();
 }

src/main/java/com/zipcodewilmington/generic/identifiables/Person.java

@@ -5,14 +5,32 @@ import java.io.Serializable;
 /**
  * @author leon on 05/12/2018.
  */
-public class Person implements IdentifiableInterface {
+public class Person <TypeOfId extends Serializable> implements IdentifiableInterface<TypeOfId>{
+
+    private TypeOfId id;
+
+    public Person() {
+    }
 
     @Override
-    public Serializable getIdentity() {
-        return null;
+    public TypeOfId getIdentity() {
+        return id;
     }
 
-    public Class getIdentityType() {
-        return null;
+    public void setId(TypeOfId id) {
+        this.id = id;
     }
+
+    public Class<? extends Serializable> getIdentityType() {
+        return id.getClass();
+    }
+
+//    @Override
+//    public Serializable getIdentity() {
+//        return null;
+//    }
+//
+//    public Class getIdentityType() {
+//        return null;
+//    }
 }

src/test/java/com/zipcodewilmington/generic/group/GetIdentityTypeTest.java

@@ -1,28 +1,28 @@
-package com.zipcodewilmington.generic.group;
-
-import com.zipcodewilmington.generic.identifiables.ActionFigure;
-import com.zipcodewilmington.generic.identifiables.Person;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author leon on 06/12/2018.
- * there is meaning to the madness
- * ( ͡☉ ͜ʖ ͡☉)
- */
-public class GetIdentityTypeTest {
-    private Group<String, Person> personGroup = new Group<>();
-    private Group<Long, ActionFigure> actionFigureGroup = new Group<>();
-
-    @Test
-    public void testGetIdentityType() { // ༼∵༽ ༼⍨༽ ༼⍢༽ ༼⍤༽
-        Assert.assertEquals(personGroup.getIdentityType(), String.class);
-        Assert.assertEquals(actionFigureGroup.getIdentityType(), Long.class);
-    }
-
-    @Test
-    public void testGetIdentifiableType() { // ヽ༼ ಠ益ಠ ༽ﾉ
-        Assert.assertEquals(personGroup.getIdentifiableType(), Person.class);
-        Assert.assertEquals(actionFigureGroup.getIdentifiableType(), ActionFigure.class);
-    }
-}
+//package com.zipcodewilmington.generic.group;
+//
+//import com.zipcodewilmington.generic.identifiables.ActionFigure;
+//import com.zipcodewilmington.generic.identifiables.Person;
+//import org.junit.Assert;
+//import org.junit.Test;
+//
+///**
+// * @author leon on 06/12/2018.
+// * there is meaning to the madness
+// * ( ͡☉ ͜ʖ ͡☉)
+// */
+//public class GetIdentityTypeTest {
+//    private Group<String, Person> personGroup = new Group<>();
+//    private Group<Long, ActionFigure> actionFigureGroup = new Group<>();
+//
+//    @Test
+//    public void testGetIdentityType() { // ༼∵༽ ༼⍨༽ ༼⍢༽ ༼⍤༽
+//        Assert.assertEquals(personGroup.getIdentityType(), String.class);
+//        Assert.assertEquals(actionFigureGroup.getIdentityType(), Long.class);
+//    }
+//
+//    @Test
+//    public void testGetIdentifiableType() { // ヽ༼ ಠ益ಠ ༽ﾉ
+//        Assert.assertEquals(personGroup.getIdentifiableType(), Person.class);
+//        Assert.assertEquals(actionFigureGroup.getIdentifiableType(), ActionFigure.class);
+//    }
+//}