From 0a31cdbcad03e32c1fac2edab70e844d52fa685c Mon Sep 17 00:00:00 2001
From: falconsmilie <heizenburgblue@gmail.com>
Date: Fri, 7 Feb 2020 08:01:04 +0100
Subject: [PATCH] Update Profiles to Use Spring Data JPA Services. Closes #48

---
 .../sfgpetclinic/services/map/AbstractMapService.java         | 2 +-
 .../sfgpetclinic/services/map/OwnerMapService.java            | 2 ++
 .../sfgpetclinic/services/map/PetMapService.java              | 2 ++
 .../sfgpetclinic/services/map/PetTypeMapService.java          | 2 ++
 .../sfgpetclinic/services/map/SpecialtyMapService.java        | 2 ++
 .../sfgpetclinic/services/map/VetMapService.java              | 2 ++
 .../sfgpetclinic/services/map/VisitMapService.java            | 2 ++
 .../services/springdatajpa/OwnerSDJpaService.java             | 2 +-
 .../sfgpetclinic/services/springdatajpa/PetSDJpaService.java  | 2 +-
 .../services/springdatajpa/SpecialtySDJpaService.java         | 2 +-
 .../springframework/sfgpetclinic/bootstrap/DataLoader.java    | 2 +-
 pet-clinic-web/src/main/resources/application.properties      | 4 +++-
 12 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/AbstractMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/AbstractMapService.java
index 0dc700d..d34c86a 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/AbstractMapService.java
+++ b/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;
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/OwnerMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/OwnerMapService.java
index 4dfb999..fd13a21 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/OwnerMapService.java
+++ b/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;
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetMapService.java
index 13ebdf3..d57caea 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetMapService.java
+++ b/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() {
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetTypeMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetTypeMapService.java
index 8308e56..786675f 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/PetTypeMapService.java
+++ b/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
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/SpecialtyMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/SpecialtyMapService.java
index 583dafe..eabaf6b 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/SpecialtyMapService.java
+++ b/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
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VetMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VetMapService.java
index c913bc9..671cab9 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VetMapService.java
+++ b/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;
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VisitMapService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VisitMapService.java
index fc6c81c..e242730 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/map/VisitMapService.java
+++ b/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
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/OwnerSDJpaService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/OwnerSDJpaService.java
index 76bba5e..8762f33 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/OwnerSDJpaService.java
+++ b/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;
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/PetSDJpaService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/PetSDJpaService.java
index bc720ec..6610fc7 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/PetSDJpaService.java
+++ b/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;
diff --git a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/SpecialtySDJpaService.java b/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/SpecialtySDJpaService.java
index 9df7b2e..73d3365 100644
--- a/pet-clinic-data/src/main/java/guru/springframework/sfgpetclinic/services/springdatajpa/SpecialtySDJpaService.java
+++ b/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;
diff --git a/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/bootstrap/DataLoader.java b/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/bootstrap/DataLoader.java
index ba6cd87..8499d29 100644
--- a/pet-clinic-web/src/main/java/guru/springframework/sfgpetclinic/bootstrap/DataLoader.java
+++ b/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();
 
diff --git a/pet-clinic-web/src/main/resources/application.properties b/pet-clinic-web/src/main/resources/application.properties
index 52c809b..d274005 100644
--- a/pet-clinic-web/src/main/resources/application.properties
+++ b/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
\ No newline at end of file
+spring.messages.basename=messages/messages
+
+spring.profiles.active=springdatajpa
\ No newline at end of file