From 7e411d42e157b482e0e3c47eee5f75d9105cdbbe Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 22 May 2020 03:48:27 +0200 Subject: [PATCH] TSK-1252: fixed newly introduced code smells --- .../task/internal/ServiceLevelHandler.java | 20 +++++++++---------- .../config/TaskanaSecurityConfigAccTest.java | 12 +++++------ ...CreateWorkbasketAuthorizationsAccTest.java | 2 +- ...DeleteWorkbasketAuthorizationsAccTest.java | 4 ++-- .../GetWorkbasketAuthorizationsAccTest.java | 4 ++-- .../workbasket/UpdateWorkbasketAccTest.java | 14 +++++-------- ...UpdateWorkbasketAuthorizationsAccTest.java | 2 +- .../internal/security/JaasExtensionTest.java | 2 +- 8 files changed, 28 insertions(+), 32 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java index 580274a76..e0e29f19d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/ServiceLevelHandler.java @@ -313,16 +313,16 @@ class ServiceLevelHandler { */ private void ensureServiceLevelIsNotViolated( TaskImpl task, Duration duration, Instant calcPlanned) throws InvalidArgumentException { - if (task.getPlanned() != null && !task.getPlanned().equals(calcPlanned)) { - // manual entered planned date is a different working day than computed value - if (converter.isWorkingDay(0, task.getPlanned()) - || converter.hasWorkingDaysInBetween(task.getPlanned(), calcPlanned)) { - throw new InvalidArgumentException( - String.format( - "Cannot update a task with given planned %s " - + "and due date %s not matching the service level %s.", - task.getPlanned(), task.getDue(), duration)); - } + if (task.getPlanned() != null + && !task.getPlanned().equals(calcPlanned) + // manual entered planned date is a different working day than computed value + && (converter.isWorkingDay(0, task.getPlanned()) + || converter.hasWorkingDaysInBetween(task.getPlanned(), calcPlanned))) { + throw new InvalidArgumentException( + String.format( + "Cannot update a task with given planned %s " + + "and due date %s not matching the service level %s.", + task.getPlanned(), task.getDue(), duration)); } } diff --git a/lib/taskana-core/src/test/java/acceptance/config/TaskanaSecurityConfigAccTest.java b/lib/taskana-core/src/test/java/acceptance/config/TaskanaSecurityConfigAccTest.java index ebb4b6ab0..6b53eaa7a 100644 --- a/lib/taskana-core/src/test/java/acceptance/config/TaskanaSecurityConfigAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/config/TaskanaSecurityConfigAccTest.java @@ -19,10 +19,10 @@ import pro.taskana.common.internal.TaskanaEngineTestConfiguration; import pro.taskana.common.internal.configuration.DbSchemaCreator; import pro.taskana.sampledata.SampleDataGenerator; -public class TaskanaSecurityConfigAccTest { +class TaskanaSecurityConfigAccTest { @BeforeEach - public void cleanDb() throws SQLException { + void cleanDb() throws SQLException { DataSource dataSource = TaskanaEngineTestConfiguration.getDataSource(); String schemaName = TaskanaEngineTestConfiguration.getSchemaName(); @@ -33,7 +33,7 @@ public class TaskanaSecurityConfigAccTest { } @Test - public void should_ThrowException_When_CreatingUnsecuredEngineCfgWhileSecurityIsEnforced() + void should_ThrowException_When_CreatingUnsecuredEngineCfgWhileSecurityIsEnforced() throws SQLException { setSecurityFlag(true); @@ -54,7 +54,7 @@ public class TaskanaSecurityConfigAccTest { } @Test - public void should_StartUpNormally_When_CreatingUnsecuredEngineCfgWhileSecurityIsNotEnforced() + void should_StartUpNormally_When_CreatingUnsecuredEngineCfgWhileSecurityIsNotEnforced() throws SQLException { setSecurityFlag(false); @@ -73,7 +73,7 @@ public class TaskanaSecurityConfigAccTest { } @Test - public void should_SetSecurityFlagToFalse_When_CreatingUnsecureEngineCfgAndSecurityFlagIsNotSet() + void should_SetSecurityFlagToFalse_When_CreatingUnsecureEngineCfgAndSecurityFlagIsNotSet() throws SQLException { assertThat(retrieveSecurityFlag()).isNull(); @@ -94,7 +94,7 @@ public class TaskanaSecurityConfigAccTest { } @Test - public void should_SetSecurityFlagToTrue_When_CreatingSecureEngineCfgAndSecurityFlagIsNotSet() + void should_SetSecurityFlagToTrue_When_CreatingSecureEngineCfgAndSecurityFlagIsNotSet() throws SQLException { assertThat(retrieveSecurityFlag()).isNull(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java index a05dd8e1f..4bad004ce 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAuthorizationsAccTest.java @@ -15,7 +15,7 @@ import pro.taskana.workbasket.api.models.WorkbasketAccessItem; /** Acceptance test for all "set workbasket access item" scenarios. */ @ExtendWith(JaasExtension.class) -public class CreateWorkbasketAuthorizationsAccTest extends AbstractAccTest { +class CreateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId(user = "user_1_1") @WithAccessId(user = "taskadmin") diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java index b9a9b413d..32888dfc3 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java @@ -14,12 +14,12 @@ import pro.taskana.workbasket.api.WorkbasketService; /** Acceptance test for all "delete workbasket authorizations" scenarios. */ @ExtendWith(JaasExtension.class) -public class DeleteWorkbasketAuthorizationsAccTest extends AbstractAccTest { +class DeleteWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId(user = "user_1_1") @WithAccessId(user = "taskadmin") @TestTemplate - public void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { + void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java index 1275d10d4..63ca42729 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAuthorizationsAccTest.java @@ -14,12 +14,12 @@ import pro.taskana.workbasket.api.WorkbasketService; /** Acceptance test for all "get workbasket authorizations" scenarios. */ @ExtendWith(JaasExtension.class) -public class GetWorkbasketAuthorizationsAccTest extends AbstractAccTest { +class GetWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId(user = "user_1_1") @WithAccessId(user = "taskadmin") @TestTemplate - public void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { + void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java index 528fffee7..3e85fddd7 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java @@ -23,17 +23,13 @@ import pro.taskana.workbasket.internal.models.WorkbasketImpl; /** Acceptance test for all "update workbasket" scenarios. */ @ExtendWith(JaasExtension.class) -public class UpdateWorkbasketAccTest extends AbstractAccTest { - - public UpdateWorkbasketAccTest() { - super(); - } +class UpdateWorkbasketAccTest extends AbstractAccTest { @WithAccessId( user = "teamlead_1", groups = {"group_1", "businessadmin"}) @Test - public void testUpdateWorkbasket() + void testUpdateWorkbasket() throws NotAuthorizedException, WorkbasketNotFoundException, ConcurrencyException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); Workbasket workbasket = workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A"); @@ -67,7 +63,7 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest { user = "teamlead_1", groups = {"group_1", "businessadmin"}) @Test - public void testUpdateWorkbasketWithConcurrentModificationShouldThrowException() + void testUpdateWorkbasketWithConcurrentModificationShouldThrowException() throws NotAuthorizedException, WorkbasketNotFoundException, ConcurrencyException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -85,7 +81,7 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest { user = "teamlead_1", groups = {"group_1", "businessadmin"}) @Test - public void testUpdateWorkbasketOfNonExistingWorkbasketShouldThrowException() + void testUpdateWorkbasketOfNonExistingWorkbasketShouldThrowException() throws NotAuthorizedException, WorkbasketNotFoundException, ConcurrencyException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -103,7 +99,7 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest { @WithAccessId(user = "user_1_1", groups = "group_1") @WithAccessId(user = "taskadmin") @TestTemplate - public void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() + void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() throws NotAuthorizedException, WorkbasketNotFoundException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); Workbasket workbasket = workbasketService.getWorkbasket("USER_1_1", "DOMAIN_A"); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java index 97e34c1b5..8161f24ba 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -40,7 +40,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @WithAccessId(user = "user_1_1") @WithAccessId(user = "taskadmin") @TestTemplate - public void should_ThrowException_When_UserIsNotAdminOrBusinessAdmin() { + void should_ThrowException_When_UserIsNotAdminOrBusinessAdmin() { final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java index 1332aca93..9e41fe6e5 100644 --- a/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java +++ b/lib/taskana-core/src/test/java/pro/taskana/common/internal/security/JaasExtensionTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; @ExtendWith(JaasExtension.class) -public class JaasExtensionTest { +class JaasExtensionTest { private static final String INSIDE_DYNAMIC_TEST_USER = "insidedynamictest"; private static final DynamicTest NOT_NULL_DYNAMIC_TEST =