From 5cf39b386119c09e45bcab743e0fdcfb030bbcd2 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 19 Nov 2022 18:53:13 +0100 Subject: [PATCH] #78 fixed sonar errors --- .../properties/JwtSecurityProperties.java | 15 +++++++++------ .../properties/AbstractPropertyValidatorTest.java | 2 +- .../InMemoryUsersValidationControllerTest.java | 2 +- .../quartzmanager/jobs/tests/MisfireTestJob.java | 3 +-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java index 7f6df4d..9012095 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/main/java/it/fabioformosa/quartzmanager/api/security/properties/JwtSecurityProperties.java @@ -1,5 +1,6 @@ package it.fabioformosa.quartzmanager.api.security.properties; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -12,12 +13,19 @@ import java.util.Base64; @Configuration @ConfigurationProperties(prefix = "quartz-manager.security.jwt") +@Data +@AllArgsConstructor @Getter @Setter public class JwtSecurityProperties { private String secret; - { + private long expirationInSec = 28800; + + private CookieStrategy cookieStrategy = new CookieStrategy(); + private HeaderStrategy headerStrategy = new HeaderStrategy(); + + public JwtSecurityProperties() { SecureRandom random = new SecureRandom(); byte[] bytes = new byte[20]; random.nextBytes(bytes); @@ -25,11 +33,6 @@ public class JwtSecurityProperties { secret = encoder.encodeToString(bytes); } - private long expirationInSec = 28800; - - private CookieStrategy cookieStrategy = new CookieStrategy(); - private HeaderStrategy headerStrategy = new HeaderStrategy(); - @Data public static class CookieStrategy { private boolean enabled = false; diff --git a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/AbstractPropertyValidatorTest.java b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/AbstractPropertyValidatorTest.java index 1a96f18..8ec533b 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/AbstractPropertyValidatorTest.java +++ b/quartz-manager-parent/quartz-manager-starter-security/src/test/java/it/fabioformosa/quartzmanager/api/security/properties/AbstractPropertyValidatorTest.java @@ -12,7 +12,7 @@ import javax.validation.Validator; import java.lang.reflect.InvocationTargetException; import java.util.Map; -public class AbstractPropertyValidatorTest { +public abstract class AbstractPropertyValidatorTest { protected static Validator propertyValidator; @BeforeAll 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 5c026d9..7275e5c 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 @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Stream; -public class InMemoryUsersValidationControllerTest extends AbstractPropertyValidatorTest { +class InMemoryUsersValidationControllerTest extends AbstractPropertyValidatorTest { static Stream notValidInMemoryProps = Stream.of( Arguments.of( 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/jobs/tests/MisfireTestJob.java index c87df25..dc21ef3 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/jobs/tests/MisfireTestJob.java @@ -28,8 +28,7 @@ public class MisfireTestJob extends AbstractQuartzManagerJob { log.info("{} woke up!", Thread.currentThread().getName()); } catch (InterruptedException e) { - log.error(e.getMessage(), e); - throw new RuntimeException(e); + throw new IllegalStateException(e); } return new LogRecord(LogRecord.LogType.INFO, "Hello!");