From c725871a4e328a97f74b6d2694440f600d85247d Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 15 Oct 2022 15:38:16 +0200 Subject: [PATCH] minor refactoring of packages --- .../api/security/SecurityControllerTest.java | 6 ++--- .../security/controllers/TestController.java | 2 +- ....java => QuartManagerDemoApplication.java} | 24 +++++++++---------- .../it/fabioformosa/ServletInitializer.java | 2 +- .../HealthCheckController.java} | 4 ++-- .../controllers/SessionController.java | 2 +- .../{api => }/jobs/myjobs/SampleJob.java | 2 +- .../{api => }/jobs/tests/MisfireTestJob.java | 2 +- .../src/main/resources/application.yml | 2 +- .../QuartManagerApplicationTests.java | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/{QuartManagerApplication.java => QuartManagerDemoApplication.java} (65%) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{api/controllers/QuartzManagerController.java => controllers/HealthCheckController.java} (87%) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{api => }/controllers/SessionController.java (95%) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{api => }/jobs/myjobs/SampleJob.java (87%) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{api => }/jobs/tests/MisfireTestJob.java (94%) diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java index be17b1a..15af31f 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java @@ -37,9 +37,9 @@ public class SecurityControllerTest { private MockMvc mockMvc; @Test - void givenAnAnonymousUser_whenCalledATestController_thenShouldRaiseForbidden() throws Exception { - mockMvc.perform(MockMvcRequestBuilders.get("/test")) - .andExpect(status().isUnauthorized()); + void givenAnAnonymousUser_whenCalledADMZController_thenShouldRaiseForbidden() throws Exception { + mockMvc.perform(MockMvcRequestBuilders.get("/dmz")) + .andExpect(status().isOk()); } @Test diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java index fb5bff6..9488652 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java @@ -13,7 +13,7 @@ public class TestController { public static final String QUARTZ_MANAGER = "/quartz-manager"; @ResponseStatus(HttpStatus.OK) - @GetMapping("/test") + @GetMapping("/dmz") public void getDMZTest(){ } diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/QuartManagerApplication.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/QuartManagerDemoApplication.java similarity index 65% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/QuartManagerApplication.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/QuartManagerDemoApplication.java index 4beee27..6b32bed 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/QuartManagerApplication.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/QuartManagerDemoApplication.java @@ -1,12 +1,12 @@ -package it.fabioformosa; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class QuartManagerApplication { - - public static void main(String[] args) { - SpringApplication.run(QuartManagerApplication.class, args); - } -} +package it.fabioformosa; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class QuartManagerDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(QuartManagerDemoApplication.class, args); + } +} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java index 74c5dcb..38e5721 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java @@ -13,7 +13,7 @@ public class ServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(QuartManagerApplication.class); + return application.sources(QuartManagerDemoApplication.class); } } diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/QuartzManagerController.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/HealthCheckController.java similarity index 87% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/QuartzManagerController.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/HealthCheckController.java index 32034dc..394a353 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/QuartzManagerController.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/HealthCheckController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.api.controllers; +package it.fabioformosa.quartzmanager.controllers; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; @@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j; @Hidden @RestController @RequestMapping -public class QuartzManagerController { +public class HealthCheckController { @ResponseStatus(code = HttpStatus.OK) @GetMapping("/") diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SessionController.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/SessionController.java similarity index 95% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SessionController.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/SessionController.java index 388ee4b..6d5ad04 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SessionController.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/SessionController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.api.controllers; +package it.fabioformosa.quartzmanager.controllers; import io.swagger.v3.oas.annotations.Operation; import org.slf4j.Logger; diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/myjobs/SampleJob.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java similarity index 87% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/myjobs/SampleJob.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java index a955a3a..94d31a0 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/myjobs/SampleJob.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.api.jobs.myjobs; +package it.fabioformosa.quartzmanager.jobs.myjobs; import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob; import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/tests/MisfireTestJob.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/tests/MisfireTestJob.java similarity index 94% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/tests/MisfireTestJob.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/tests/MisfireTestJob.java index 0623417..fb4634c 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/tests/MisfireTestJob.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/tests/MisfireTestJob.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.api.jobs.tests; +package it.fabioformosa.quartzmanager.jobs.tests; import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob; import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml index 6c4aedb..0d642cb 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml @@ -1,5 +1,5 @@ quartz-manager: - jobClassPackages: it.fabioformosa.quartzmanager.api.jobs + jobClassPackages: it.fabioformosa.quartzmanager.jobs security: jwt: secret: "bibidibobidiboo" diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/test/java/it/fabioformosa/QuartManagerApplicationTests.java b/quartz-manager-parent/quartz-manager-web-showcase/src/test/java/it/fabioformosa/QuartManagerApplicationTests.java index b6c30b1..60afb24 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/test/java/it/fabioformosa/QuartManagerApplicationTests.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/test/java/it/fabioformosa/QuartManagerApplicationTests.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.web.WebAppConfiguration; -@SpringBootTest(classes = QuartManagerApplication.class) +@SpringBootTest(classes = QuartManagerDemoApplication.class) @WebAppConfiguration public class QuartManagerApplicationTests {