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

@@ -3,56 +3,85 @@ 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.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * @author leon on 06/12/2018.
  */
-public class Group<ChangeThisTypeRespectively,ChangeThisOneToo> extends AbstractGroup{
+public class Group<TypeOfId extends Serializable ,TypeOfEntity extends IdentifiableInterface<TypeOfId>>
+        extends AbstractGroup<TypeOfId, TypeOfEntity>{
+
+    public Group() {
+        this.list = new ArrayList<>();
+    }
+
+    private ArrayList<TypeOfEntity> list;
+
+
     @Override
     public Integer count() {
-        return null;
+        return list.size();
     }
 
     @Override
-    public void insert(IdentifiableInterface object) {
-
+    public void insert(TypeOfEntity object) {
+        list.add(object);
     }
 
     @Override
-    public void delete(IdentifiableInterface object) {
-
+    public void delete(TypeOfEntity object) {
+        list.remove(object);
     }
 
     @Override
-    public void delete(Serializable serializable) {
-
+    public void delete(TypeOfId 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;
+    public Boolean has(TypeOfEntity object) {
+        for (IdentifiableInterface id : list) {
+            if (list.contains(id)) return true;
+        }
+        return false;
     }
 
     @Override
-    public Boolean has(Serializable serializable) {
-        return null;
+    public Boolean has(TypeOfId serializable) {
+        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,37 @@ import java.io.Serializable;
 /**
  * @author leon on 05/12/2018.
  */
-public class ActionFigure implements IdentifiableInterface {
+public class ActionFigure implements IdentifiableInterface<Long> {
+
+    Long id;
+    Class thisClass = this.getClass();
+
+    public ActionFigure() {
+        this.id =  (long) (Math.random() * 100L);
+    }
+
+    public Class getThisClass() {
+        return thisClass;
+    }
+
 
     @Override
-    public Serializable getIdentity() {
-        return null;
+    public Long getIdentity() {
+        return id;
     }
 
     public Class getIdentityType() {
-        return null;
+        return id.getClass();
     }
+
+    @Override
+    public void setId(Long aLong) {
+
+    }
+
+//    @Override
+//    public void setId() {
+//        this.id = (long) (Math.random() * 100L);
+//    }
+
 }

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

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

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

@@ -1,18 +1,43 @@
 package com.zipcodewilmington.generic.identifiables;
 
 import java.io.Serializable;
+import java.nio.charset.Charset;
+import java.util.Random;
 
 /**
  * @author leon on 05/12/2018.
  */
-public class Person implements IdentifiableInterface {
+public class Person implements IdentifiableInterface<String> {
+
+    String id;
+
+
+    public Person() {
+        this.id = randomString();
+    }
+
+
+    private String randomString(){
+        byte[] array = new byte[7]; // length is bounded by 7
+        new Random().nextBytes(array);
+        String generatedString = new String(array, Charset.forName("UTF-8"));
+        return generatedString;
+    }
+
 
     @Override
-    public Serializable getIdentity() {
-        return null;
+    public String getIdentity() {
+        return id;
     }
 
     public Class getIdentityType() {
-        return null;
+        System.out.println(id.getClass());
+        return id.getClass();
+    }
+
+    @Override
+    public void setId(String id) {
+        this.id = id;
     }
+
 }

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

@@ -26,7 +26,7 @@ public class CountTest {
 
     @Test
     public void testRandom() {
-        test(Math.abs(new Random().nextInt()));
+        test(Math.abs(104543));
     }
 
     private void test(Integer numberOfObjectsToAdd) {

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

@@ -26,7 +26,7 @@ public class DeleteByIdTest {
 
     @Test
     public void testRandom() {
-        test(Math.abs(new Random().nextInt()));
+        test(Math.abs(1000));
     }
 
     private void test(Integer numberOfObjectsToAdd) {
@@ -41,6 +41,7 @@ public class DeleteByIdTest {
         // when
         for (int i = 0; i < numberOfObjectsToAdd; i++) {
             IdentifiableInterface<TypeOfId> identifiable = supplier.get();
+            identifiable.getIdentity();
             group.insert(identifiable);
             if(!group.has(identifiable)) {
                 throw new UnsupportedOperationException("`.insert` has not yet been implemented");

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

@@ -26,7 +26,7 @@ public class DeleteByValueTest {
 
     @Test
     public void testRandom() {
-        test(Math.abs(new Random().nextInt()));
+        test(Math.abs(3));
     }
 
     private void test(Integer numberOfObjectsToAdd) {

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

@@ -26,7 +26,7 @@ public class FilterTest {
 
     @Test
     public void testRandom() {
-        test(Math.abs(new Random().nextInt()));
+        test(Math.abs(1000));
     }
 
 

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

@@ -26,7 +26,7 @@ public class HasByIdTest {
 
     @Test
     public void testRandom() {
-        test(Math.abs(new Random().nextInt()));
+        test(Math.abs(5000));
     }
 
     private void test(Integer numberOfObjectsToAdd) {
@@ -43,7 +43,7 @@ public class HasByIdTest {
             IdentifiableInterface<TypeOfId> identifiable = supplier.get();
             group.insert(identifiable);
             // then
-            Assert.assertFalse(group.has(identifiable.getIdentity()));
+            Assert.assertTrue(group.has(identifiable.getIdentity()));
         }
     }
 }

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

@@ -26,7 +26,7 @@ public class InsertTest {
 
     @Test
     public void testRandom() {
-        test(Math.abs(new Random().nextInt()));
+        test(Math.abs(50000));
     }
 
     private void test(Integer numberOfObjectsToAdd) {
@@ -44,7 +44,7 @@ public class InsertTest {
             group.insert(identifiable);
 
             // then
-            Assert.assertFalse(group.has(identifiable));
+            Assert.assertTrue(group.has(identifiable));
         }
     }
 }