refactoring of java classes

Author: thomaswoehlke

src/main/resources/application.yml

@@ -62,58 +62,59 @@ spring:
       continue-on-error: true
 org:
   woehlke:
-    simpleworklist:
-      mail:
-        host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST}
-        port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT}
-        username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME}
-        password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD}
-        auth: true
-        sslEnable: true
-        socketFactoryPort: 465
-        socketFactoryClass: javax.net.ssl.SSLSocketFactory
-      registration:
-        maxRetries: 5
-        ttlEmailVerificationRequest: 86400000
-        urlHost: ${SIMPLEWORKLIST_URL_APP_HOST}
-        mailFrom: ${SIMPLEWORKLIST_MAIL_FROM}
-      webMvc:
-        controllerPageSize: 10
-        staticResourceHandler:
-          - "/css"
-          - "/img"
-          - "/js"
-        dynamicResourceHandler:
-          - "/webjars"
-      webSecurity:
-        strengthBCryptPasswordEncoder: 10
-        # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS}
-        # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH}
-        # secret: ${SIMPLEWORKLIST_USER_SECRET}
-        loginProcessingUrl: "/j_spring_security_check"
-        logoutUrl: "/user/logout"
-        cookieNamesToClear:
-          - "JSESSIONID"
-        invalidateHttpSession: true
-        defaultSuccessUrl: "/"
-        failureForwardUrl: "/user/login?login_error=1"
-        usernameParameter: "j_username"
-        passwordParameter: "j_password"
-        loginPage: "/user/login"
-        antPatternsPublic:
-          - "/webjars/**"
-          - "/css/**"
-          - "/img/**"
-          - "/js/**"
-          - "/favicon.ico"
-          - "/user/login*"
-          - "/user/register*"
-          - "/user/register/**"
-          - "/user/register/confirm/**"
-          - "/user/resetPassword*"
-          - "/user/resetPassword/**"
-          - "/user/resetPassword/confirm/**"
-          - "/error*"
+    java:
+      simpleworklist:
+        mail:
+          host: ${SIMPLEWORKLIST_MAIL_SMTP_HOST}
+          port: ${SIMPLEWORKLIST_MAIL_SMTP_PORT}
+          username: ${SIMPLEWORKLIST_MAIL_SMTP_USERNAME}
+          password: ${SIMPLEWORKLIST_MAIL_SMTP_PASSWORD}
+          auth: true
+          sslEnable: true
+          socketFactoryPort: 465
+          socketFactoryClass: javax.net.ssl.SSLSocketFactory
+        registration:
+          maxRetries: 5
+          ttlEmailVerificationRequest: 86400000
+          urlHost: ${SIMPLEWORKLIST_URL_APP_HOST}
+          mailFrom: ${SIMPLEWORKLIST_MAIL_FROM}
+        webMvc:
+          controllerPageSize: 10
+          staticResourceHandler:
+            - "/css"
+            - "/img"
+            - "/js"
+          dynamicResourceHandler:
+            - "/webjars"
+        webSecurity:
+          strengthBCryptPasswordEncoder: 10
+          # iterations: ${SIMPLEWORKLIST_USER_ITERATIONS}
+          # hashWidth: ${SIMPLEWORKLIST_USER_HASH_WIDTH}
+          # secret: ${SIMPLEWORKLIST_USER_SECRET}
+          loginProcessingUrl: "/j_spring_security_check"
+          logoutUrl: "/user/logout"
+          cookieNamesToClear:
+            - "JSESSIONID"
+          invalidateHttpSession: true
+          defaultSuccessUrl: "/"
+          failureForwardUrl: "/user/login?login_error=1"
+          usernameParameter: "j_username"
+          passwordParameter: "j_password"
+          loginPage: "/user/login"
+          antPatternsPublic:
+            - "/webjars/**"
+            - "/css/**"
+            - "/img/**"
+            - "/js/**"
+            - "/favicon.ico"
+            - "/user/login*"
+            - "/user/register*"
+            - "/user/register/**"
+            - "/user/register/confirm/**"
+            - "/user/resetPassword*"
+            - "/user/resetPassword/**"
+            - "/user/resetPassword/confirm/**"
+            - "/error*"
 logging:
   level:
     root: INFO
@@ -169,14 +170,15 @@ logging:
       ch:
         qos: WARN
       woehlke:
-        simpleworklist:
-          application: DEBUG
-          config: DEBUG
-          measurements: DEBUG
-          user: DEBUG
-          domain: DEBUG
-          services: DEBUG
-          common: INFO
+        java:
+          simpleworklist:
+            application: DEBUG
+            config: DEBUG
+            measurements: DEBUG
+            user: DEBUG
+            domain: DEBUG
+            services: DEBUG
+            common: INFO
 debug: false
 ---
 spring:
@@ -210,12 +212,13 @@ logging:
         qos: WARN
       postgresql: WARN
       woehlke:
-        simpleworklist:
-          application: INFO
-          config: INFO
-          measurements: INFO
-          user: INFO
-          domain: INFO
-          services: INFO
-          common: INFO
+        java:
+          simpleworklist:
+            application: INFO
+            config: INFO
+            measurements: INFO
+            user: INFO
+            domain: INFO
+            services: INFO
+            common: INFO
 debug: false

src/test/java/org/woehlke/java/simpleworklist/test/SmokeTests.java

@@ -15,6 +15,7 @@
 import org.springframework.test.web.servlet.ResultActions;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.woehlke.java.simpleworklist.SimpleworklistApplication;
+import org.woehlke.java.simpleworklist.test.application.config.FunctionalRequirements;
 import org.woehlke.java.simpleworklist.test.application.config.UserAccountTestDataService;
 
 import java.net.URL;
@@ -25,6 +26,7 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.woehlke.java.simpleworklist.test.application.config.Requirements.*;
 
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)

src/test/java/org/woehlke/java/simpleworklist/test/application/config/Requirements.java

@@ -2,7 +2,7 @@
 
 public interface Requirements {
 
-String Functional_Requirements = "Functional Requirements";
+    String Functional_Requirements = "Functional Requirements";
 
     String  F001 = "F001 Server Starts";
     String  F002 = "F002 Home Page rendered";

src/test/resources/application.yml

@@ -159,7 +159,8 @@ logging:
       ch:
         qos: WARN
       woehlke:
-        simpleworklist: INFO
+        java:
+          simpleworklist: INFO
 ---
 spring:
   datasource: