Merge branch 'master' into factory-beans

src/main/java/guru/springframework/sfgdi/config/GreetingServiceConfiguration.java

@@ -1,9 +1,12 @@
 package guru.springframework.sfgdi.config;
 
+
 import guru.springframework.pets.CatPetService;
 import guru.springframework.pets.DogPetService;
 import guru.springframework.pets.PetService;
 import guru.springframework.pets.PetServiceFactory;
+import guru.springframework.sfgdi.repositories.EnglishGreetingRepository;
+import guru.springframework.sfgdi.repositories.EnglishGreetingRepositoryImpl;
 import guru.springframework.sfgdi.services.*;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -34,16 +37,26 @@ PrimaryGreetingService primaryGreetingService() {
         return new PrimaryGreetingService();
     }
 
+
     @Profile({"ES", "default"})
     @Bean(name = "i18nService")
     I18NSpanishService i18NSpanishService() {
         return new I18NSpanishService();
     }
 
+
     @Profile("EN")
     @Bean
     I18nEnglishGreetingService i18nService() {
         return new I18nEnglishGreetingService();
+    @Bean
+    EnglishGreetingRepository englishGreetingRepository(){
+        return new EnglishGreetingRepositoryImpl();
+    }
+    @Profile("EN")
+    @Bean
+    I18nEnglishGreetingService i18nService(){
+        return new I18nEnglishGreetingService(englishGreetingRepository());
     }
 
     @Bean

src/main/java/guru/springframework/sfgdi/repositories/EnglishGreetingRepository.java

@@ -0,0 +1,5 @@
+package guru.springframework.sfgdi.repositories;
+
+public interface EnglishGreetingRepository {
+    String getGreeting();
+}

src/main/java/guru/springframework/sfgdi/repositories/EnglishGreetingRepositoryImpl.java

@@ -0,0 +1,8 @@
+package guru.springframework.sfgdi.repositories;
+
+public class EnglishGreetingRepositoryImpl implements EnglishGreetingRepository {
+    @Override
+    public String getGreeting() {
+        return "Hello World - EN-from repo";
+    }
+}

src/main/java/guru/springframework/sfgdi/services/I18nEnglishGreetingService.java

@@ -1,14 +1,20 @@
 package guru.springframework.sfgdi.services;
 
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
+import guru.springframework.sfgdi.repositories.EnglishGreetingRepository;
 
 /**
  * Created by jt on 12/27/19.
  */
 public class I18nEnglishGreetingService implements GreetingService {
+
+    private final EnglishGreetingRepository englishGreetingRepository;
+
+    public I18nEnglishGreetingService(EnglishGreetingRepository englishGreetingRepository) {
+        this.englishGreetingRepository = englishGreetingRepository;
+    }
+
     @Override
     public String sayGreeting() {
-        return "Hello World - EN";
+        return  this.englishGreetingRepository.getGreeting();
     }
 }

src/main/resources/application.properties

@@ -1 +1 @@
-spring.profiles.active=cat,ES
+spring.profiles.active=cat,EN