Update Profiles to Use Spring Data JPA Services. Closes #48

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/AbstractMapService.java

@@ -43,7 +43,7 @@ void delete(T object) {
 
     private Long getNextId() {
 
-        Long nextId = null;
+        Long nextId;
 
         try {
             nextId = Collections.max(map.keySet()) + 1;

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/OwnerMapService.java

@@ -5,11 +5,13 @@
 import guru.springframework.sfgpetclinic.services.OwnerService;
 import guru.springframework.sfgpetclinic.services.PetService;
 import guru.springframework.sfgpetclinic.services.PetTypeService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;
 
 @Service
+@Profile({"default", "map"})
 public class OwnerMapService extends AbstractMapService<Owner, Long> implements OwnerService {
 
     private final PetTypeService petTypeService;

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetMapService.java

@@ -2,11 +2,13 @@
 
 import guru.springframework.sfgpetclinic.model.Pet;
 import guru.springframework.sfgpetclinic.services.PetService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;
 
 @Service
+@Profile({"default", "map"})
 public class PetMapService extends AbstractMapService<Pet, Long> implements PetService {
     @Override
     public Set<Pet> findAll() {

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetTypeMapService.java

@@ -2,11 +2,13 @@
 
 import guru.springframework.sfgpetclinic.model.PetType;
 import guru.springframework.sfgpetclinic.services.PetTypeService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;
 
 @Service
+@Profile({"default", "map"})
 public class PetTypeMapService extends AbstractMapService<PetType, Long> implements PetTypeService {
 
     @Override

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/SpecialtyMapService.java

@@ -2,11 +2,13 @@
 
 import guru.springframework.sfgpetclinic.model.Specialty;
 import guru.springframework.sfgpetclinic.services.SpecialtyService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;
 
 @Service
+@Profile({"default", "map"})
 public class SpecialtyMapService extends AbstractMapService<Specialty, Long> implements SpecialtyService {
 
     @Override

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VetMapService.java

@@ -4,11 +4,13 @@
 import guru.springframework.sfgpetclinic.model.Vet;
 import guru.springframework.sfgpetclinic.services.SpecialtyService;
 import guru.springframework.sfgpetclinic.services.VetService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;
 
 @Service
+@Profile({"default", "map"})
 public class VetMapService extends AbstractMapService<Vet, Long> implements VetService {
 
     private final SpecialtyService specialtyService;

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VisitMapService.java

@@ -2,11 +2,13 @@
 
 import guru.springframework.sfgpetclinic.model.Visit;
 import guru.springframework.sfgpetclinic.services.VisitService;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import java.util.Set;
 
 @Service
+@Profile({"default", "map"})
 public class VisitMapService extends AbstractMapService<Visit, Long> implements VisitService {
 
     @Override

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/OwnerSDJpaService.java

@@ -12,7 +12,7 @@
 import java.util.Set;
 
 @Service
-@Profile("sprindatajpa")
+@Profile("springdatajpa")
 public class OwnerSDJpaService implements OwnerService {
 
     private final OwnerRepository ownerRepository;

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/PetSDJpaService.java

@@ -10,7 +10,7 @@
 import java.util.Set;
 
 @Service
-@Profile("sprindatajpa")
+@Profile("springdatajpa")
 public class PetSDJpaService implements PetService {
 
     private final PetRepository petRepository;

pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/SpecialtySDJpaService.java

@@ -10,7 +10,7 @@
 import java.util.Set;
 
 @Service
-@Profile("sprindatajpa")
+@Profile("springdatajpa")
 public class SpecialtySDJpaService implements SpecialtyService {
 
     private final SpecialtyRepository specialtyRepository;

pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/bootstrap/DataLoader.java

@@ -29,7 +29,7 @@ public DataLoader(OwnerService ownerService,
     }
 
     @Override
-    public void run(String... args) throws Exception {
+    public void run(String... args) {
 
         int count = petTypeService.findAll().size();
 

pet-clinic-web/src/main/resources/application.properties

@@ -2,4 +2,6 @@ spring.banner.image.location=avatar.jpg
 server.port=8181
 
 # internationalisation
-spring.messages.basename=messages/messages
+spring.messages.basename=messages/messages
+
+spring.profiles.active=springdatajpa