From 10f1d008da2c52a6590b2c42f6ee17a4d21873aa Mon Sep 17 00:00:00 2001 From: Daniel Schreider Date: Tue, 30 May 2023 11:19:48 +0200 Subject: [PATCH] Closes #2171 - Refactor toLowerCopy --- .../java/pro/taskana/common/api/BaseQuery.java | 2 +- .../impl/ClassificationHistoryQueryImpl.java | 2 ++ .../impl/TaskHistoryQueryImpl.java | 2 ++ .../impl/WorkbasketHistoryQueryImpl.java | 2 ++ .../internal/ClassificationQueryImpl.java | 2 ++ .../reports/TimeIntervalReportBuilderImpl.java | 17 ++--------------- .../WorkbasketPriorityReportBuilderImpl.java | 17 ++--------------- .../task/internal/TaskCommentQueryImpl.java | 2 ++ .../taskana/task/internal/TaskQueryImpl.java | 2 ++ .../internal/WorkbasketAccessItemQueryImpl.java | 2 ++ .../internal/WorkbasketQueryImpl.java | 2 ++ 11 files changed, 21 insertions(+), 31 deletions(-) diff --git a/common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java b/common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java index 3eb515fa1..d5d90b5ed 100644 --- a/common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java +++ b/common/taskana-common/src/main/java/pro/taskana/common/api/BaseQuery.java @@ -76,7 +76,7 @@ public interface BaseQuery & QueryColumnName> { */ long count(); - default String[] toLowerCopy(String... source) { + static String[] toLowerCopy(String... source) { if (source == null || source.length == 0) { return null; // we are currently aware that this is a code smell. Unfortunately the resolution of this diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java index 7d5e806d8..8c3c538a7 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/ClassificationHistoryQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.simplehistory.impl; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.sql.SQLException; import java.util.ArrayList; import java.util.List; diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java index 47a18ae76..d41d00ec6 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/TaskHistoryQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.simplehistory.impl; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.sql.SQLException; import java.util.ArrayList; import java.util.List; diff --git a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java index f760ec686..1ef2ab8d3 100644 --- a/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java +++ b/history/taskana-simplehistory-provider/src/main/java/pro/taskana/simplehistory/impl/WorkbasketHistoryQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.simplehistory.impl; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.sql.SQLException; import java.util.ArrayList; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java index aa7f8f000..c0c15f79d 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/classification/internal/ClassificationQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.classification.internal; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java index c0e5d121b..0ce22d60f 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/TimeIntervalReportBuilderImpl.java @@ -1,5 +1,7 @@ package pro.taskana.monitor.internal.reports; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.time.Instant; import java.util.Collections; import java.util.List; @@ -628,19 +630,4 @@ abstract class TimeIntervalReportBuilderImpl< } return false; } - - private String[] toLowerCopy(String... source) { - if (source == null || source.length == 0) { - // we are currently aware that this is a code smell. Unfortunately the resolution of this - // would cause havoc in our queries, since we do not have a concept - // for a user input validation yet. As soon as that is done we can resolve this code smell. - return null; - } else { - String[] target = new String[source.length]; - for (int i = 0; i < source.length; i++) { - target[i] = source[i].toLowerCase(); - } - return target; - } - } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketPriorityReportBuilderImpl.java b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketPriorityReportBuilderImpl.java index 23c37e113..21989638a 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketPriorityReportBuilderImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/monitor/internal/reports/WorkbasketPriorityReportBuilderImpl.java @@ -1,5 +1,7 @@ package pro.taskana.monitor.internal.reports; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.util.Collections; import java.util.List; import pro.taskana.common.api.IntInterval; @@ -543,19 +545,4 @@ public class WorkbasketPriorityReportBuilderImpl implements WorkbasketPriorityRe return this; } - - private String[] toLowerCopy(String... source) { - if (source == null || source.length == 0) { - // we are currently aware that this is a code smell. Unfortunately the resolution of this - // would cause havoc in our queries, since we do not have a concept - // for a user input validation yet. As soon as that is done we can resolve this code smell. - return null; - } else { - String[] target = new String[source.length]; - for (int i = 0; i < source.length; i++) { - target[i] = source[i].toLowerCase(); - } - return target; - } - } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentQueryImpl.java index d3984080b..6f6acf4e5 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskCommentQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.task.internal; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; 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 71144d9b4..78435614a 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 @@ -1,5 +1,7 @@ package pro.taskana.task.internal; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java index 2c3563339..b45cf5370 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessItemQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.workbasket.internal; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java index fb6d91adc..bdf56c594 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketQueryImpl.java @@ -1,5 +1,7 @@ package pro.taskana.workbasket.internal; +import static pro.taskana.common.api.BaseQuery.toLowerCopy; + import java.util.ArrayList; import java.util.Arrays; import java.util.List;