completed map lab

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

@@ -9,6 +9,19 @@ public class Cart {
         this.id = 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);
+    }
+
     public long getId(){
         return this.id;
     }

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

@@ -1,7 +1,9 @@
 package org.zipcoder.store;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 public class ListMap implements MyMap {
     // instance field that is intialize to an ArrayList
@@ -9,40 +11,78 @@ public class ListMap implements MyMap {
 
     @Override
     public int size() {
-        return -1;
+        return entries.size();
     }
 
     @Override
     public boolean isEmptry() {
-        return false;
+        if(entries.size() == 0){return true;} else {return false;}
     }
 
     @Override
     public Cart get(User key) {
-        // find the cart associate with the key
+        for(Entry entry : entries){
+            if(entry.getKey().equals(key)){
+                return entry.getValue();
+            }
+        }
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
         // add the key, value entry to the entries list
+        Entry entry = new Entry(key, value);
+        boolean added = false;
+
+        for(Entry entry1 : entries){
+            if(entry1.getKey().equals(key)){
+                entries.remove(entry1);
+                entries.add(entry);
+                added = true;
+                break;
+            }
+        }
+        if(!added){
+            entries.add(entry);
+        }
     }
 
 
     @Override
     public List<User> getKeys() {
-        // get all the keys in the map
-        return null;
+        List<User> keys = new ArrayList<>();
+
+        for(Entry entry : entries){
+            keys.add(entry.getKey());
+        }
+
+        return keys;
     }
 
     @Override
     public List<Cart> getValues() {
-        // get all the values in the map
-        return null;
+        List<Cart> values = new ArrayList<>();
+
+        for(Entry entry : entries){
+            values.add(entry.getValue());
+        }
+
+        return values;
     }
 
     @Override
     public Cart remove(User key) {
+        Iterator<Entry> entries = this.entries.iterator();
+
+        while(entries.hasNext()){
+            Entry entry = entries.next();
+            if(entry.getKey().equals(key)){
+                Entry removeEnt = entry;
+                entries.remove();
+                return removeEnt.getValue();
+            }
+        }
         return null;
     }
 }

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

@@ -4,7 +4,7 @@ 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 = 100;
 
     // instance field that can only be set once. It is different for every Object
     private final List<Entry>[] entries;
@@ -13,43 +13,112 @@ public class MyHashMap implements MyMap{
         entries = new List[BUCKET_SIZE];
 
         for(int i = 0; i < BUCKET_SIZE; i++) {
-            entries[i] = new ArrayList<>();
+            entries[i] = new ArrayList<Entry>();
         }
     }
 
     @Override
     public int size() {
-        return -1;
+        int size = 0;
+
+        for(List list : entries){
+            size += list.size();
+        }
+
+        return size;
     }
 
     @Override
     public boolean isEmptry() {
+
+        if(size() == 0){
+            return true;
+        }
+
         return false;
     }
 
     @Override
     public Cart get(User key) {
+
+        for(int i = 0; i < entries.length; i ++){
+            for(int m = 0; m < entries[i].size(); m ++){
+                Entry entry = entries[i].get(m);
+                if(entry.getKey().equals(key)){
+                    return entry.getValue();
+                }
+            }
+        }
+
         return null;
     }
 
     @Override
     public void put(User key, Cart value) {
+        int index = bucketIndex(key);
+        boolean added = false;
 
+        List list = entries[index];
+
+        if(list.size() != 0) {
+            for (int i = 0; i < list.size(); i++) {
+                if (((Entry) list.get(i)).getKey().equals(key)) {
+                    Entry entry = (Entry) list.get(i);
+                    list.remove(entry);
+                    list.add(new Entry(key, value));
+                    added = true;
+                }
+            }
+        }
+        if(!added) {
+            entries[index].add(new Entry(key, value));
+        }
     }
 
     @Override
     public List<User> getKeys() {
-        return null;
+        List<User> users = new ArrayList<>();
+
+        for(int i = 0; i < entries.length; i ++){
+            List list = entries[i];
+            for(int m = 0; m < list.size(); m ++){
+                Entry entry = (Entry) list.get(m);
+                users.add(entry.getKey());
+            }
+        }
+        return users;
     }
 
     @Override
     public List<Cart> getValues() {
-        return null;
+        List<Cart> carts = new ArrayList<>();
+
+        for(int i = 0; i < entries.length; i ++){
+            List list = entries[i];
+            for(int m = 0; m < list.size(); m ++){
+                Entry entry = (Entry) list.get(m);
+                carts.add(entry.getValue());
+            }
+        }
+        return carts;
     }
 
     @Override
     public Cart remove(User key) {
-        return null;
+
+        Cart removeCart = null;
+
+        for(int i = 0; i < entries.length; i ++){
+            List list = entries[i];
+            for(int m = 0; m < list.size(); m ++){
+                Entry entry = (Entry) (list.get(m));
+                if(entry.getKey().equals(key)){
+                    removeCart = entry.getValue();
+                    list.remove(entry);
+                }
+            }
+        }
+        return removeCart;
     }
 
     private int bucketIndex(User key){

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

@@ -37,4 +37,21 @@ public class User {
     public void setName(String name) {
         this.name = name;
     }
+
+    public boolean equals(User user){
+
+        boolean result = false;
+
+        if(this.id == user.id && user.getName() != null){
+            if(user.getName().equals(this.name)){
+                result = true;
+            }
+        } else if(this.id == user.id && user.getName() == null){
+            result = true;
+        }
+
+        return result;
+    }
+
+    public int hashCode(){ return Objects.hash(this.id, this.name); }
 }

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

@@ -174,58 +174,55 @@ public class ListMapTest {
         Assert.assertTrue(values.contains(cart2));
     }
 
-//    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);
-//        }
-//    }
-
-//    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 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));
+    }
 }

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

@@ -174,57 +174,56 @@ public class MyHashMapTest {
         Assert.assertTrue(values.contains(cart2));
     }
 
-//    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));
+    }
 }