Update Map implementation to manage setting of ID Property. Closes #39

Signed-off-by: Ankur Paul <[email protected]>

Author: nooobcoder

Track 2_JAVA and SQL/SpringFramework/SpringPetClinic/pet-clinic-data/src/main/java/com/example/springpetclinic/services/map/AbstractMapService.java

@@ -1,12 +1,16 @@
 package com.example.springpetclinic.services.map;
 
+import com.example.springpetclinic.model.BaseEntity;
+
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Set;
 
-public abstract class AbstractMapService<T, ID> {
-    protected Map<ID, T> map = new HashMap<>();
+public abstract class AbstractMapService<T extends BaseEntity, ID extends Long> {
+    protected Map<Long, T> map = new HashMap<>();
 
     Set<T> findAll() {
         return new HashSet<>(map.values());
@@ -16,8 +20,15 @@ T findById(ID id) {
         return map.get(id);
     }
 
-    T save(ID id, T object) {
-        map.put(id, object);
+    T save(T object) {
+        if (object != null) {
+            if (object.getId() == null) {
+                object.setId(getNextId());
+            }
+            map.put(object.getId(), object);
+        } else {
+            throw new RuntimeException("Object cannot be null");
+        }
 
         return object;
     }
@@ -29,4 +40,15 @@ void deleteById(ID id) {
     void delete(T object) {
         map.entrySet().removeIf(entry -> entry.getValue().equals(object));
     }
+
+    private Long getNextId() {
+
+        Long nextId = null;
+        try {
+            nextId = Collections.max(map.keySet()) + 1;
+        } catch (NoSuchElementException e) {
+            nextId = 1L;
+        }
+        return nextId;
+    }
 }

Track 2_JAVA and SQL/SpringFramework/SpringPetClinic/pet-clinic-data/src/main/java/com/example/springpetclinic/services/map/OwnerMapService.java

@@ -25,7 +25,7 @@ public Owner findById(Long id) {
 
     @Override
     public Owner save(Owner object) {
-        return super.save(object.getId(), object);
+        return super.save(object);
     }
 
     @Override

Track 2_JAVA and SQL/SpringFramework/SpringPetClinic/pet-clinic-data/src/main/java/com/example/springpetclinic/services/map/PetMapService.java

@@ -20,7 +20,7 @@ public Pet findById(Long id) {
 
     @Override
     public Pet save(Pet object) {
-        return super.save(object.getId(), object);
+        return super.save(object);
     }
 
     @Override

Track 2_JAVA and SQL/SpringFramework/SpringPetClinic/pet-clinic-data/src/main/java/com/example/springpetclinic/services/map/VetMapService.java

@@ -11,19 +11,16 @@ public class VetMapService extends AbstractMapService<Vet, Long> implements VetS
     @Override
     public Set<Vet> findAll() {
         return super.findAll();
-
     }
 
     @Override
     public Vet findById(Long id) {
         return super.findById(id);
-
     }
 
     @Override
     public Vet save(Vet object) {
-        return super.save(object.getId(), object);
-
+        return super.save(object);
     }
 
     @Override

Track 2_JAVA and SQL/SpringFramework/SpringPetClinic/pet-clinic-web/src/main/java/com/example/springpetclinic/bootstrap/DataLoader.java

@@ -22,27 +22,23 @@ public DataLoader(OwnerService ownerService, VetService vetService) {
     @Override
     public void run(String... args) throws Exception {
         Owner owner = new Owner();
-        owner.setId(1L);
         owner.setFirstName("Michael");
         owner.setLastName("Michael");
         ownerService.save(owner);
 
         owner = new Owner();
-        owner.setId(2L);
         owner.setFirstName("Fiona");
         owner.setLastName("Glenanne");
         ownerService.save(owner);
 
         System.out.println("Loaded Owners...");
 
         Vet vet = new Vet();
-        vet.setId(1L);
         vet.setFirstName("Sam");
         vet.setLastName("Axe");
         vetService.save(vet);
 
         vet = new Vet();
-        vet.setId(2L);
         vet.setFirstName("Jessie");
         vet.setLastName("Porter");
         vetService.save(vet);