Finshed and I understand hashMapping now

src/main/java/org/zipcoder/store/Cart.java

@@ -12,4 +12,18 @@ public class Cart {
     public long getId(){
         return this.id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Cart cart = (Cart) o;
+        return id == cart.id;
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(id);
+    }
 }

src/main/java/org/zipcoder/store/ListMap.java

@@ -9,40 +9,81 @@ public class ListMap implements MyMap {
 
     @Override
     public int size() {
-        return -1;
+        return this.entries.size();
     }
 
     @Override
-    public boolean isEmptry() {
-        return false;
+    public boolean isEmpty() {
+        return this.entries.isEmpty();
     }
 
     @Override
     public Cart get(User key) {
-        // find the cart associate with the key
-        return null;
+        Cart cart = null;
+        for (Entry entry: entries) {
+            if(key.equals(entry.getKey())){
+                cart = entry.getValue();
+                break;
+            }
+        }
+        return cart;
+    }
+
+    public Integer getId(User key) {
+    Integer index = null;
+        for(int i =0; i < this.entries.size(); i++){
+            if(this.entries.get(i).getKey().equals(key)){
+                index = i;
+                break;
+            }
+        }
+        return index;
     }
 
     @Override
     public void put(User key, Cart value) {
-        // add the key, value entry to the entries list
+        // add the key, value entry to the entries list'
+       Integer index = this.getId(key);
+        if(index != null){
+            this.entries.get(index).setValue(value);
+        } else {
+            Entry entry = new Entry(key, value);
+            this.entries.add(entry);
+        }
     }
 
 
     @Override
     public List<User> getKeys() {
         // get all the keys in the map
-        return null;
+        List<User> users =  new ArrayList<>();
+        for (Entry entry : this.entries) {
+            users.add(entry.getKey());
+        }
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
         // get all the values in the map
-        return null;
+        List<Cart> values =  new ArrayList<>();
+        for (Entry entry : this.entries) {
+            values.add(entry.getValue());
+        }
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = null;
+        for (int i = 0; i < this.entries.size(); i++) {
+            if (this.entries.get(i).getKey().equals(key)) {
+                cart = this.entries.get(i).getValue();
+                this.entries.remove(i);
+                break;
+            }
+        }
+        return cart;
     }
+
 }

src/main/java/org/zipcoder/store/MyHashMap.java

@@ -1,10 +1,12 @@
 package org.zipcoder.store;
 
+import sun.jvm.hotspot.utilities.Hashtable;
+
 import java.util.*;
 
 public class MyHashMap implements MyMap{
     // final field that doesn't change for any object
-    private static final int BUCKET_SIZE = 15;
+    private static final int BUCKET_SIZE = 150;
 
     // instance field that can only be set once. It is different for every Object
     private final List<Entry>[] entries;
@@ -19,37 +21,87 @@ public class MyHashMap implements MyMap{
 
     @Override
     public int size() {
-        return -1;
+        int total = 0;
+        for (List<Entry> entries :this.entries) {
+            total += entries.size();
+        }
+        return total;
     }
 
     @Override
-    public boolean isEmptry() {
-        return false;
+    public boolean isEmpty() {
+        return this.size() == 0 ? true : false;
     }
 
     @Override
     public Cart get(User key) {
-        return null;
+        Cart cart = null;
+        int index = bucketIndex(key);
+        for (Entry entry :this.entries[index]) {
+            if(entry.getKey().equals(key)){
+                cart = entry.getValue();
+                break;
+            }
+        }
+        return cart;
     }
 
     @Override
     public void put(User key, Cart value) {
+        int index = bucketIndex(key);
+        boolean isPresent = false;
+        for (Entry entry1: this.entries[bucketIndex(key)]) {
+            if(entry1.getKey().equals(key)){
+                entry1.setValue(value);
+                isPresent = true;
+                break;
+            }
+        }
+
+        if(isPresent == false){
+            Entry entry = new Entry(key, value);
+            this.entries[index].add(entry);
+        }
+
+
 
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        ArrayList<User> users = new ArrayList<>();
+        for (List<Entry> entries: this.entries) {
+            for(Entry entry : entries){
+                users.add(entry.getKey());
+            }
+        }
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        ArrayList<Cart> carts = new ArrayList<>();
+        for (List<Entry> entries: this.entries) {
+            for(Entry entry : entries) {
+                carts.add(entry.getValue());
+            }
+        }
+        return carts;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+        Cart cart = null;
+        for (List<Entry> entries: this.entries) {
+            for (Entry entry: entries) {
+                if (entry.getKey().equals(key)){
+                    cart = entry.getValue();
+                    entries.remove(entry);
+                    break;
+                }
+            }
+        }
+        return cart;
     }
 
     private int bucketIndex(User key){

src/main/java/org/zipcoder/store/MyMap.java

@@ -12,7 +12,7 @@ public interface MyMap {
     /**
      * @return true if the map has one or more item in it. False otherwise.
      */
-    public boolean isEmptry();
+    public boolean isEmpty();
 
     /**
      * Return the cart associated with the user

src/main/java/org/zipcoder/store/User.java

@@ -37,4 +37,19 @@ public class User {
     public void setName(String name) {
         this.name = name;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id == user.id &&
+                Objects.equals(name, user.name);
+    }
+
+    @Override
+    public int hashCode() {
+
+        return Objects.hash(id, name);
+    }
 }

src/test/java/org/zipcoder/store/ListMapTest.java

@@ -116,7 +116,7 @@ public class ListMapTest {
 
     @Test
     public void testIsEmpty_WithoutEntry(){
-        Assert.assertTrue(myMap.isEmptry());
+        Assert.assertTrue(myMap.isEmpty());
     }
 
     @Test
@@ -129,7 +129,7 @@ public class ListMapTest {
         myMap.put(user1, cart1);
 
         // Then
-        Assert.assertFalse(myMap.isEmptry());
+        Assert.assertFalse(myMap.isEmpty());
     }
 
     @Test
@@ -175,57 +175,57 @@ public class ListMapTest {
     }
 
 //    I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
-//    @Test
-//    public void testPutAndGet_WithManyItems(){
-//        // Given
-//        int numberOfEntries = 70000;
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            myMap.put(new User(i), new Cart(i));
-//        }
-//
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            // When
-//            Cart actualCart = myMap.get(new User(i));
-//            Cart expectedCart = new Cart(i);
-//
-//            // Then
-//            Assert.assertEquals(actualCart, expectedCart);
-//        }
-//    }
+    @Test
+    public void testPutAndGet_WithManyItems(){
+        // Given
+        int numberOfEntries = 70000;
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            myMap.put(new User(i), new Cart(i));
+        }
+
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            // When
+            Cart actualCart = myMap.get(new User(i));
+            Cart expectedCart = new Cart(i);
+
+            // Then
+            Assert.assertEquals(actualCart, expectedCart);
+        }
+    }
 
 //    BONUS
-//    @Test
-//    public void testRemove(){
-//        // Given
-//        User user1 = new User("Lena");
-//        Cart cart1 = new Cart(11);
-//
-//        User user2 = new User("Jamal");
-//        Cart cart2 = new Cart(21);
-//
-//        User user3 = new User("Kelvin");
-//        Cart cart3 = new Cart(31);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//        myMap.put(user3, cart3);
-//
-//        // Then
-//        Cart actualCart = myMap.remove(user2);
-//
-//        Assert.assertEquals(cart2, actualCart);
-//        Assert.assertNull(myMap.get(user2));
-//    }
-//
-//    @Test
-//    public void testRemove_CartNotInTheMap(){
-//        // Given
-//        User user1 = new User("Lena");
-//
-//        // When & Then
-//        Assert.assertNull(myMap.remove(user1));
-//    }
+    @Test
+    public void testRemove(){
+        // Given
+        User user1 = new User("Lena");
+        Cart cart1 = new Cart(11);
+
+        User user2 = new User("Jamal");
+        Cart cart2 = new Cart(21);
+
+        User user3 = new User("Kelvin");
+        Cart cart3 = new Cart(31);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+        myMap.put(user3, cart3);
+
+        // Then
+        Cart actualCart = myMap.remove(user2);
+
+        Assert.assertEquals(cart2, actualCart);
+        Assert.assertNull(myMap.get(user2));
+    }
+
+    @Test
+    public void testRemove_CartNotInTheMap(){
+        // Given
+        User user1 = new User("Lena");
+
+        // When & Then
+        Assert.assertNull(myMap.remove(user1));
+    }
 }

src/test/java/org/zipcoder/store/MyHashMapTest.java

@@ -116,7 +116,7 @@ public class MyHashMapTest {
 
     @Test
     public void testIsEmpty_WithoutEntry(){
-        Assert.assertTrue(myMap.isEmptry());
+        Assert.assertTrue(myMap.isEmpty());
     }
 
     @Test
@@ -128,8 +128,10 @@ public class MyHashMapTest {
         // When
         myMap.put(user1, cart1);
 
+        System.out.println(myMap.size());
+
         // Then
-        Assert.assertFalse(myMap.isEmptry());
+        Assert.assertFalse(myMap.isEmpty());
     }
 
     @Test
@@ -175,56 +177,56 @@ public class MyHashMapTest {
     }
 
 //    I commented this out because it takes a long time to run. Uncomment it when implement your put method, uncomment this test
-//    @Test
-//    public void testPutAndGet_WithManyItems(){
-//        // Given
-//        int numberOfEntries = 70000;
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            myMap.put(new User(i), new Cart(i));
-//        }
-//
-//
-//        for (int i = 0; i < numberOfEntries; i++) {
-//            // When
-//            Cart actualCart = myMap.get(new User(i));
-//            Cart expectedCart = new Cart(i);
-//
-//            // Then
-//            Assert.assertEquals(actualCart, expectedCart);
-//        }
-//    }
-
-//    @Test
-//    public void testRemove(){
-//        // Given
-//        User user1 = new User("Lena");
-//        Cart cart1 = new Cart(11);
-//
-//        User user2 = new User("Jamal");
-//        Cart cart2 = new Cart(21);
-//
-//        User user3 = new User("Kelvin");
-//        Cart cart3 = new Cart(31);
-//
-//        // When
-//        myMap.put(user1, cart1);
-//        myMap.put(user2, cart2);
-//        myMap.put(user3, cart3);
-//
-//        // Then
-//        Cart actualCart = myMap.remove(user2);
-//
-//        Assert.assertEquals(cart2, actualCart);
-//        Assert.assertNull(myMap.get(user2));
-//    }
-//
-//    @Test
-//    public void testRemove_CartNotInTheMap(){
-//        // Given
-//        User user1 = new User("Lena");
-//
-//        // When & Then
-//        Assert.assertNull(myMap.remove(user1));
-//    }
+    @Test
+    public void testPutAndGet_WithManyItems(){
+        // Given
+        int numberOfEntries = 70000;
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            myMap.put(new User(i), new Cart(i));
+        }
+
+
+        for (int i = 0; i < numberOfEntries; i++) {
+            // When
+            Cart actualCart = myMap.get(new User(i));
+            Cart expectedCart = new Cart(i);
+
+            // Then
+            Assert.assertEquals(actualCart, expectedCart);
+        }
+    }
+
+    @Test
+    public void testRemove(){
+        // Given
+        User user1 = new User("Lena");
+        Cart cart1 = new Cart(11);
+
+        User user2 = new User("Jamal");
+        Cart cart2 = new Cart(21);
+
+        User user3 = new User("Kelvin");
+        Cart cart3 = new Cart(31);
+
+        // When
+        myMap.put(user1, cart1);
+        myMap.put(user2, cart2);
+        myMap.put(user3, cart3);
+
+        // Then
+        Cart actualCart = myMap.remove(user2);
+
+        Assert.assertEquals(cart2, actualCart);
+        Assert.assertNull(myMap.get(user2));
+    }
+
+    @Test
+    public void testRemove_CartNotInTheMap(){
+        // Given
+        User user1 = new User("Lena");
+
+        // When & Then
+        Assert.assertNull(myMap.remove(user1));
+    }
 }