From e42b26fa7379ecd38a73f2b6f466d3023acb6f06 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Tue, 8 Nov 2022 23:53:24 +0100 Subject: [PATCH] #78 fixed some smells --- .../quartzmanager/api/configuration/OpenApiConfig.java | 2 +- .../converters/SimpleTriggerCommandDTOToSimpleTrigger.java | 4 +--- .../api/exceptions/TriggerNotFoundException.java | 2 +- .../quartzmanager/api/services/SimpleTriggerService.java | 3 --- .../api/security/SecurityLoginViaCookieTest.java | 2 +- .../api/security/SecurityLoginViaDefaultStrategyTest.java | 2 +- .../security/SecurityLoginViaHeaderAndLoginFilterTest.java | 2 +- .../api/security/SecurityLoginViaHeaderTest.java | 2 +- .../properties/InMemoryUsersValidationControllerTest.java | 6 +++--- .../main/java/it/fabioformosa/WebShowcaseOpenApiConfig.java | 3 +-- 10 files changed, 11 insertions(+), 17 deletions(-) diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java index 97e1353..63e48c9 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/OpenApiConfig.java @@ -40,7 +40,7 @@ public class OpenApiConfig { public GroupedOpenApi quartzManagerStoreOpenApi(@Autowired(required = false) @Qualifier("quartzManagerOpenApiCustomiser") Optional openApiCustomiser) { String[] paths = {QuartzManagerPaths.QUARTZ_MANAGER_BASE_CONTEXT_PATH + "/**"}; GroupedOpenApi.Builder groupedOpenApiBuilder = GroupedOpenApi.builder().group("quartz-manager").pathsToMatch(paths); - openApiCustomiser.ifPresent(oaCustomizer -> groupedOpenApiBuilder.addOpenApiCustomiser(oaCustomizer)); + openApiCustomiser.ifPresent(groupedOpenApiBuilder::addOpenApiCustomiser); return groupedOpenApiBuilder.build(); } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java index fe34392..08cf37c 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java @@ -29,12 +29,10 @@ public class SimpleTriggerCommandDTOToSimpleTrigger implements Converter optionalTriggerKey = getTriggerByKey(name); -// TriggerKey triggerKey = optionalTriggerKey.orElse(TriggerKey.triggerKey(name)); - SimpleTrigger newSimpleTrigger = conversionService.convert(triggerCommandDTO, SimpleTrigger.class); TriggerKey triggerKey = TriggerKey.triggerKey(triggerCommandDTO.getTriggerName()); diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java index 7cdbaae..0830d5d 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaCookieTest.java @@ -25,7 +25,7 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.accounts.in-memory.users[0].password=bar", "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) -public class SecurityLoginViaCookieTest extends AbstractSecurityLoginTest { +class SecurityLoginViaCookieTest extends AbstractSecurityLoginTest { @Test void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java index 178b0d5..42b150a 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaDefaultStrategyTest.java @@ -16,7 +16,7 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.accounts.in-memory.users[0].password=bar", "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) -public class SecurityLoginViaDefaultStrategyTest extends AbstractSecurityLoginTest { +class SecurityLoginViaDefaultStrategyTest extends AbstractSecurityLoginTest { @Test void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java index 938c4fb..64b41d4 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderAndLoginFilterTest.java @@ -24,7 +24,7 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.accounts.in-memory.users[0].password=bar", "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) -public class SecurityLoginViaHeaderAndLoginFilterTest extends AbstractSecurityLoginTest { +class SecurityLoginViaHeaderAndLoginFilterTest extends AbstractSecurityLoginTest { @Test void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java index b95c77e..dd78ef2 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/SecurityLoginViaHeaderTest.java @@ -23,7 +23,7 @@ import org.springframework.test.context.TestPropertySource; "quartz-manager.security.accounts.in-memory.users[0].password=bar", "quartz-manager.security.accounts.in-memory.users[0].roles[0]=admin", }) -public class SecurityLoginViaHeaderTest extends AbstractSecurityLoginTest { +class SecurityLoginViaHeaderTest extends AbstractSecurityLoginTest { @Test void givenAnAnonymousUser_whenTheLoginIsSubmitted_thenShouldReturn2xx() { diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryUsersValidationControllerTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryUsersValidationControllerTest.java index 7ecb4b4..4b29016 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryUsersValidationControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/InMemoryUsersValidationControllerTest.java @@ -45,7 +45,7 @@ public class InMemoryUsersValidationControllerTest { @ParameterizedTest @MethodSource("it.fabioformosa.quartzmanager.api.security.properties.InMemoryUsersValidationControllerTest#getNotValidInMemoryProps") - void givenAMissingUsername_whenThePropertyValidationIsApplied_thenShouldRaiseValidationError(Map properties) throws Exception { + void givenAMissingUsername_whenThePropertyValidationIsApplied_thenShouldRaiseValidationError(Map properties) { ConfigurationPropertySource source = new MapConfigurationPropertySource(properties); Binder binder = new Binder(source); @@ -54,7 +54,7 @@ public class InMemoryUsersValidationControllerTest { Assertions.assertThat(result.isBound()).isTrue(); InMemoryAccountProperties inMemoryAccountProperties = result.get(); - Assertions.assertThat(propertyValidator.validate(inMemoryAccountProperties).size()).isPositive(); + Assertions.assertThat(propertyValidator.validate(inMemoryAccountProperties)).isNotEmpty(); } @@ -73,7 +73,7 @@ public class InMemoryUsersValidationControllerTest { Assertions.assertThat(result.isBound()).isTrue(); InMemoryAccountProperties inMemoryAccountProperties = result.get(); - Assertions.assertThat(propertyValidator.validate(inMemoryAccountProperties).size()).isZero(); + Assertions.assertThat(propertyValidator.validate(inMemoryAccountProperties)).isEmpty(); } } diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/WebShowcaseOpenApiConfig.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/WebShowcaseOpenApiConfig.java index 378c337..45cc5fb 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/WebShowcaseOpenApiConfig.java +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/WebShowcaseOpenApiConfig.java @@ -12,7 +12,7 @@ public class WebShowcaseOpenApiConfig { @Bean public OpenAPI webshowcaseOpenAPI() { - OpenAPI openAPI = new OpenAPI() + return new OpenAPI() .info(new Info() .title("QUARTZ MANAGER DEMO API") .description("Quartz Manager- DEMO - REST API") @@ -20,7 +20,6 @@ public class WebShowcaseOpenApiConfig { .license(new License() .name("Apache License 2.0") .url("https://github.com/fabioformosa/quartz-manager/blob/master/LICENSE"))); - return openAPI; } @Bean