From 304a1e7f71959e6ea80f7254b798f737d4cfeb29 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Thu, 6 Oct 2022 23:54:04 +0200 Subject: [PATCH] #63 renamed the base package of the api module --- .../common/config/OpenAPIConfigConsts.java | 2 +- .../common/config/QuartzManagerPaths.java | 2 +- .../properties/QuartzModuleProperties.java | 2 +- .../{ => api}/common/utils/DateUtils.java | 2 +- .../{ => api}/common/utils/Try.java | 2 +- .../configuration/ConversionConfig.java | 2 +- .../configuration/OpenApiConfig.java | 9 +- .../QuartzDefaultPropertiesConfig.java | 4 +- .../configuration/SchedulerConfig.java | 8 +- .../configuration/SecurityDiscover.java | 2 +- .../configuration/SecurityDiscoverConfig.java | 2 +- .../configuration/WebsocketConfig.java | 4 +- .../{ => api}/controllers/JobController.java | 13 ++- .../controllers/SchedulerController.java | 10 +-- .../controllers/SimpleTriggerController.java | 23 +++-- .../controllers/TriggerController.java | 10 +-- .../controllers/WebsocketController.java | 7 +- .../advices/ExceptionHandlingController.java | 8 +- .../converters/JobKeyToJobDetailDTO.java | 4 +- .../converters/JobKeyToJobKeyDTO.java | 4 +- .../converters/SchedulerToSchedulerDTO.java | 6 +- ...impleTriggerCommandDTOToSimpleTrigger.java | 4 +- .../SimpleTriggerToSimpleTriggerDTO.java | 4 +- .../converters/TriggerKeyToTriggerKeyDTO.java | 4 +- .../converters/TriggerToTriggerDTO.java | 10 +-- .../{ => api}/dto/JobDetailDTO.java | 2 +- .../{ => api}/dto/JobKeyDTO.java | 2 +- .../{ => api}/dto/SchedulerDTO.java | 4 +- .../dto/SimpleTriggerCommandDTO.java | 2 +- .../{ => api}/dto/SimpleTriggerDTO.java | 2 +- .../{ => api}/dto/SimpleTriggerInputDTO.java | 2 +- .../{ => api}/dto/TriggerCommandDTO.java | 2 +- .../{ => api}/dto/TriggerDTO.java | 2 +- .../{ => api}/dto/TriggerFiredBundleDTO.java | 2 +- .../{ => api}/dto/TriggerKeyDTO.java | 2 +- .../{ => api}/enums/SchedulerStatus.java | 2 +- .../exceptions/ExceptionResponse.java | 2 +- .../exceptions/ResourceConflictException.java | 2 +- .../exceptions/TriggerNotFoundException.java | 2 +- .../jobs/AbstractQuartzManagerJob.java | 10 +-- .../{ => api}/jobs/entities/LogRecord.java | 4 +- .../AutowiringSpringBeanJobFactory.java | 4 +- .../services/AbstractSchedulerService.java | 4 +- .../{ => api}/services/JobService.java | 4 +- .../{ => api}/services/SchedulerService.java | 4 +- .../services/SimpleTriggerService.java | 10 +-- .../{ => api}/services/TriggerService.java | 4 +- .../websockets/WebSocketLogsNotifier.java | 4 +- .../websockets/WebSocketProgressNotifier.java | 4 +- .../{ => api}/websockets/WebhookSender.java | 2 +- .../main/resources/META-INF/spring.factories | 6 +- .../QuartManagerApplicationTests.java | 2 +- ...hedulerConfigDefaultAppPropertiesTest.java | 6 +- .../configuration/SchedulerConfigTest.java | 4 +- .../SimpleTriggerControllerTest.java | 22 ++--- .../controllers/TriggerControllerTest.java | 6 +- ...nvalidSimpleTriggerCommandDTOProvider.java | 4 +- .../controllers/utils/TestUtils.java | 2 +- .../controllers/utils/TriggerUtils.java | 6 +- .../quartzmanager/api/jobs/SampleJob.java | 13 +++ .../{ => api}/services/JobServiceTest.java | 10 +-- .../services/SimpleTriggerServiceTest.java | 10 +-- .../quartzmanager/jobs/SampleJob.java | 14 --- .../samplepackage/SampleExtraJob.java | 6 +- .../src/test/resources/application.yml | 11 +-- .../persistence/PersistenceConfig.java | 4 +- .../QuartzPersistencePropConfig.java | 2 +- .../main/resources/META-INF/spring.factories | 4 +- .../security/WebSecurityConfigJWT.java | 16 ++-- .../security/controllers/UserController.java | 6 +- .../security/helpers/LoginConfigurer.java | 42 ++++----- .../impl/AjaxAuthenticationFilter.java | 2 +- .../helpers/impl/AnonAuthentication.java | 90 +++++++++---------- .../impl/AuthenticationFailureHandler.java | 40 ++++----- .../impl/AuthenticationSuccessHandler.java | 2 +- .../helpers/impl/FormLoginConfig.java | 4 +- .../helpers/impl/JwtAuthenticationFilter.java | 2 +- .../impl/JwtAuthenticationSuccessHandler.java | 2 +- .../JwtAuthenticationSuccessHandlerImpl.java | 6 +- .../impl/JwtTokenAuthenticationFilter.java | 2 +- .../impl/JwtTokenBasedAuthentication.java | 84 ++++++++--------- .../security/helpers/impl/JwtTokenHelper.java | 4 +- .../JwtUsernamePasswordFiterLoginConfig.java | 4 +- .../security/helpers/impl/LogoutSuccess.java | 72 +++++++-------- .../impl/QuartzManagerHttpSecurity.java | 4 +- .../impl/RestAuthenticationEntryPoint.java | 46 +++++----- .../security/models/UserTokenState.java | 64 ++++++------- .../properties/InMemoryAccountProperties.java | 2 +- .../properties/JwtSecurityProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../security/AbstractSecurityLoginTest.java | 6 +- .../security/SecurityControllerTest.java | 8 +- .../security/SecurityLoginViaCookieTest.java | 4 +- .../SecurityLoginViaDefaultStrategyTest.java | 4 +- ...urityLoginViaHeaderAndLoginFilterTest.java | 4 +- .../security/SecurityLoginViaHeaderTest.java | 4 +- .../security/SpringApplicationTest.java | 2 +- .../security/controllers/TestController.java | 2 +- .../controllers/QuartzManagerController.java | 2 +- .../controllers/SessionController.java | 2 +- .../api/jobs/myjobs/SampleJob.java | 14 +++ .../{ => api}/jobs/tests/MisfireTestJob.java | 10 +-- .../quartzmanager/jobs/myjobs/SampleJob.java | 16 ---- .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback.xml | 2 +- 105 files changed, 463 insertions(+), 481 deletions(-) rename quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/{ => api}/common/config/OpenAPIConfigConsts.java (66%) rename quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/{ => api}/common/config/QuartzManagerPaths.java (89%) rename quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/{ => api}/common/properties/QuartzModuleProperties.java (71%) rename quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/{ => api}/common/utils/DateUtils.java (88%) rename quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/{ => api}/common/utils/Try.java (95%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/ConversionConfig.java (82%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/OpenApiConfig.java (88%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/QuartzDefaultPropertiesConfig.java (86%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/SchedulerConfig.java (88%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/SecurityDiscover.java (54%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/SecurityDiscoverConfig.java (90%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/configuration/WebsocketConfig.java (88%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/JobController.java (73%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/SchedulerController.java (88%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/SimpleTriggerController.java (83%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/TriggerController.java (78%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/WebsocketController.java (53%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/advices/ExceptionHandlingController.java (78%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/JobKeyToJobDetailDTO.java (87%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/JobKeyToJobKeyDTO.java (78%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/SchedulerToSchedulerDTO.java (85%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/SimpleTriggerCommandDTOToSimpleTrigger.java (91%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/SimpleTriggerToSimpleTriggerDTO.java (84%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/TriggerKeyToTriggerKeyDTO.java (79%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/converters/TriggerToTriggerDTO.java (82%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/JobDetailDTO.java (82%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/JobKeyDTO.java (83%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/SchedulerDTO.java (75%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/SimpleTriggerCommandDTO.java (81%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/SimpleTriggerDTO.java (87%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/SimpleTriggerInputDTO.java (88%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/TriggerCommandDTO.java (92%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/TriggerDTO.java (92%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/TriggerFiredBundleDTO.java (96%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/dto/TriggerKeyDTO.java (83%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/enums/SchedulerStatus.java (54%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/exceptions/ExceptionResponse.java (82%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/exceptions/ResourceConflictException.java (86%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/exceptions/TriggerNotFoundException.java (83%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/jobs/AbstractQuartzManagerJob.java (78%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/jobs/entities/LogRecord.java (94%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/scheduler/AutowiringSpringBeanJobFactory.java (93%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/services/AbstractSchedulerService.java (85%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/services/JobService.java (92%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/services/SchedulerService.java (86%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/services/SimpleTriggerService.java (85%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/services/TriggerService.java (90%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/websockets/WebSocketLogsNotifier.java (81%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/websockets/WebSocketProgressNotifier.java (93%) rename quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/{ => api}/websockets/WebhookSender.java (74%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/QuartManagerApplicationTests.java (88%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/configuration/SchedulerConfigDefaultAppPropertiesTest.java (77%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/configuration/SchedulerConfigTest.java (94%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/controllers/SimpleTriggerControllerTest.java (87%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/controllers/TriggerControllerTest.java (80%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java (83%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/controllers/utils/TestUtils.java (91%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/controllers/utils/TriggerUtils.java (93%) create mode 100644 quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJob.java rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/services/JobServiceTest.java (84%) rename quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/{ => api}/services/SimpleTriggerServiceTest.java (89%) delete mode 100644 quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/jobs/SampleJob.java rename quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/{ => api}/persistence/PersistenceConfig.java (95%) rename quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/{ => api}/persistence/QuartzPersistencePropConfig.java (89%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/WebSecurityConfigJWT.java (91%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/controllers/UserController.java (82%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/LoginConfigurer.java (89%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/AjaxAuthenticationFilter.java (96%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/AnonAuthentication.java (87%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/AuthenticationFailureHandler.java (89%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/AuthenticationSuccessHandler.java (94%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/FormLoginConfig.java (94%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtAuthenticationFilter.java (94%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtAuthenticationSuccessHandler.java (83%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java (93%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtTokenAuthenticationFilter.java (98%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtTokenBasedAuthentication.java (88%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtTokenHelper.java (97%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java (93%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/LogoutSuccess.java (91%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/QuartzManagerHttpSecurity.java (94%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/helpers/impl/RestAuthenticationEntryPoint.java (88%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/models/UserTokenState.java (88%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/properties/InMemoryAccountProperties.java (90%) rename quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/{ => api}/security/properties/JwtSecurityProperties.java (93%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/AbstractSecurityLoginTest.java (80%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/SecurityControllerTest.java (90%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/SecurityLoginViaCookieTest.java (93%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/SecurityLoginViaDefaultStrategyTest.java (90%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/SecurityLoginViaHeaderAndLoginFilterTest.java (93%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/SecurityLoginViaHeaderTest.java (93%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/SpringApplicationTest.java (71%) rename quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/{ => api}/security/controllers/TestController.java (90%) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/QuartzManagerController.java (92%) rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{ => api}/controllers/SessionController.java (95%) create mode 100644 quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/myjobs/SampleJob.java rename quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/{ => api}/jobs/tests/MisfireTestJob.java (70%) delete mode 100644 quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java diff --git a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/config/OpenAPIConfigConsts.java b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/config/OpenAPIConfigConsts.java similarity index 66% rename from quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/config/OpenAPIConfigConsts.java rename to quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/config/OpenAPIConfigConsts.java index 83f6f87..15b3151 100644 --- a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/config/OpenAPIConfigConsts.java +++ b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/config/OpenAPIConfigConsts.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.common.config; +package it.fabioformosa.quartzmanager.api.common.config; public class OpenAPIConfigConsts { diff --git a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/config/QuartzManagerPaths.java b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/config/QuartzManagerPaths.java similarity index 89% rename from quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/config/QuartzManagerPaths.java rename to quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/config/QuartzManagerPaths.java index 478d80a..973d7fa 100644 --- a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/config/QuartzManagerPaths.java +++ b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/config/QuartzManagerPaths.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.common.config; +package it.fabioformosa.quartzmanager.api.common.config; public class QuartzManagerPaths { diff --git a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/properties/QuartzModuleProperties.java b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/properties/QuartzModuleProperties.java similarity index 71% rename from quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/properties/QuartzModuleProperties.java rename to quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/properties/QuartzModuleProperties.java index fced537..3f5e8c6 100644 --- a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/properties/QuartzModuleProperties.java +++ b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/properties/QuartzModuleProperties.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.common.properties; +package it.fabioformosa.quartzmanager.api.common.properties; import lombok.Data; diff --git a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/utils/DateUtils.java b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/utils/DateUtils.java similarity index 88% rename from quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/utils/DateUtils.java rename to quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/utils/DateUtils.java index c0cef7e..a66535e 100644 --- a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/utils/DateUtils.java +++ b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.common.utils; +package it.fabioformosa.quartzmanager.api.common.utils; import java.time.Duration; import java.time.LocalDateTime; diff --git a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/utils/Try.java b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/utils/Try.java similarity index 95% rename from quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/utils/Try.java rename to quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/utils/Try.java index 67145d8..173e7ad 100644 --- a/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/common/utils/Try.java +++ b/quartz-manager-parent/quartz-manager-common/src/main/java/it/fabioformosa/quartzmanager/api/common/utils/Try.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.common.utils; +package it.fabioformosa.quartzmanager.api.common.utils; import java.util.function.Function; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/ConversionConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/ConversionConfig.java similarity index 82% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/ConversionConfig.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/ConversionConfig.java index 964a723..740aaf8 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/ConversionConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/ConversionConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; import it.fabioformosa.metamorphosis.core.EnableMetamorphosisConversions; import org.springframework.context.annotation.Configuration; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/OpenApiConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/OpenApiConfig.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java index 9e54b2a..ad64f5b 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/OpenApiConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; @@ -11,15 +11,14 @@ import io.swagger.v3.oas.models.parameters.RequestBody; import io.swagger.v3.oas.models.responses.ApiResponse; import io.swagger.v3.oas.models.responses.ApiResponses; import io.swagger.v3.oas.models.security.SecurityScheme; -import it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths; +import it.fabioformosa.quartzmanager.api.common.config.OpenAPIConfigConsts; +import it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import java.util.Arrays; -import static it.fabioformosa.quartzmanager.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; - @Configuration public class OpenApiConfig { @@ -30,7 +29,7 @@ public class OpenApiConfig { if(securityDiscover != null) openAPI - .components(new Components().addSecuritySchemes(BASIC_AUTH_SEC_OAS_SCHEME, buildBasicAuthScheme())) + .components(new Components().addSecuritySchemes(OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME, buildBasicAuthScheme())) .path(QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH, new PathItem().post(new Operation() .operationId("login") diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/QuartzDefaultPropertiesConfig.java similarity index 86% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/QuartzDefaultPropertiesConfig.java index 84d8189..1ac05c1 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/QuartzDefaultPropertiesConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/QuartzDefaultPropertiesConfig.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; -import it.fabioformosa.quartzmanager.common.properties.QuartzModuleProperties; +import it.fabioformosa.quartzmanager.api.common.properties.QuartzModuleProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java index 037a02b..a0c215f 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; -import it.fabioformosa.quartzmanager.common.properties.QuartzModuleProperties; -import it.fabioformosa.quartzmanager.scheduler.AutowiringSpringBeanJobFactory; +import it.fabioformosa.quartzmanager.api.scheduler.AutowiringSpringBeanJobFactory; +import it.fabioformosa.quartzmanager.api.common.properties.QuartzModuleProperties; import org.quartz.spi.JobFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.PropertiesFactoryBean; @@ -17,7 +17,7 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -@ComponentScan(basePackages = {"it.fabioformosa.quartzmanager.controllers"}) +@ComponentScan(basePackages = {"it.fabioformosa.quartzmanager.api"}) @Configuration @ConditionalOnProperty(name = "quartz.enabled", matchIfMissing = true) public class SchedulerConfig { diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SecurityDiscover.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SecurityDiscover.java similarity index 54% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SecurityDiscover.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SecurityDiscover.java index 2f90706..8c290d9 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SecurityDiscover.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SecurityDiscover.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; public class SecurityDiscover { public SecurityDiscover() { diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SecurityDiscoverConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SecurityDiscoverConfig.java similarity index 90% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SecurityDiscoverConfig.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SecurityDiscoverConfig.java index e26eb70..7261f66 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/SecurityDiscoverConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SecurityDiscoverConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/WebsocketConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/WebsocketConfig.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/WebsocketConfig.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/WebsocketConfig.java index 7844c92..67b07d3 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/configuration/WebsocketConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/WebsocketConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -8,7 +8,7 @@ import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBr import org.springframework.web.socket.config.annotation.StompEndpointRegistry; @Configuration -@ComponentScan(basePackages = {"it.fabioformosa.quartzmanager.websockets"}) +@ComponentScan(basePackages = {"it.fabioformosa.quartzmanager.api.websockets"}) @EnableWebSocketMessageBroker public class WebsocketConfig extends AbstractWebSocketMessageBrokerConfigurer { diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/JobController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/JobController.java similarity index 73% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/JobController.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/JobController.java index 962d3ce..9f02ad6 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/JobController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/JobController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -6,7 +6,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import it.fabioformosa.quartzmanager.services.JobService; +import it.fabioformosa.quartzmanager.api.common.config.OpenAPIConfigConsts; +import it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths; +import it.fabioformosa.quartzmanager.api.services.JobService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,11 +16,8 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.stream.Collectors; -import static it.fabioformosa.quartzmanager.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; - -@RequestMapping(QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/jobs") -@SecurityRequirement(name = BASIC_AUTH_SEC_OAS_SCHEME) +@RequestMapping(QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/jobs") +@SecurityRequirement(name = OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME) @RestController public class JobController { final private JobService jobService; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SchedulerController.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SchedulerController.java index 69f3446..2c991db 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SchedulerController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -6,8 +6,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import it.fabioformosa.quartzmanager.dto.SchedulerDTO; -import it.fabioformosa.quartzmanager.services.SchedulerService; +import it.fabioformosa.quartzmanager.api.dto.SchedulerDTO; +import it.fabioformosa.quartzmanager.api.services.SchedulerService; import lombok.extern.slf4j.Slf4j; import org.quartz.SchedulerException; import org.springframework.http.HttpStatus; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import static it.fabioformosa.quartzmanager.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; +import static it.fabioformosa.quartzmanager.api.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; +import static it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; /** * This controller provides scheduler info about config and status. It provides diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SimpleTriggerController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerController.java similarity index 83% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SimpleTriggerController.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerController.java index eb1492d..26f63ed 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SimpleTriggerController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -6,12 +6,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerCommandDTO; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerDTO; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerInputDTO; -import it.fabioformosa.quartzmanager.dto.TriggerDTO; -import it.fabioformosa.quartzmanager.exceptions.TriggerNotFoundException; -import it.fabioformosa.quartzmanager.services.SimpleTriggerService; +import it.fabioformosa.quartzmanager.api.common.config.OpenAPIConfigConsts; +import it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerCommandDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerInputDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerDTO; +import it.fabioformosa.quartzmanager.api.services.SimpleTriggerService; +import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException; import lombok.extern.slf4j.Slf4j; import org.quartz.SchedulerException; import org.springframework.http.HttpStatus; @@ -19,16 +21,13 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import static it.fabioformosa.quartzmanager.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; - @Slf4j @RequestMapping(SimpleTriggerController.SIMPLE_TRIGGER_CONTROLLER_BASE_URL) -@SecurityRequirement(name = BASIC_AUTH_SEC_OAS_SCHEME) +@SecurityRequirement(name = OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME) @RestController public class SimpleTriggerController { - static protected final String SIMPLE_TRIGGER_CONTROLLER_BASE_URL = QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/simple-triggers"; + static protected final String SIMPLE_TRIGGER_CONTROLLER_BASE_URL = QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/simple-triggers"; final private SimpleTriggerService simpleSchedulerService; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/TriggerController.java similarity index 78% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/TriggerController.java index dcd4d4f..9ed005f 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/TriggerController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -6,8 +6,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import it.fabioformosa.quartzmanager.dto.TriggerKeyDTO; -import it.fabioformosa.quartzmanager.services.TriggerService; +import it.fabioformosa.quartzmanager.api.dto.TriggerKeyDTO; +import it.fabioformosa.quartzmanager.api.services.TriggerService; import lombok.extern.slf4j.Slf4j; import org.quartz.SchedulerException; import org.springframework.web.bind.annotation.GetMapping; @@ -16,8 +16,8 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -import static it.fabioformosa.quartzmanager.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; +import static it.fabioformosa.quartzmanager.api.common.config.OpenAPIConfigConsts.BASIC_AUTH_SEC_OAS_SCHEME; +import static it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; @Slf4j @RequestMapping(TriggerController.TRIGGER_CONTROLLER_BASE_URL) diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/WebsocketController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/WebsocketController.java similarity index 53% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/WebsocketController.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/WebsocketController.java index 7ec42b4..8afe860 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/WebsocketController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/WebsocketController.java @@ -1,15 +1,14 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; +import it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.stereotype.Controller; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH; - @Controller public class WebsocketController { - @MessageMapping({ QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/logs", QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/progress" }) + @MessageMapping({ QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/logs", QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/progress" }) @SendTo("/topic/logs") public String subscribe() { return "subscribed"; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/advices/ExceptionHandlingController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/advices/ExceptionHandlingController.java similarity index 78% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/advices/ExceptionHandlingController.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/advices/ExceptionHandlingController.java index 4f386a0..9bcac86 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/advices/ExceptionHandlingController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/controllers/advices/ExceptionHandlingController.java @@ -1,8 +1,8 @@ -package it.fabioformosa.quartzmanager.controllers.advices; +package it.fabioformosa.quartzmanager.api.controllers.advices; -import it.fabioformosa.quartzmanager.exceptions.ExceptionResponse; -import it.fabioformosa.quartzmanager.exceptions.ResourceConflictException; -import it.fabioformosa.quartzmanager.exceptions.TriggerNotFoundException; +import it.fabioformosa.quartzmanager.api.exceptions.ExceptionResponse; +import it.fabioformosa.quartzmanager.api.exceptions.ResourceConflictException; +import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/JobKeyToJobDetailDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java similarity index 87% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/JobKeyToJobDetailDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java index dbb7a9d..27561ef 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/JobKeyToJobDetailDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobDetailDTO.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; import it.fabioformosa.metamorphosis.core.converters.AbstractBaseConverterToDTO; -import it.fabioformosa.quartzmanager.dto.JobDetailDTO; +import it.fabioformosa.quartzmanager.api.dto.JobDetailDTO; import lombok.SneakyThrows; import org.quartz.JobDetail; import org.quartz.JobKey; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/JobKeyToJobKeyDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobKeyDTO.java similarity index 78% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/JobKeyToJobKeyDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobKeyDTO.java index 8bfd485..14517e9 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/JobKeyToJobKeyDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/JobKeyToJobKeyDTO.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; import it.fabioformosa.metamorphosis.core.converters.AbstractBaseConverterToDTO; -import it.fabioformosa.quartzmanager.dto.JobKeyDTO; +import it.fabioformosa.quartzmanager.api.dto.JobKeyDTO; import org.quartz.JobKey; import org.springframework.stereotype.Component; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SchedulerToSchedulerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SchedulerToSchedulerDTO.java similarity index 85% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SchedulerToSchedulerDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SchedulerToSchedulerDTO.java index ad4515c..6561c95 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SchedulerToSchedulerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SchedulerToSchedulerDTO.java @@ -1,8 +1,8 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; import it.fabioformosa.metamorphosis.core.converters.AbstractBaseConverterToDTO; -import it.fabioformosa.quartzmanager.dto.SchedulerDTO; -import it.fabioformosa.quartzmanager.enums.SchedulerStatus; +import it.fabioformosa.quartzmanager.api.dto.SchedulerDTO; +import it.fabioformosa.quartzmanager.api.enums.SchedulerStatus; import lombok.SneakyThrows; import org.quartz.Scheduler; import org.quartz.SchedulerException; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SimpleTriggerCommandDTOToSimpleTrigger.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java similarity index 91% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SimpleTriggerCommandDTOToSimpleTrigger.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java index ba2d0c8..b918684 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SimpleTriggerCommandDTOToSimpleTrigger.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerCommandDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerCommandDTO; import org.quartz.SimpleScheduleBuilder; import org.quartz.SimpleTrigger; import org.quartz.Trigger; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SimpleTriggerToSimpleTriggerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerToSimpleTriggerDTO.java similarity index 84% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SimpleTriggerToSimpleTriggerDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerToSimpleTriggerDTO.java index c691b7a..e4686db 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/SimpleTriggerToSimpleTriggerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerToSimpleTriggerDTO.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerDTO; import org.quartz.SimpleTrigger; import org.springframework.stereotype.Component; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/TriggerKeyToTriggerKeyDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/TriggerKeyToTriggerKeyDTO.java similarity index 79% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/TriggerKeyToTriggerKeyDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/TriggerKeyToTriggerKeyDTO.java index ec5e01e..9aed13b 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/TriggerKeyToTriggerKeyDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/TriggerKeyToTriggerKeyDTO.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; import it.fabioformosa.metamorphosis.core.converters.AbstractBaseConverterToDTO; -import it.fabioformosa.quartzmanager.dto.TriggerKeyDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerKeyDTO; import org.quartz.TriggerKey; import org.springframework.stereotype.Component; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/TriggerToTriggerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/TriggerToTriggerDTO.java similarity index 82% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/TriggerToTriggerDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/TriggerToTriggerDTO.java index 576b453..77c50ba 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/converters/TriggerToTriggerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/TriggerToTriggerDTO.java @@ -1,10 +1,10 @@ -package it.fabioformosa.quartzmanager.converters; +package it.fabioformosa.quartzmanager.api.converters; import it.fabioformosa.metamorphosis.core.converters.AbstractBaseConverter; -import it.fabioformosa.quartzmanager.dto.JobDetailDTO; -import it.fabioformosa.quartzmanager.dto.JobKeyDTO; -import it.fabioformosa.quartzmanager.dto.TriggerDTO; -import it.fabioformosa.quartzmanager.dto.TriggerKeyDTO; +import it.fabioformosa.quartzmanager.api.dto.JobDetailDTO; +import it.fabioformosa.quartzmanager.api.dto.JobKeyDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerKeyDTO; import org.quartz.JobKey; import org.quartz.Trigger; import org.quartz.TriggerKey; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobDetailDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/JobDetailDTO.java similarity index 82% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobDetailDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/JobDetailDTO.java index 84998c2..9536001 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobDetailDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/JobDetailDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/JobKeyDTO.java similarity index 83% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/JobKeyDTO.java index b8390b3..7827ee7 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/JobKeyDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/JobKeyDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SchedulerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SchedulerDTO.java similarity index 75% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SchedulerDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SchedulerDTO.java index c45107f..7e95d04 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SchedulerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SchedulerDTO.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; -import it.fabioformosa.quartzmanager.enums.SchedulerStatus; +import it.fabioformosa.quartzmanager.api.enums.SchedulerStatus; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerCommandDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerCommandDTO.java similarity index 81% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerCommandDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerCommandDTO.java index 8cdd7c1..ae8c622 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerCommandDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerCommandDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.*; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerDTO.java similarity index 87% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerDTO.java index c560072..1fa500b 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerInputDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerInputDTO.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerInputDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerInputDTO.java index d33e2da..6891659 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/SimpleTriggerInputDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/SimpleTriggerInputDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerCommandDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerCommandDTO.java similarity index 92% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerCommandDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerCommandDTO.java index eb32405..8100820 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerCommandDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerCommandDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.*; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java similarity index 92% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java index 84fe33f..f6182c2 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerFiredBundleDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerFiredBundleDTO.java similarity index 96% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerFiredBundleDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerFiredBundleDTO.java index 2857932..346b3c6 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerFiredBundleDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerFiredBundleDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import java.util.Date; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerKeyDTO.java similarity index 83% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerKeyDTO.java index 4ef0f11..d68ad65 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/dto/TriggerKeyDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerKeyDTO.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.dto; +package it.fabioformosa.quartzmanager.api.dto; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/enums/SchedulerStatus.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/enums/SchedulerStatus.java similarity index 54% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/enums/SchedulerStatus.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/enums/SchedulerStatus.java index f37d113..0a0f3f6 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/enums/SchedulerStatus.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/enums/SchedulerStatus.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.enums; +package it.fabioformosa.quartzmanager.api.enums; public enum SchedulerStatus { RUNNING, STOPPED, PAUSED diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/ExceptionResponse.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/ExceptionResponse.java similarity index 82% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/ExceptionResponse.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/ExceptionResponse.java index cc591c1..2c11a05 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/ExceptionResponse.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/ExceptionResponse.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.exceptions; +package it.fabioformosa.quartzmanager.api.exceptions; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/ResourceConflictException.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/ResourceConflictException.java similarity index 86% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/ResourceConflictException.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/ResourceConflictException.java index d3ed391..6d4ba7f 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/ResourceConflictException.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/ResourceConflictException.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.exceptions; +package it.fabioformosa.quartzmanager.api.exceptions; import lombok.Getter; import lombok.Setter; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/TriggerNotFoundException.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java similarity index 83% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/TriggerNotFoundException.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java index 26d3933..75c8645 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/exceptions/TriggerNotFoundException.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/exceptions/TriggerNotFoundException.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.exceptions; +package it.fabioformosa.quartzmanager.api.exceptions; import lombok.Getter; import lombok.ToString; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractQuartzManagerJob.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/AbstractQuartzManagerJob.java similarity index 78% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractQuartzManagerJob.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/AbstractQuartzManagerJob.java index 4ca06f9..a4cf038 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/jobs/AbstractQuartzManagerJob.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/AbstractQuartzManagerJob.java @@ -1,9 +1,9 @@ -package it.fabioformosa.quartzmanager.jobs; +package it.fabioformosa.quartzmanager.api.jobs; -import it.fabioformosa.quartzmanager.dto.TriggerFiredBundleDTO; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord; -import it.fabioformosa.quartzmanager.websockets.WebSocketProgressNotifier; -import it.fabioformosa.quartzmanager.websockets.WebhookSender; +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; +import it.fabioformosa.quartzmanager.api.websockets.WebSocketProgressNotifier; +import it.fabioformosa.quartzmanager.api.websockets.WebhookSender; +import it.fabioformosa.quartzmanager.api.dto.TriggerFiredBundleDTO; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/entities/LogRecord.java similarity index 94% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/entities/LogRecord.java index 912cbf3..c62cd06 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/jobs/entities/LogRecord.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/jobs/entities/LogRecord.java @@ -1,10 +1,10 @@ -package it.fabioformosa.quartzmanager.jobs.entities; +package it.fabioformosa.quartzmanager.api.jobs.entities; import java.util.Date; /** * Log record produced by a job at the end of each run - * + * * @author Fabio.Formosa * */ diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/scheduler/AutowiringSpringBeanJobFactory.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/scheduler/AutowiringSpringBeanJobFactory.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/scheduler/AutowiringSpringBeanJobFactory.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/scheduler/AutowiringSpringBeanJobFactory.java index b2c4715..7b59657 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/scheduler/AutowiringSpringBeanJobFactory.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/scheduler/AutowiringSpringBeanJobFactory.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.scheduler; +package it.fabioformosa.quartzmanager.api.scheduler; import org.quartz.spi.TriggerFiredBundle; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; @@ -23,4 +23,4 @@ public final class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory public void setApplicationContext(final ApplicationContext context) { beanFactory = context.getAutowireCapableBeanFactory(); } -} \ No newline at end of file +} diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/AbstractSchedulerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/AbstractSchedulerService.java similarity index 85% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/AbstractSchedulerService.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/AbstractSchedulerService.java index 2caa12d..1687dd0 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/AbstractSchedulerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/AbstractSchedulerService.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; -import it.fabioformosa.quartzmanager.exceptions.TriggerNotFoundException; +import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException; import org.quartz.*; import org.springframework.core.convert.ConversionService; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/JobService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/JobService.java similarity index 92% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/JobService.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/JobService.java index fa954da..00b293e 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/JobService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/JobService.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; -import it.fabioformosa.quartzmanager.jobs.AbstractQuartzManagerJob; +import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob; import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.reflections.Reflections; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/SchedulerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java similarity index 86% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/SchedulerService.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java index 82c2da8..66f43f1 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/SchedulerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SchedulerService.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; -import it.fabioformosa.quartzmanager.dto.SchedulerDTO; +import it.fabioformosa.quartzmanager.api.dto.SchedulerDTO; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.springframework.core.convert.ConversionService; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/SimpleTriggerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java similarity index 85% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/SimpleTriggerService.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java index 4540d1e..8c8bbbd 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/SimpleTriggerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java @@ -1,9 +1,9 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerCommandDTO; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerDTO; -import it.fabioformosa.quartzmanager.dto.TriggerDTO; -import it.fabioformosa.quartzmanager.exceptions.TriggerNotFoundException; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerCommandDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerDTO; +import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException; import org.quartz.*; import org.springframework.core.convert.ConversionService; import org.springframework.stereotype.Service; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/TriggerService.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java similarity index 90% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/TriggerService.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java index 9a80e6d..93368f6 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/services/TriggerService.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; -import it.fabioformosa.quartzmanager.dto.TriggerKeyDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerKeyDTO; import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerKey; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebSocketLogsNotifier.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketLogsNotifier.java similarity index 81% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebSocketLogsNotifier.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketLogsNotifier.java index 81c34e2..e5f93de 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebSocketLogsNotifier.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketLogsNotifier.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.websockets; +package it.fabioformosa.quartzmanager.api.websockets; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord; +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessageSendingOperations; import org.springframework.stereotype.Component; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebSocketProgressNotifier.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebSocketProgressNotifier.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java index c68cce9..464a12d 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebSocketProgressNotifier.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebSocketProgressNotifier.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.websockets; +package it.fabioformosa.quartzmanager.api.websockets; -import it.fabioformosa.quartzmanager.dto.TriggerFiredBundleDTO; +import it.fabioformosa.quartzmanager.api.dto.TriggerFiredBundleDTO; import org.quartz.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.messaging.simp.SimpMessageSendingOperations; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebhookSender.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebhookSender.java similarity index 74% rename from quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebhookSender.java rename to quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebhookSender.java index 7920460..a4a9c53 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/websockets/WebhookSender.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/websockets/WebhookSender.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.websockets; +package it.fabioformosa.quartzmanager.api.websockets; /** * diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/resources/META-INF/spring.factories b/quartz-manager-parent/quartz-manager-starter-api/src/main/resources/META-INF/spring.factories index f608554..fac0032 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/resources/META-INF/spring.factories +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -it.fabioformosa.quartzmanager.configuration.SchedulerConfig,\ -it.fabioformosa.quartzmanager.configuration.OpenApiConfig,\ -it.fabioformosa.quartzmanager.configuration.WebsocketConfig +it.fabioformosa.quartzmanager.api.configuration.SchedulerConfig,\ +it.fabioformosa.quartzmanager.api.configuration.OpenApiConfig,\ +it.fabioformosa.quartzmanager.api.configuration.WebsocketConfig diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/QuartManagerApplicationTests.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/QuartManagerApplicationTests.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/QuartManagerApplicationTests.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/QuartManagerApplicationTests.java index de9ad97..8f0f6de 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/QuartManagerApplicationTests.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/QuartManagerApplicationTests.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager; +package it.fabioformosa.quartzmanager.api; import org.junit.jupiter.api.Test; import org.springframework.boot.SpringBootConfiguration; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java similarity index 77% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java index bc9ad1f..b06bf73 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigDefaultAppPropertiesTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigDefaultAppPropertiesTest.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -7,8 +7,6 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import static it.fabioformosa.quartzmanager.configuration.QuartzDefaultPropertiesConfig.QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME; - @SpringBootTest class SchedulerConfigDefaultAppPropertiesTest { @@ -22,7 +20,7 @@ class SchedulerConfigDefaultAppPropertiesTest { @Test void givenTheQuartzNameMissing_whenTheBootstrapOccurs_thenAQuartzInstanceShouldBeTheDefaultName() throws SchedulerException { - Assertions.assertThat(scheduler.getSchedulerName()).isEqualTo(QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME); + Assertions.assertThat(scheduler.getSchedulerName()).isEqualTo(QuartzDefaultPropertiesConfig.QUARTZ_MANAGER_SCHEDULER_DEFAULT_NAME); } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java similarity index 94% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigTest.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java index e8934c1..58ca61a 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/configuration/SchedulerConfigTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfigTest.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.configuration; +package it.fabioformosa.quartzmanager.api.configuration; -import it.fabioformosa.quartzmanager.common.properties.QuartzModuleProperties; +import it.fabioformosa.quartzmanager.api.common.properties.QuartzModuleProperties; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.quartz.Scheduler; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/SimpleTriggerControllerTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java similarity index 87% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/SimpleTriggerControllerTest.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java index 781ce5c..7620378 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/SimpleTriggerControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java @@ -1,14 +1,14 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; -import it.fabioformosa.quartzmanager.QuartManagerApplicationTests; -import it.fabioformosa.quartzmanager.controllers.utils.InvalidSimpleTriggerCommandDTOProvider; -import it.fabioformosa.quartzmanager.controllers.utils.TestUtils; -import it.fabioformosa.quartzmanager.controllers.utils.TriggerUtils; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerCommandDTO; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerDTO; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerInputDTO; -import it.fabioformosa.quartzmanager.exceptions.TriggerNotFoundException; -import it.fabioformosa.quartzmanager.services.SimpleTriggerService; +import it.fabioformosa.quartzmanager.api.QuartManagerApplicationTests; +import it.fabioformosa.quartzmanager.api.controllers.utils.InvalidSimpleTriggerCommandDTOProvider; +import it.fabioformosa.quartzmanager.api.controllers.utils.TestUtils; +import it.fabioformosa.quartzmanager.api.controllers.utils.TriggerUtils; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerCommandDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerInputDTO; +import it.fabioformosa.quartzmanager.api.services.SimpleTriggerService; +import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -79,7 +79,7 @@ class SimpleTriggerControllerTest { private SimpleTriggerInputDTO buildSimpleTriggerCommandDTO() { return SimpleTriggerInputDTO.builder() - .jobClass("it.fabioformosa.quartzmanager.jobs.SampleJob") + .jobClass("it.fabioformosa.quartzmanager.api.jobs.SampleJob") .startDate(new Date()) .repeatCount(20) .repeatInterval(20000L) diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/TriggerControllerTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/TriggerControllerTest.java similarity index 80% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/TriggerControllerTest.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/TriggerControllerTest.java index 30a898c..40d99be 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/TriggerControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/TriggerControllerTest.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; -import it.fabioformosa.quartzmanager.QuartManagerApplicationTests; -import it.fabioformosa.quartzmanager.services.TriggerService; +import it.fabioformosa.quartzmanager.api.QuartManagerApplicationTests; +import it.fabioformosa.quartzmanager.api.services.TriggerService; import org.junit.jupiter.api.AfterEach; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java similarity index 83% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java index 9cdd068..938ce66 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/InvalidSimpleTriggerCommandDTOProvider.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.controllers.utils; +package it.fabioformosa.quartzmanager.api.controllers.utils; -import it.fabioformosa.quartzmanager.dto.SimpleTriggerInputDTO; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerInputDTO; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.ArgumentsProvider; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/TestUtils.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TestUtils.java similarity index 91% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/TestUtils.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TestUtils.java index 86b10c4..fb12b97 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/TestUtils.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TestUtils.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers.utils; +package it.fabioformosa.quartzmanager.api.controllers.utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/TriggerUtils.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/TriggerUtils.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java index 7ee9335..253c405 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/controllers/utils/TriggerUtils.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java @@ -1,7 +1,7 @@ -package it.fabioformosa.quartzmanager.controllers.utils; +package it.fabioformosa.quartzmanager.api.controllers.utils; -import it.fabioformosa.quartzmanager.common.utils.DateUtils; -import it.fabioformosa.quartzmanager.dto.*; +import it.fabioformosa.quartzmanager.api.common.utils.DateUtils; +import it.fabioformosa.quartzmanager.api.dto.*; import java.time.LocalDateTime; diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJob.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJob.java new file mode 100644 index 0000000..0b60716 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/jobs/SampleJob.java @@ -0,0 +1,13 @@ +package it.fabioformosa.quartzmanager.api.jobs; + +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; +import org.quartz.JobExecutionContext; + +public class SampleJob extends AbstractQuartzManagerJob { + + @Override + public LogRecord doIt(JobExecutionContext jobExecutionContext) { + return new LogRecord(LogRecord.LogType.INFO, "Hello!"); + } + +} diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/services/JobServiceTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/JobServiceTest.java similarity index 84% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/services/JobServiceTest.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/JobServiceTest.java index daf9c20..e2523a7 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/services/JobServiceTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/JobServiceTest.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; @@ -10,7 +10,7 @@ class JobServiceTest { @Test void givenTwoJobClassesInTwoPackages_whenTheJobServiceIsCalled_shouldReturnTwoJobClasses(){ - JobService jobService = new JobService("it.fabioformosa.quartzmanager.jobs, it.fabioformosa.samplepackage"); + JobService jobService = new JobService("it.fabioformosa.quartzmanager.api.jobs, it.fabioformosa.samplepackage"); jobService.initJobClassList(); Assertions.assertThat(jobService).isNotNull(); Assertions.assertThat(jobService.getJobClasses().size()).isEqualTo(2); @@ -18,9 +18,9 @@ class JobServiceTest { @ParameterizedTest @ValueSource(strings = { - "it.fabioformosa.quartzmanager.jobs", - "it.fabioformosa.quartzmanager.jobs,", - ",it.fabioformosa.quartzmanager.jobs" + "it.fabioformosa.quartzmanager.api.jobs", + "it.fabioformosa.quartzmanager.api.jobs,", + ",it.fabioformosa.quartzmanager.api.jobs" }) void givenOnePackage_whenTheJobServiceIsCalled_shouldReturnOneJobClasses(String packageStr){ JobService jobService = new JobService(packageStr); diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/services/SimpleTriggerServiceTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerServiceTest.java similarity index 89% rename from quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/services/SimpleTriggerServiceTest.java rename to quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerServiceTest.java index ad3b924..74461a1 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/services/SimpleTriggerServiceTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerServiceTest.java @@ -1,8 +1,8 @@ -package it.fabioformosa.quartzmanager.services; +package it.fabioformosa.quartzmanager.api.services; -import it.fabioformosa.quartzmanager.common.utils.DateUtils; -import it.fabioformosa.quartzmanager.dto.*; -import it.fabioformosa.quartzmanager.exceptions.TriggerNotFoundException; +import it.fabioformosa.quartzmanager.api.common.utils.DateUtils; +import it.fabioformosa.quartzmanager.api.dto.*; +import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -48,7 +48,7 @@ class SimpleTriggerServiceTest { @Test void givenASimpleTriggerCommandDTO_whenASimpleTriggerIsScheduled_thenATriggerDTOIsReturned() throws SchedulerException, ClassNotFoundException { SimpleTriggerInputDTO triggerInputDTO = SimpleTriggerInputDTO.builder() - .jobClass("it.fabioformosa.quartzmanager.jobs.SampleJob") + .jobClass("it.fabioformosa.quartzmanager.api.jobs.SampleJob") .startDate(new Date()) .repeatInterval(5000L).repeatCount(5) .endDate(DateUtils.getHoursFromNow(1)) diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/jobs/SampleJob.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/jobs/SampleJob.java deleted file mode 100644 index 4b61c71..0000000 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/jobs/SampleJob.java +++ /dev/null @@ -1,14 +0,0 @@ -package it.fabioformosa.quartzmanager.jobs; - -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord.LogType; -import org.quartz.JobExecutionContext; - -public class SampleJob extends AbstractQuartzManagerJob { - - @Override - public LogRecord doIt(JobExecutionContext jobExecutionContext) { - return new LogRecord(LogType.INFO, "Hello!"); - } - -} diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/samplepackage/SampleExtraJob.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/samplepackage/SampleExtraJob.java index 4061f6a..99a6016 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/samplepackage/SampleExtraJob.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/samplepackage/SampleExtraJob.java @@ -1,8 +1,8 @@ package it.fabioformosa.samplepackage; -import it.fabioformosa.quartzmanager.jobs.AbstractQuartzManagerJob; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord.LogType; +import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob; +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord.LogType; import org.quartz.JobExecutionContext; public class SampleExtraJob extends AbstractQuartzManagerJob { diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml b/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml index 1d3a7ac..7378be2 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml @@ -1,18 +1,11 @@ -app: - name: quartz-manager - quartz: enabled: true -job: - frequency: 4000 - repeatCount: 19 +quartz-manager: + jobClassPackages: it.fabioformosa.quartzmanager.api.jobs logging: level: org.springframework.boot.autoconfigure.security: INFO it.fabioformosa: DEBUG org.quartz: INFO - -quartz-manager: - jobClassPackages: it.fabioformosa.quartzmanager.jobs diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/persistence/PersistenceConfig.java b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java similarity index 95% rename from quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/persistence/PersistenceConfig.java rename to quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java index aa0621b..dada8bf 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/persistence/PersistenceConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.persistence; +package it.fabioformosa.quartzmanager.api.persistence; -import it.fabioformosa.quartzmanager.common.properties.QuartzModuleProperties; +import it.fabioformosa.quartzmanager.api.common.properties.QuartzModuleProperties; import liquibase.integration.spring.SpringLiquibase; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/persistence/QuartzPersistencePropConfig.java b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/QuartzPersistencePropConfig.java similarity index 89% rename from quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/persistence/QuartzPersistencePropConfig.java rename to quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/QuartzPersistencePropConfig.java index 800f95c..1ac0555 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/persistence/QuartzPersistencePropConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/QuartzPersistencePropConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.persistence; +package it.fabioformosa.quartzmanager.api.persistence; import lombok.Getter; import lombok.Setter; diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/META-INF/spring.factories b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/META-INF/spring.factories index 772bc91..a36f8dc 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/META-INF/spring.factories +++ b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -it.fabioformosa.quartzmanager.persistence.PersistenceConfig \ No newline at end of file +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +it.fabioformosa.quartzmanager.api.persistence.PersistenceConfig diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/WebSecurityConfigJWT.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java similarity index 91% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/WebSecurityConfigJWT.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java index 714bb67..7fa81e7 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/WebSecurityConfigJWT.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/WebSecurityConfigJWT.java @@ -1,11 +1,11 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; import com.fasterxml.jackson.databind.ObjectMapper; -import it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths; -import it.fabioformosa.quartzmanager.security.helpers.LoginConfigurer; -import it.fabioformosa.quartzmanager.security.helpers.impl.*; -import it.fabioformosa.quartzmanager.security.properties.InMemoryAccountProperties; -import it.fabioformosa.quartzmanager.security.properties.JwtSecurityProperties; +import it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths; +import it.fabioformosa.quartzmanager.api.security.helpers.LoginConfigurer; +import it.fabioformosa.quartzmanager.api.security.helpers.impl.*; +import it.fabioformosa.quartzmanager.api.security.properties.InMemoryAccountProperties; +import it.fabioformosa.quartzmanager.api.security.properties.JwtSecurityProperties; import org.apache.commons.lang3.BooleanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -32,8 +32,8 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGOUT_PATH; +import static it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH; +import static it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGOUT_PATH; /** * @author Fabio.Formosa diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/controllers/UserController.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/controllers/UserController.java similarity index 82% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/controllers/UserController.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/controllers/UserController.java index 68eedcf..0e36eb0 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/controllers/UserController.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/controllers/UserController.java @@ -1,8 +1,8 @@ -package it.fabioformosa.quartzmanager.security.controllers; +package it.fabioformosa.quartzmanager.api.security.controllers; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.security.SecurityRequirement; -import it.fabioformosa.quartzmanager.common.config.OpenAPIConfigConsts; +import it.fabioformosa.quartzmanager.api.common.config.OpenAPIConfigConsts; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_AUTH_PATH; +import static it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths.QUARTZ_MANAGER_AUTH_PATH; @RestController @Hidden diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/LoginConfigurer.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/LoginConfigurer.java similarity index 89% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/LoginConfigurer.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/LoginConfigurer.java index 4446087..011ba80 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/LoginConfigurer.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/LoginConfigurer.java @@ -1,21 +1,21 @@ -package it.fabioformosa.quartzmanager.security.helpers; - -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; - -/** - * It configures filters to authenticate credentials sent by client or to set authenticationSuccessHandler - * - * Implement this interface for a login strategy - * - */ -public interface LoginConfigurer { - - /** - * If the authentication is based on cookie, it returns the name of cookie to be erased at the logout - */ - String cookieMustBeDeletedAtLogout(); - - HttpSecurity login(String loginPath, HttpSecurity http, AuthenticationManager authenticationManager) throws Exception; - -} +package it.fabioformosa.quartzmanager.api.security.helpers; + +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; + +/** + * It configures filters to authenticate credentials sent by client or to set authenticationSuccessHandler + * + * Implement this interface for a login strategy + * + */ +public interface LoginConfigurer { + + /** + * If the authentication is based on cookie, it returns the name of cookie to be erased at the logout + */ + String cookieMustBeDeletedAtLogout(); + + HttpSecurity login(String loginPath, HttpSecurity http, AuthenticationManager authenticationManager) throws Exception; + +} diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AjaxAuthenticationFilter.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AjaxAuthenticationFilter.java similarity index 96% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AjaxAuthenticationFilter.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AjaxAuthenticationFilter.java index 0c4e0b3..b463db6 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AjaxAuthenticationFilter.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AjaxAuthenticationFilter.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import java.io.IOException; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AnonAuthentication.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AnonAuthentication.java similarity index 87% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AnonAuthentication.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AnonAuthentication.java index f1c266f..497737a 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AnonAuthentication.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AnonAuthentication.java @@ -1,45 +1,45 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; - -import org.springframework.security.authentication.AbstractAuthenticationToken; - -public class AnonAuthentication extends AbstractAuthenticationToken { - private static final long serialVersionUID = 1L; - - public AnonAuthentication() { - super( null ); - } - - @Override - public boolean equals( Object obj ) { - if ( this == obj ) - return true; - if ( obj == null ) - return false; - if ( getClass() != obj.getClass() ) - return false; - return true; - } - - @Override - public Object getCredentials() { - return null; - } - - @Override - public Object getPrincipal() { - return null; - } - - @Override - public int hashCode() { - int hash = 7; - return hash; - } - - @Override - public boolean isAuthenticated() { - return true; - } - - -} +package it.fabioformosa.quartzmanager.api.security.helpers.impl; + +import org.springframework.security.authentication.AbstractAuthenticationToken; + +public class AnonAuthentication extends AbstractAuthenticationToken { + private static final long serialVersionUID = 1L; + + public AnonAuthentication() { + super( null ); + } + + @Override + public boolean equals( Object obj ) { + if ( this == obj ) + return true; + if ( obj == null ) + return false; + if ( getClass() != obj.getClass() ) + return false; + return true; + } + + @Override + public Object getCredentials() { + return null; + } + + @Override + public Object getPrincipal() { + return null; + } + + @Override + public int hashCode() { + int hash = 7; + return hash; + } + + @Override + public boolean isAuthenticated() { + return true; + } + + +} diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AuthenticationFailureHandler.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AuthenticationFailureHandler.java similarity index 89% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AuthenticationFailureHandler.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AuthenticationFailureHandler.java index 08bb8b4..e73c902 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AuthenticationFailureHandler.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AuthenticationFailureHandler.java @@ -1,20 +1,20 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; - -public class AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler { - - @Override - public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, - AuthenticationException exception) throws IOException, ServletException { - - super.onAuthenticationFailure(request, response, exception); - } -} \ No newline at end of file +package it.fabioformosa.quartzmanager.api.security.helpers.impl; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.authentication.SimpleUrlAuthenticationFailureHandler; + +public class AuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler { + + @Override + public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, + AuthenticationException exception) throws IOException, ServletException { + + super.onAuthenticationFailure(request, response, exception); + } +} diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AuthenticationSuccessHandler.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AuthenticationSuccessHandler.java similarity index 94% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AuthenticationSuccessHandler.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AuthenticationSuccessHandler.java index 64d8d6d..ccde413 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/AuthenticationSuccessHandler.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/AuthenticationSuccessHandler.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/FormLoginConfig.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/FormLoginConfig.java similarity index 94% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/FormLoginConfig.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/FormLoginConfig.java index 22b660f..a819e0d 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/FormLoginConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/FormLoginConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,7 +6,7 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.FormLoginConfigurer; -import it.fabioformosa.quartzmanager.security.helpers.LoginConfigurer; +import it.fabioformosa.quartzmanager.api.security.helpers.LoginConfigurer; /** * It delegates the login to the @FormLoginConfigurer of the httpSecurity. diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationFilter.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationFilter.java similarity index 94% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationFilter.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationFilter.java index c15c0ac..217c2fc 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationFilter.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationFilter.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import javax.servlet.FilterChain; import javax.servlet.http.HttpServletRequest; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationSuccessHandler.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationSuccessHandler.java similarity index 83% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationSuccessHandler.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationSuccessHandler.java index 6a956c9..2a8fdc8 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationSuccessHandler.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationSuccessHandler.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import java.io.IOException; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java index a11fbe8..4c9c111 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtAuthenticationSuccessHandlerImpl.java @@ -1,8 +1,8 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import com.fasterxml.jackson.databind.ObjectMapper; -import it.fabioformosa.quartzmanager.security.properties.JwtSecurityProperties; -import it.fabioformosa.quartzmanager.security.models.UserTokenState; +import it.fabioformosa.quartzmanager.api.security.properties.JwtSecurityProperties; +import it.fabioformosa.quartzmanager.api.security.models.UserTokenState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenAuthenticationFilter.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenAuthenticationFilter.java similarity index 98% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenAuthenticationFilter.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenAuthenticationFilter.java index c84ca6f..af512b4 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenAuthenticationFilter.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenAuthenticationFilter.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenBasedAuthentication.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenBasedAuthentication.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenBasedAuthentication.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenBasedAuthentication.java index 904ed07..e7f64ba 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenBasedAuthentication.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenBasedAuthentication.java @@ -1,42 +1,42 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; - -import org.springframework.security.authentication.AbstractAuthenticationToken; -import org.springframework.security.core.userdetails.UserDetails; - - -public class JwtTokenBasedAuthentication extends AbstractAuthenticationToken { - - private static final long serialVersionUID = 1L; - - private String token; - private final UserDetails principle; - - public JwtTokenBasedAuthentication(UserDetails principle) { - super(principle.getAuthorities()); - this.principle = principle; - } - - @Override - public Object getCredentials() { - return token; - } - - @Override - public UserDetails getPrincipal() { - return principle; - } - - public String getToken() { - return token; - } - - @Override - public boolean isAuthenticated() { - return true; - } - - public void setToken( String token ) { - this.token = token; - } - -} +package it.fabioformosa.quartzmanager.api.security.helpers.impl; + +import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.userdetails.UserDetails; + + +public class JwtTokenBasedAuthentication extends AbstractAuthenticationToken { + + private static final long serialVersionUID = 1L; + + private String token; + private final UserDetails principle; + + public JwtTokenBasedAuthentication(UserDetails principle) { + super(principle.getAuthorities()); + this.principle = principle; + } + + @Override + public Object getCredentials() { + return token; + } + + @Override + public UserDetails getPrincipal() { + return principle; + } + + public String getToken() { + return token; + } + + @Override + public boolean isAuthenticated() { + return true; + } + + public void setToken( String token ) { + this.token = token; + } + +} diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenHelper.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenHelper.java similarity index 97% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenHelper.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenHelper.java index 433bf6d..6ea31d6 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtTokenHelper.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtTokenHelper.java @@ -1,9 +1,9 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; -import it.fabioformosa.quartzmanager.security.properties.JwtSecurityProperties; +import it.fabioformosa.quartzmanager.api.security.properties.JwtSecurityProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java index ffbc7bd..c038ad4 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/JwtUsernamePasswordFiterLoginConfig.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -9,7 +9,7 @@ import org.springframework.security.web.authentication.preauth.AbstractPreAuthen import org.springframework.security.web.util.matcher.RegexRequestMatcher; import org.springframework.web.filter.GenericFilterBean; -import it.fabioformosa.quartzmanager.security.helpers.LoginConfigurer; +import it.fabioformosa.quartzmanager.api.security.helpers.LoginConfigurer; /** * It adds a new filter @JwtAuthenticationFilter after @AbstractPreAuthenticatedProcessingFilter that match login path diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/LogoutSuccess.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/LogoutSuccess.java similarity index 91% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/LogoutSuccess.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/LogoutSuccess.java index 5f0eaa0..446f9dd 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/LogoutSuccess.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/LogoutSuccess.java @@ -1,36 +1,36 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.Authentication; -import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; - -import com.fasterxml.jackson.databind.ObjectMapper; - -public class LogoutSuccess implements LogoutSuccessHandler { - - private final ObjectMapper objectMapper; - - public LogoutSuccess(ObjectMapper objectMapper) { - super(); - this.objectMapper = objectMapper; - } - - @Override - public void onLogoutSuccess(HttpServletRequest httpServletRequest, HttpServletResponse response, Authentication authentication) - throws IOException, ServletException { - Map result = new HashMap<>(); - result.put( "result", "success" ); - response.setContentType("application/json"); - response.getWriter().write(objectMapper.writeValueAsString(result)); - response.setStatus(HttpServletResponse.SC_OK); - - } - -} \ No newline at end of file +package it.fabioformosa.quartzmanager.api.security.helpers.impl; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.Authentication; +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; + +import com.fasterxml.jackson.databind.ObjectMapper; + +public class LogoutSuccess implements LogoutSuccessHandler { + + private final ObjectMapper objectMapper; + + public LogoutSuccess(ObjectMapper objectMapper) { + super(); + this.objectMapper = objectMapper; + } + + @Override + public void onLogoutSuccess(HttpServletRequest httpServletRequest, HttpServletResponse response, Authentication authentication) + throws IOException, ServletException { + Map result = new HashMap<>(); + result.put( "result", "success" ); + response.setContentType("application/json"); + response.getWriter().write(objectMapper.writeValueAsString(result)); + response.setStatus(HttpServletResponse.SC_OK); + + } + +} diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/QuartzManagerHttpSecurity.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/QuartzManagerHttpSecurity.java similarity index 94% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/QuartzManagerHttpSecurity.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/QuartzManagerHttpSecurity.java index 7e6ac76..c2979ec 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/QuartzManagerHttpSecurity.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/QuartzManagerHttpSecurity.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; +package it.fabioformosa.quartzmanager.api.security.helpers.impl; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; @@ -7,7 +7,7 @@ import org.springframework.security.config.annotation.web.configurers.LogoutConf import org.springframework.security.web.DefaultSecurityFilterChain; import org.springframework.security.web.util.matcher.AntPathRequestMatcher; -import it.fabioformosa.quartzmanager.security.helpers.LoginConfigurer; +import it.fabioformosa.quartzmanager.api.security.helpers.LoginConfigurer; /** * It wraps the httpSecurity to provide new function as login and logout diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/RestAuthenticationEntryPoint.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/RestAuthenticationEntryPoint.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/RestAuthenticationEntryPoint.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/RestAuthenticationEntryPoint.java index 3615a2e..f44307d 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/helpers/impl/RestAuthenticationEntryPoint.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/helpers/impl/RestAuthenticationEntryPoint.java @@ -1,23 +1,23 @@ -package it.fabioformosa.quartzmanager.security.helpers.impl; - - -import java.io.IOException; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; - -@Component -public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint { - - @Override - public void commence(HttpServletRequest request, - HttpServletResponse response, - AuthenticationException authException) throws IOException { - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage()); - } -} - +package it.fabioformosa.quartzmanager.api.security.helpers.impl; + + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +@Component +public class RestAuthenticationEntryPoint implements AuthenticationEntryPoint { + + @Override + public void commence(HttpServletRequest request, + HttpServletResponse response, + AuthenticationException authException) throws IOException { + response.sendError(HttpServletResponse.SC_UNAUTHORIZED, authException.getMessage()); + } +} + diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/models/UserTokenState.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java similarity index 88% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/models/UserTokenState.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java index e39cd6b..b2f74b7 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/models/UserTokenState.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/models/UserTokenState.java @@ -1,32 +1,32 @@ -package it.fabioformosa.quartzmanager.security.models; - -public class UserTokenState { - private String access_token; - private Long expires_in_sec; - - public UserTokenState() { - this.access_token = null; - this.expires_in_sec = null; - } - - public UserTokenState(String access_token, long expires_in_sec) { - this.access_token = access_token; - this.expires_in_sec = expires_in_sec; - } - - public String getAccess_token() { - return access_token; - } - - public Long getExpires_in_sec() { - return expires_in_sec; - } - - public void setAccess_token(String access_token) { - this.access_token = access_token; - } - - public void setExpires_in_sec(Long expires_in_sec) { - this.expires_in_sec = expires_in_sec; - } -} +package it.fabioformosa.quartzmanager.api.security.models; + +public class UserTokenState { + private String access_token; + private Long expires_in_sec; + + public UserTokenState() { + this.access_token = null; + this.expires_in_sec = null; + } + + public UserTokenState(String access_token, long expires_in_sec) { + this.access_token = access_token; + this.expires_in_sec = expires_in_sec; + } + + public String getAccess_token() { + return access_token; + } + + public Long getExpires_in_sec() { + return expires_in_sec; + } + + public void setAccess_token(String access_token) { + this.access_token = access_token; + } + + public void setExpires_in_sec(Long expires_in_sec) { + this.expires_in_sec = expires_in_sec; + } +} diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryAccountProperties.java similarity index 90% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryAccountProperties.java index 583bc0f..4265194 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/InMemoryAccountProperties.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryAccountProperties.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.properties; +package it.fabioformosa.quartzmanager.api.security.properties; import lombok.Getter; import lombok.Setter; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/JwtSecurityProperties.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/JwtSecurityProperties.java rename to quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java index cb5ed70..d54721d 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/security/properties/JwtSecurityProperties.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.properties; +package it.fabioformosa.quartzmanager.api.security.properties; import lombok.Data; import lombok.Getter; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/resources/META-INF/spring.factories b/quartz-manager-parent/quartz-manager-starter-security/src/main/resources/META-INF/spring.factories index 78062f5..3378531 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/resources/META-INF/spring.factories +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -it.fabioformosa.quartzmanager.security.WebSecurityConfigJWT +it.fabioformosa.quartzmanager.api.security.WebSecurityConfigJWT diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/AbstractSecurityLoginTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/AbstractSecurityLoginTest.java similarity index 80% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/AbstractSecurityLoginTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/AbstractSecurityLoginTest.java index 139941b..2f39181 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/AbstractSecurityLoginTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/AbstractSecurityLoginTest.java @@ -1,13 +1,13 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; -import it.fabioformosa.quartzmanager.security.models.UserTokenState; +import it.fabioformosa.quartzmanager.api.security.models.UserTokenState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.http.*; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH; +import static it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH; public class AbstractSecurityLoginTest { @Autowired diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java similarity index 90% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java index 25e6a1b..be17b1a 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityControllerTest.java @@ -1,6 +1,7 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; -import it.fabioformosa.quartzmanager.security.controllers.TestController; +import it.fabioformosa.quartzmanager.api.common.config.QuartzManagerPaths; +import it.fabioformosa.quartzmanager.api.security.controllers.TestController; import org.hamcrest.core.IsNot; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -13,7 +14,6 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import static it.fabioformosa.quartzmanager.common.config.QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @SpringBootTest @@ -64,7 +64,7 @@ public class SecurityControllerTest { @Test void givenAnAnonymousUser_whenCalledTheLoginPath_thenShouldReturn2xx() throws Exception { - mockMvc.perform(MockMvcRequestBuilders.post(QUARTZ_MANAGER_LOGIN_PATH) + mockMvc.perform(MockMvcRequestBuilders.post(QuartzManagerPaths.QUARTZ_MANAGER_LOGIN_PATH) .contentType("application/x-www-form-urlencoded") .accept("application/json") .param("username", "foo") diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java index 5a2d484..a482a53 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaCookieTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; -import it.fabioformosa.quartzmanager.security.models.UserTokenState; +import it.fabioformosa.quartzmanager.api.security.models.UserTokenState; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java similarity index 90% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java index 2997322..f7f4c1b 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaDefaultStrategyTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; -import it.fabioformosa.quartzmanager.security.models.UserTokenState; +import it.fabioformosa.quartzmanager.api.security.models.UserTokenState; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java index edd7aea..0be0a7a 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderAndLoginFilterTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; -import it.fabioformosa.quartzmanager.security.models.UserTokenState; +import it.fabioformosa.quartzmanager.api.security.models.UserTokenState; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java similarity index 93% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java index 7b556a6..0e5a793 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SecurityLoginViaHeaderTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java @@ -1,6 +1,6 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; -import it.fabioformosa.quartzmanager.security.models.UserTokenState; +import it.fabioformosa.quartzmanager.api.security.models.UserTokenState; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SpringApplicationTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SpringApplicationTest.java similarity index 71% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SpringApplicationTest.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SpringApplicationTest.java index 5472bbf..9e95251 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/SpringApplicationTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SpringApplicationTest.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security; +package it.fabioformosa.quartzmanager.api.security; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/controllers/TestController.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java similarity index 90% rename from quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/controllers/TestController.java rename to quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java index 7edf0e0..fb5bff6 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/security/controllers/TestController.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/controllers/TestController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.security.controllers; +package it.fabioformosa.quartzmanager.api.security.controllers; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.GetMapping; diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/QuartzManagerController.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/QuartzManagerController.java similarity index 92% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/QuartzManagerController.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/QuartzManagerController.java index 89cccb2..32034dc 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/QuartzManagerController.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/QuartzManagerController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.controllers; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/SessionController.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SessionController.java similarity index 95% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/SessionController.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SessionController.java index 6d5ad04..388ee4b 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/controllers/SessionController.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/controllers/SessionController.java @@ -1,4 +1,4 @@ -package it.fabioformosa.quartzmanager.controllers; +package it.fabioformosa.quartzmanager.api.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/api/jobs/myjobs/SampleJob.java new file mode 100644 index 0000000..a955a3a --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/myjobs/SampleJob.java @@ -0,0 +1,14 @@ +package it.fabioformosa.quartzmanager.api.jobs.myjobs; + +import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob; +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; +import org.quartz.JobExecutionContext; + + +public class SampleJob extends AbstractQuartzManagerJob { + @Override + public LogRecord doIt(JobExecutionContext jobExecutionContext) { + return new LogRecord(LogRecord.LogType.INFO, "Hello World!"); + } + +} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/tests/MisfireTestJob.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/tests/MisfireTestJob.java similarity index 70% rename from quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/tests/MisfireTestJob.java rename to quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/tests/MisfireTestJob.java index dc63db2..0623417 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/tests/MisfireTestJob.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/api/jobs/tests/MisfireTestJob.java @@ -1,13 +1,11 @@ -package it.fabioformosa.quartzmanager.jobs.tests; +package it.fabioformosa.quartzmanager.api.jobs.tests; +import it.fabioformosa.quartzmanager.api.jobs.AbstractQuartzManagerJob; +import it.fabioformosa.quartzmanager.api.jobs.entities.LogRecord; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import it.fabioformosa.quartzmanager.jobs.AbstractQuartzManagerJob; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord.LogType; - /** * This job can be used to test the misfire policy. It pretends to be a long * processing job (sleeping for a while) @@ -31,7 +29,7 @@ public class MisfireTestJob extends AbstractQuartzManagerJob { e.printStackTrace(); } - return new LogRecord(LogType.INFO, "Hello!"); + return new LogRecord(LogRecord.LogType.INFO, "Hello!"); } } diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java deleted file mode 100644 index 11ebf92..0000000 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/quartzmanager/jobs/myjobs/SampleJob.java +++ /dev/null @@ -1,16 +0,0 @@ -package it.fabioformosa.quartzmanager.jobs.myjobs; - -import org.quartz.JobExecutionContext; - -import it.fabioformosa.quartzmanager.jobs.AbstractQuartzManagerJob; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord; -import it.fabioformosa.quartzmanager.jobs.entities.LogRecord.LogType; - - -public class SampleJob extends AbstractQuartzManagerJob { - @Override - public LogRecord doIt(JobExecutionContext jobExecutionContext) { - return new LogRecord(LogType.INFO, "Hello World!"); - } - -} 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 0d642cb..6c4aedb 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.jobs + jobClassPackages: it.fabioformosa.quartzmanager.api.jobs security: jwt: secret: "bibidibobidiboo" diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/logback.xml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/logback.xml index 96206fc..43841fe 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/logback.xml +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/logback.xml @@ -12,7 +12,7 @@ - +