Merge pull request #10 from ralf-ueberfuhr-ars/feature/config

Configure application using application.yml and configuration class

account-service-provider/src/main/java/de/sample/schulung/accounts/boundary/IndexPageConfiguration.java

@@ -0,0 +1,28 @@
+package de.sample.schulung.accounts.boundary;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/*
+ * Lösung lt. Spring MVC
+ *  - Implementiere einen WebMvcConfigurer
+ *  - Packe diese Implementierung (Objekt) in den Context (Eimer)
+ */
+@Configuration // Spring Boot AutoConfiguration
+public class IndexPageConfiguration {
+
+  @Bean //Rückgabewert der Methode wird in den Eimer gepackt
+  WebMvcConfigurer indexPageConfig() {
+    return new WebMvcConfigurer() {
+      @Override
+      public void addViewControllers(ViewControllerRegistry registry) {
+        registry
+          .addViewController("/")
+          .setViewName("redirect:/index.html");
+      }
+    };
+  }
+
+}

account-service-provider/src/main/java/de/sample/schulung/accounts/domain/CustomersInitializer.java

@@ -1,6 +1,10 @@
 package de.sample.schulung.accounts.domain;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
@@ -11,28 +15,50 @@
 
 @Component
 @RequiredArgsConstructor
+@Slf4j
 public class CustomersInitializer {
 
+  /*
+   * let's use a separate class for the configuration
+   *  - default constructor
+   *  - injected into the CustomersInitializer
+   *  - could be placed in a separate JAVA file too
+   */
+  @Component
+  @ConfigurationProperties(prefix = "application.customers.initialization")
+  @Getter
+  @Setter
+  public static class CustomerInitialerConfiguration {
+
+    private boolean enabled;
+
+  }
+
   private final CustomersService service;
+  private final CustomerInitialerConfiguration config;
+
 
   @EventListener(ContextRefreshedEvent.class)
   public void init() {
-    service.createCustomer(
-      new Customer(
-        null,
-        "Max",
-        LocalDate.of(2010, Month.FEBRUARY, 10),
-        Customer.CustomerState.ACTIVE
-      )
-    );
-    service.createCustomer(
-      new Customer(
-        UUID.randomUUID(),
-        "Julia",
-        LocalDate.of(2011, Month.APRIL, 2),
-        Customer.CustomerState.DISABLED
-      )
-    );
+    if(this.config.enabled) {
+      log.info("Initializing customers");
+      service.createCustomer(
+        new Customer(
+          null,
+          "Max",
+          LocalDate.of(2010, Month.FEBRUARY, 10),
+          Customer.CustomerState.ACTIVE
+        )
+      );
+      service.createCustomer(
+        new Customer(
+          UUID.randomUUID(),
+          "Julia",
+          LocalDate.of(2011, Month.APRIL, 2),
+          Customer.CustomerState.DISABLED
+        )
+      );
+    }
   }
 
 

account-service-provider/src/main/resources/application-local.yml

@@ -0,0 +1,4 @@
+application:
+  customers:
+    initialization:
+      enabled: true

account-service-provider/src/main/resources/application.yml

@@ -0,0 +1,9 @@
+server:
+  port: 8080
+spring:
+  jackson:
+    property-naming-strategy: SNAKE_CASE
+application:
+  customers:
+    initialization:
+      enabled: ${CUSTOMERS_INITIALIZATION_ENABLED:false}

account-service-provider/src/test/java/de/sample/schulung/accounts/AccountsApiTests.java

@@ -16,6 +16,7 @@
 
 @SpringBootTest
 @AutoConfigureMockMvc
+//@ActiveProfiles("local")
 class AccountsApiTests {
 
   @Autowired

account-service-provider/src/test/java/de/sample/schulung/accounts/IndexPageTests.java

@@ -0,0 +1,34 @@
+package de.sample.schulung.accounts;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+public class IndexPageTests {
+
+  @Autowired
+  MockMvc mvc;
+
+  @Test
+  void shouldRedirectIndexPage() throws Exception {
+    var location = mvc.perform(
+      get("/")
+    )
+      .andExpect(status().isFound())
+      .andExpect(header().exists("Location"))
+      .andReturn()
+      .getResponse()
+      .getHeader("Location");
+    assertThat(location).endsWith("/index.html");
+  }
+
+}

account-service-provider/src/test/java/de/sample/schulung/accounts/boundary/AccountsBoundaryTests.java

@@ -3,8 +3,6 @@
 import de.sample.schulung.accounts.domain.CustomersService;
 import de.sample.schulung.accounts.domain.NotFoundException;
 import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -21,7 +19,12 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@SpringBootTest
+@SpringBootTest(
+  // disable initializer for these tests
+  properties = {
+    "application.customers.initialization.enabled=false"
+  }
+)
 @AutoConfigureMockMvc
 public class AccountsBoundaryTests {
 

account-service-provider/src/test/java/de/sample/schulung/accounts/domain/CustomersInitializerTests.java

@@ -8,7 +8,11 @@
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.verify;
 
-@SpringBootTest
+@SpringBootTest(
+  properties = {
+    "application.customers.initialization.enabled=true"
+  }
+)
 public class CustomersInitializerTests {
 
   @MockBean