From 6508c2a476dc5293155d295ed259546c6d5515d8 Mon Sep 17 00:00:00 2001
From: John Thompson <john@springframework.guru>
Date: Sat, 28 Dec 2019 13:22:08 -0500
Subject: [PATCH] fixing DI problems for assignment review

---
 .../springframework/sfgdi/controllers/PetController.java    | 6 ++++++
 .../guru/springframework/sfgdi/services/CatPetService.java  | 4 +++-
 .../guru/springframework/sfgdi/services/DogPetService.java  | 4 +++-
 src/main/resources/application.properties                   | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/guru/springframework/sfgdi/controllers/PetController.java b/src/main/java/guru/springframework/sfgdi/controllers/PetController.java
index 6810ff49e6..362534db6f 100644
--- a/src/main/java/guru/springframework/sfgdi/controllers/PetController.java
+++ b/src/main/java/guru/springframework/sfgdi/controllers/PetController.java
@@ -1,14 +1,20 @@
 package guru.springframework.sfgdi.controllers;
 
 import guru.springframework.sfgdi.services.PetService;
+import org.springframework.stereotype.Controller;
 
 /**
  * Created by jt on 12/28/19.
  */
+@Controller
 public class PetController {
 
     private final PetService petService;
 
+    public PetController(PetService petService) {
+        this.petService = petService;
+    }
+
     public String whichPetIsTheBest(){
         return petService.getPetType();
     }
diff --git a/src/main/java/guru/springframework/sfgdi/services/CatPetService.java b/src/main/java/guru/springframework/sfgdi/services/CatPetService.java
index 097cf4563d..c9552cf604 100644
--- a/src/main/java/guru/springframework/sfgdi/services/CatPetService.java
+++ b/src/main/java/guru/springframework/sfgdi/services/CatPetService.java
@@ -1,11 +1,13 @@
 package guru.springframework.sfgdi.services;
 
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 /**
  * Created by jt on 12/28/19.
  */
-@Service("cat")
+@Service
+@Profile("cat")
 public class CatPetService implements PetService {
     @Override
     public String getPetType() {
diff --git a/src/main/java/guru/springframework/sfgdi/services/DogPetService.java b/src/main/java/guru/springframework/sfgdi/services/DogPetService.java
index 9d8547e9a2..cf15b6bc0a 100644
--- a/src/main/java/guru/springframework/sfgdi/services/DogPetService.java
+++ b/src/main/java/guru/springframework/sfgdi/services/DogPetService.java
@@ -1,12 +1,14 @@
 package guru.springframework.sfgdi.services;
 
 import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
 
 /**
  * Created by jt on 12/28/19.
  */
 @Profile({"dog", "default"})
-public class DogPetService {
+@Service
+public class DogPetService implements PetService {
     public String getPetType(){
         return "Dogs are the best!";
     }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f925173f32..a5e97dc837 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1 @@
-#spring.profiles.active=EN
+spring.profiles.active=cat,EN