From 23919eb0a112f0fa6fefd13f39c59c5f78e7f0a5 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Fri, 29 Oct 2021 15:25:52 +0200 Subject: [PATCH] TSK-1762: fixed some code smells --- .../TaskanaConfigurationInitializer.java | 50 ++++++++++--------- .../common/api/WorkingTimeCalculatorTest.java | 2 +- .../taskana/task/internal/TaskQueryImpl.java | 3 +- .../QueryTaskByClassificationNameAccTest.java | 18 ------- .../TimeIntervalReportFilterParameter.java | 2 +- .../rest/WorkbasketControllerIntTest.java | 18 ++----- 6 files changed, 35 insertions(+), 58 deletions(-) delete mode 100644 lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java diff --git a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaConfigurationInitializer.java b/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaConfigurationInitializer.java index b66586278..86cd27778 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaConfigurationInitializer.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/internal/configuration/TaskanaConfigurationInitializer.java @@ -37,6 +37,10 @@ public class TaskanaConfigurationInitializer { private static final String TASKANA_CLASSIFICATION_CATEGORIES_PROPERTY = "taskana.classification.categories"; + private TaskanaConfigurationInitializer() { + throw new IllegalStateException("utility class"); + } + public static Optional parseProperty( Properties props, String key, CheckedFunction function) { String property = props.getProperty(key, ""); @@ -54,29 +58,6 @@ public class TaskanaConfigurationInitializer { return Optional.empty(); } - static List splitStringAndTrimElements(String str, String separator) { - return splitStringAndTrimElements(str, separator, UnaryOperator.identity()); - } - - static List splitStringAndTrimElements( - String str, String separator, UnaryOperator modifier) { - return Arrays.stream(str.split(Pattern.quote(separator))) - .filter(s -> !s.isEmpty()) - .map(String::trim) - .map(modifier) - .collect(Collectors.toList()); - } - - static CustomHoliday createCustomHolidayFromPropsEntry(String customHolidayEntry) - throws WrongCustomHolidayFormatException { - List parts = - splitStringAndTrimElements(customHolidayEntry, TASKANA_CUSTOM_HOLIDAY_DAY_MONTH_SEPARATOR); - if (parts.size() == 2) { - return CustomHoliday.of(Integer.valueOf(parts.get(0)), Integer.valueOf(parts.get(1))); - } - throw new WrongCustomHolidayFormatException(customHolidayEntry); - } - public static Map> configureClassificationCategoriesForType( Properties props, List classificationTypes) { Function> getClassificationCategoriesForType = @@ -187,6 +168,29 @@ public class TaskanaConfigurationInitializer { } } + static List splitStringAndTrimElements(String str, String separator) { + return splitStringAndTrimElements(str, separator, UnaryOperator.identity()); + } + + static List splitStringAndTrimElements( + String str, String separator, UnaryOperator modifier) { + return Arrays.stream(str.split(Pattern.quote(separator))) + .filter(s -> !s.isEmpty()) + .map(String::trim) + .map(modifier) + .collect(Collectors.toList()); + } + + static CustomHoliday createCustomHolidayFromPropsEntry(String customHolidayEntry) + throws WrongCustomHolidayFormatException { + List parts = + splitStringAndTrimElements(customHolidayEntry, TASKANA_CUSTOM_HOLIDAY_DAY_MONTH_SEPARATOR); + if (parts.size() == 2) { + return CustomHoliday.of(Integer.valueOf(parts.get(0)), Integer.valueOf(parts.get(1))); + } + throw new WrongCustomHolidayFormatException(customHolidayEntry); + } + private static void setFieldValue(Object instance, Field field, Object value) { final Optional hasSetterMethod = Arrays.stream(instance.getClass().getMethods()) diff --git a/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingTimeCalculatorTest.java b/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingTimeCalculatorTest.java index 2012761ab..6387d31f0 100644 --- a/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingTimeCalculatorTest.java +++ b/common/taskana-common/src/test/java/pro/taskana/common/api/WorkingTimeCalculatorTest.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import pro.taskana.common.api.exceptions.InvalidArgumentException; -public class WorkingTimeCalculatorTest { +class WorkingTimeCalculatorTest { private final WorkingTimeCalculator calculator; diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java index 0e6d84fd4..54c9b7b33 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQueryImpl.java @@ -63,6 +63,7 @@ public class TaskQueryImpl implements TaskQuery { private boolean addClassificationNameToSelectClauseForOrdering = false; private boolean addAttachmentClassificationNameToSelectClauseForOrdering = false; private boolean addWorkbasketNameToSelectClauseForOrdering = false; + private boolean joinWithUserInfo; // region id private String[] taskId; @@ -182,6 +183,7 @@ public class TaskQueryImpl implements TaskQuery { private String[] ownerLongNameNotIn; private String[] ownerLongNameLike; private String[] ownerLongNameNotLike; + // endregion // region primaryObjectReference private ObjectReference[] objectReferences; // endregion @@ -327,7 +329,6 @@ public class TaskQueryImpl implements TaskQuery { private WildcardSearchField[] wildcardSearchFieldIn; private String wildcardSearchValueLike; // endregion - private boolean joinWithUserInfo; TaskQueryImpl(InternalTaskanaEngine taskanaEngine) { this.taskanaEngine = taskanaEngine; diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java deleted file mode 100644 index 6deb4791c..000000000 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package acceptance.task; - -import acceptance.AbstractAccTest; -import org.junit.jupiter.api.extension.ExtendWith; - -import pro.taskana.common.api.BaseQuery.SortDirection; -import pro.taskana.common.test.security.JaasExtension; - -/** - * Acceptance test for the usecase of adding/removing an attachment of a task and update the result - * correctly. - */ -@ExtendWith(JaasExtension.class) -class QueryTaskByClassificationNameAccTest extends AbstractAccTest { - - private static SortDirection asc = SortDirection.ASCENDING; - private static SortDirection desc = SortDirection.DESCENDING; -} diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/TimeIntervalReportFilterParameter.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/TimeIntervalReportFilterParameter.java index 7e98643b6..643df2078 100644 --- a/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/TimeIntervalReportFilterParameter.java +++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/monitor/rest/TimeIntervalReportFilterParameter.java @@ -481,7 +481,7 @@ public class TimeIntervalReportFilterParameter Optional.ofNullable(inWorkingDays) .ifPresent( bool -> { - if (bool) { + if (Boolean.TRUE.equals(bool)) { builder.inWorkingDays(); } }); diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java index b27e88895..0ccd01731 100644 --- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketControllerIntTest.java @@ -109,13 +109,8 @@ class WorkbasketControllerIntTest { assertThat(response.getBody()).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.SELF)).isNotNull(); - assertThat( - response - .getBody() - .getRequiredLink(IanaLinkRelations.SELF) - .getHref() - .endsWith(parameters)) - .isTrue(); + assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF).getHref()) + .endsWith(parameters); } @Test @@ -203,13 +198,8 @@ class WorkbasketControllerIntTest { assertThat(response.getBody().getLink(IanaLinkRelations.LAST)).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.NEXT)).isNotNull(); assertThat(response.getBody().getLink(IanaLinkRelations.PREV)).isNotNull(); - assertThat( - response - .getBody() - .getRequiredLink(IanaLinkRelations.SELF) - .getHref() - .endsWith(parameters)) - .isTrue(); + assertThat(response.getBody().getRequiredLink(IanaLinkRelations.SELF).getHref()) + .endsWith(parameters); } @Test