#63 removed properties which have a default value from the showcase

quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java

@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Configuration
-@ConfigurationProperties(prefix = "quartz-manager.accounts.in-memory")
+@ConfigurationProperties(prefix = "quartz-manager.security.accounts.in-memory")
 @Getter @Setter
 public class InMemoryAccountProperties {
   private boolean enabled;

quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java

@@ -23,10 +23,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
   "quartz-manager.security.jwt.header-strategy.header=Authorization",
   "quartz-manager.security.jwt.cookie-strategy.enabled=true",
   "quartz-manager.security.jwt.cookie-strategy.cookie=AUTH-TOKEN",
-  "quartz-manager.accounts.in-memory.enabled=true",
-  "quartz-manager.accounts.in-memory.users[0].name=foo",
-  "quartz-manager.accounts.in-memory.users[0].password=bar",
-  "quartz-manager.accounts.in-memory.users[0].roles[0]=admin",
+  "quartz-manager.security.accounts.in-memory.enabled=true",
+  "quartz-manager.security.accounts.in-memory.users[0].name=foo",
+  "quartz-manager.security.accounts.in-memory.users[0].password=bar",
+  "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin",
 })
 public class SecurityControllerTest {
 

quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java

@@ -20,10 +20,10 @@ import org.springframework.test.context.TestPropertySource;
   "quartz-manager.security.jwt.header-strategy.header=Authorization",
   "quartz-manager.security.jwt.cookie-strategy.enabled=true",
   "quartz-manager.security.jwt.cookie-strategy.cookie=AUTH-TOKEN",
-  "quartz-manager.accounts.in-memory.enabled=true",
-  "quartz-manager.accounts.in-memory.users[0].name=foo",
-  "quartz-manager.accounts.in-memory.users[0].password=bar",
-  "quartz-manager.accounts.in-memory.users[0].roles[0]=admin",
+  "quartz-manager.security.accounts.in-memory.enabled=true",
+  "quartz-manager.security.accounts.in-memory.users[0].name=foo",
+  "quartz-manager.security.accounts.in-memory.users[0].password=bar",
+  "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin",
 })
 public class SecurityLoginViaCookieTest extends AbstractSecurityLoginTest {
 

quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java

@@ -11,10 +11,10 @@ import org.springframework.test.context.TestPropertySource;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @TestPropertySource(properties = {
-  "quartz-manager.accounts.in-memory.enabled=true",
-  "quartz-manager.accounts.in-memory.users[0].name=foo",
-  "quartz-manager.accounts.in-memory.users[0].password=bar",
-  "quartz-manager.accounts.in-memory.users[0].roles[0]=admin",
+  "quartz-manager.security.accounts.in-memory.enabled=true",
+  "quartz-manager.security.accounts.in-memory.users[0].name=foo",
+  "quartz-manager.security.accounts.in-memory.users[0].password=bar",
+  "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin",
 })
 public class SecurityLoginViaDefaultStrategyTest extends AbstractSecurityLoginTest {
 

quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java

@@ -19,10 +19,10 @@ import org.springframework.test.context.TestPropertySource;
   "quartz-manager.security.jwt.header-strategy.enabled=true",
   "quartz-manager.security.jwt.header-strategy.header=Authorization",
   "quartz-manager.security.jwt.cookie-strategy.enabled=false",
-  "quartz-manager.accounts.in-memory.enabled=true",
-  "quartz-manager.accounts.in-memory.users[0].name=foo",
-  "quartz-manager.accounts.in-memory.users[0].password=bar",
-  "quartz-manager.accounts.in-memory.users[0].roles[0]=admin",
+  "quartz-manager.security.accounts.in-memory.enabled=true",
+  "quartz-manager.security.accounts.in-memory.users[0].name=foo",
+  "quartz-manager.security.accounts.in-memory.users[0].password=bar",
+  "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin",
 })
 public class SecurityLoginViaHeaderAndLoginFilterTest extends AbstractSecurityLoginTest {
 

quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java

@@ -18,10 +18,10 @@ import org.springframework.test.context.TestPropertySource;
   "quartz-manager.security.jwt.header-strategy.enabled=true",
   "quartz-manager.security.jwt.header-strategy.header=Authorization",
   "quartz-manager.security.jwt.cookie-strategy.enabled=false",
-  "quartz-manager.accounts.in-memory.enabled=true",
-  "quartz-manager.accounts.in-memory.users[0].name=foo",
-  "quartz-manager.accounts.in-memory.users[0].password=bar",
-  "quartz-manager.accounts.in-memory.users[0].roles[0]=admin",
+  "quartz-manager.security.accounts.in-memory.enabled=true",
+  "quartz-manager.security.accounts.in-memory.users[0].name=foo",
+  "quartz-manager.security.accounts.in-memory.users[0].password=bar",
+  "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin",
 })
 public class SecurityLoginViaHeaderTest extends AbstractSecurityLoginTest {
 

quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml

@@ -4,19 +4,36 @@ server:
     session.timeout : 28800
   port: 8080
 
+quartz:
+  enabled: true
+
+quartz-manager:
+  jobClassPackages: it.fabioformosa.quartzmanager.jobs
+  security:
+    jwt:
+      secret: "bibidibobidiboo"
+      expiration-in-sec: 28800  # 8 hours
+    accounts:
+      in-memory:
+        enabled: true
+        users:
+          - name: admin
+            password: admin
+            roles:
+              - ADMIN
+  persistence:
+    quartz:
+      datasource:
+        url: "jdbc:postgresql://localhost:5432/quartzmanager"
+        user: "quartzmanager"
+        password: "quartzmanager"
+
 spring:
   thymeleaf:
     cache: false
     mode: LEGACYHTML5
   jpa.open-in-view: false
 
-quartz:
-  enabled: true
-
-job:
-  frequency: 4000
-  repeatCount: 19
-
 logging:
   level:
     org.springframework.web: WARN
@@ -24,34 +41,3 @@ logging:
     org.springframework.boot.autoconfigure.security: INFO
     it.fabioformosa: DEBUG
     org.quartz: INFO
-
-quartz-manager:
-  persistence:
-    quartz:
-      datasource:
-        url: "jdbc:postgresql://localhost:5432/quartzmanager"
-        user: "quartzmanager"
-        password: "quartzmanager"
-  security:
-    login-model:
-      form-login-enabled: true
-      userpwd-filter-enabled : false
-    jwt:
-      enabled: true
-      secret: "bibidibobidiboo"
-      expiration-in-sec: 28800  # 8 hours
-      header-strategy:
-        enabled: false
-        header: "Authorization"
-      cookie-strategy:
-        enabled: true
-        cookie: AUTH-TOKEN
-  jobClassPackages: it.fabioformosa.quartzmanager.jobs
-  accounts:
-    in-memory:
-      enabled: true
-      users:
-        - name: admin
-          password: admin
-          roles:
-            - ADMIN