add more examples

src/main/java/ch/mare/springfundamentals/beanscopes/AppConfig.java

@@ -2,7 +2,7 @@
 
 import org.springframework.context.annotation.ComponentScan;
 
-@ComponentScan(basePackages = {"ch.mare.springfundamentals.beanscopes._01"})
+@ComponentScan(basePackages = {"ch.mare.springfundamentals.beanscopes"})
 public class AppConfig {
 
 }

src/main/java/ch/mare/springfundamentals/beanscopes/Application.java

@@ -1,6 +1,5 @@
 package ch.mare.springfundamentals.beanscopes;
 
-import ch.mare.springfundamentals.dependencyinjection.di_03.CustomerController;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
@@ -9,8 +8,18 @@ public class Application {
   public static void main(String[] args) {
     ApplicationContext ctx = new AnnotationConfigApplicationContext(AppConfig.class);
 
-    CustomerController customerController = ctx.getBean(CustomerController.class);
+    SingletonComponent singletonComponent1 = ctx.getBean(SingletonComponent.class);
+    SingletonComponent singletonComponent2 = ctx.getBean(SingletonComponent.class);
+
+    System.out.println(singletonComponent1.toString());
+    System.out.println(singletonComponent2.toString());
+
+    PrototypeComponent prototypeComponent1 = ctx.getBean(PrototypeComponent.class);
+    PrototypeComponent prototypeComponent2 = ctx.getBean(PrototypeComponent.class);
+
+    System.out.println(prototypeComponent1.toString());
+    System.out.println(prototypeComponent2.toString());
+
 
-    customerController.removeCustomerAccount("123");
   }
 }

src/main/java/ch/mare/springfundamentals/beanscopes/PrototypeComponent.java

@@ -0,0 +1,10 @@
+package ch.mare.springfundamentals.beanscopes;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope("prototype")
+public class PrototypeComponent {
+
+}

src/main/java/ch/mare/springfundamentals/beanscopes/SingletonComponent.java

@@ -0,0 +1,10 @@
+package ch.mare.springfundamentals.beanscopes;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+@Component
+@Scope("singleton")
+public class SingletonComponent {
+
+}

src/main/java/ch/mare/springfundamentals/dependencyinjection/di_01/Application.java

@@ -1,9 +1,12 @@
 package ch.mare.springfundamentals.dependencyinjection.di_01;
 
+import ch.mare.springfundamentals.dependencyinjection.di_01.controller.CustomerController;
+
 public class Application {
 
   public static void main(String[] args) {
-
+    CustomerController customerController = new CustomerController();
+    customerController.deactivateCustomerAccount("1");
   }
 
 }

src/main/java/ch/mare/springfundamentals/dependencyinjection/di_01/controller/CustomerController.java

@@ -1,7 +1,12 @@
 package ch.mare.springfundamentals.dependencyinjection.di_01.controller;
 
-public class CustomerController {
+import ch.mare.springfundamentals.dependencyinjection.di_01.service.CustomerService;
 
+public class CustomerController {
 
+  public void deactivateCustomerAccount(String customerId) {
+    CustomerService customerService = new CustomerService();
+    customerService.deactivateCustomer(customerId);
+  }
 
 }

src/main/java/ch/mare/springfundamentals/dependencyinjection/di_01/dataaccess/CustomerLoader.java

@@ -1,20 +1,10 @@
 package ch.mare.springfundamentals.dependencyinjection.di_01.dataaccess;
 
 import ch.mare.springfundamentals.dependencyinjection.common.domain.Customer;
-import ch.mare.springfundamentals.dependencyinjection.common.domain.MailingAddress;
-import java.util.HashMap;
-import java.util.Map;
 
 public class CustomerLoader {
 
-
-  private static final Map<String, Customer> DATABASE = new HashMap<>() {{
-    put("1", new Customer("1", "Hans Wurst", new MailingAddress("Hauptstrasse 2", "Zürich"), "[email protected]"));
-    put("2", new Customer("2", "Peter Peterson", new MailingAddress("Bahnhofsweg 100", "Bern"), "[email protected]"));
-  }};
-
   public Customer findById(String customerId) {
-    return DATABASE.get(customerId);
+    return InMemoryDatabase.DATABASE.get(customerId);
   }
-
 }

src/main/java/ch/mare/springfundamentals/dependencyinjection/di_01/dataaccess/InMemoryDatabase.java

@@ -0,0 +1,14 @@
+package ch.mare.springfundamentals.dependencyinjection.di_01.dataaccess;
+
+import ch.mare.springfundamentals.dependencyinjection.common.domain.Customer;
+import ch.mare.springfundamentals.dependencyinjection.common.domain.MailingAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+public class InMemoryDatabase {
+
+  public static final Map<String, Customer> DATABASE = new HashMap<>() {{
+    put("1", new Customer("1", "Hans Wurst", new MailingAddress("Hauptstrasse 2", "Zürich"), "[email protected]"));
+    put("2", new Customer("2", "Peter Peterson", new MailingAddress("Bahnhofsweg 100", "Bern"), "[email protected]"));
+  }};
+}

src/main/java/ch/mare/springfundamentals/dependencyinjection/di_01/service/CustomerService.java

@@ -7,7 +7,7 @@
 
 public class CustomerService {
 
-  public void removeCustomer(String customerId) {
+  public void deactivateCustomer(String customerId) {
 
     CustomerLoader customerLoader = new CustomerLoader();
     Customer customer = customerLoader.findById(customerId);

src/main/java/ch/mare/springfundamentals/profiles/_02/dataaccess/mock/CustomerLoaderMock.java

@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Service;
 
 @Service
+@Profile({"mock"})
 public class CustomerLoaderMock implements CustomerLoader {
   private static final Map<String, Customer> DATABASE = new HashMap<>() {{
     put("1", new Customer("1", "Hans Tester", new MailingAddress("Teststrasse 2", "Zürich"), "[email protected]"));

src/main/java/ch/mare/springfundamentals/profiles/_02/dataaccess/real/CustomerLoaderReal.java

@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Service;
 
 @Service
+@Profile("real")
 public class CustomerLoaderReal implements CustomerLoader {
 
   private static final Map<String, Customer> DATABASE = new HashMap<>() {{