nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1650: Code Smells

This commit is contained in:
Tristan Eisermann 2021-08-10 09:37:18 +02:00 committed by Mustapha Zorgati
parent 8e94de6a42
commit 7810267092
5 changed files with 58 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/taskana-common/src/main/java/pro/taskana/common/internal/util/SqlProviderUtil.java
View File

@ -5,6 +5,7 @@ public class SqlProviderUtil {
public static final String CLOSING_SCRIPT_TAG = "</script>";
public static final String OPENING_WHERE_TAG = "<where>";
public static final String CLOSING_WHERE_TAG = "</where>";
public static final String DB2_WITH_UR = "<if test=\"_databaseId == 'db2'\">with UR </if>";
private SqlProviderUtil() {}

15
lib/taskana-core/src/main/java/pro/taskana/task/internal/ObjectReferenceQuerySqlProvider.java
View File

@ -1,12 +1,13 @@
package pro.taskana.task.internal;
import static pro.taskana.common.internal.util.SqlProviderUtil.CLOSING_SCRIPT_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.CLOSING_WHERE_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.DB2_WITH_UR;
import static pro.taskana.common.internal.util.SqlProviderUtil.OPENING_SCRIPT_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.OPENING_WHERE_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.whereIn;
public class ObjectReferenceQuerySqlProvider {
private static final String OPENING_SCRIPT_TAG = "<script>";
private static final String CLOSING_SCRIPT_TAG = "</script>";
private static final String OPENING_WHERE_TAG = "<where>";
private static final String CLOSING_WHERE_TAG = "</where>";
private ObjectReferenceQuerySqlProvider() {}
@ -17,7 +18,7 @@ public class ObjectReferenceQuerySqlProvider {
+ OPENING_WHERE_TAG
+ commonObjectReferenceWhereStatement()
+ CLOSING_WHERE_TAG
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
@ -28,7 +29,7 @@ public class ObjectReferenceQuerySqlProvider {
+ OPENING_WHERE_TAG
+ commonObjectReferenceWhereStatement()
+ CLOSING_WHERE_TAG
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
@ -39,7 +40,7 @@ public class ObjectReferenceQuerySqlProvider {
+ OPENING_WHERE_TAG
+ commonObjectReferenceWhereStatement()
+ CLOSING_WHERE_TAG
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}

3
lib/taskana-core/src/main/java/pro/taskana/task/internal/TaskQuerySqlProvider.java
View File

@ -2,6 +2,7 @@ package pro.taskana.task.internal;
import static pro.taskana.common.internal.util.SqlProviderUtil.CLOSING_SCRIPT_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.CLOSING_WHERE_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.DB2_WITH_UR;
import static pro.taskana.common.internal.util.SqlProviderUtil.OPENING_SCRIPT_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.OPENING_WHERE_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.whereIn;
@ -238,7 +239,7 @@ public class TaskQuerySqlProvider {
+ "</choose>"
+ "</foreach>"
+ "</if> "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}

38
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketAccessSqlProvider.java
View File

@ -1,5 +1,9 @@
package pro.taskana.workbasket.internal;
import static pro.taskana.common.internal.util.SqlProviderUtil.CLOSING_SCRIPT_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.DB2_WITH_UR;
import static pro.taskana.common.internal.util.SqlProviderUtil.OPENING_SCRIPT_TAG;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@ -9,13 +13,13 @@ import pro.taskana.common.internal.util.Pair;
public class WorkbasketAccessSqlProvider {
public static final List<Pair<String, String>> COLUMNS =
private static final List<Pair<String, String>> COLUMNS =
Arrays.asList(
Pair.of("WORKBASKET_ID", "#{workbasketAccessItem.workbasketId}"),
Pair.of("ACCESS_ID", "#{workbasketAccessItem.accessId}"),
Pair.of("ACCESS_NAME", "#{workbasketAccessItem.accessName}"));
public static final List<Pair<String, String>> PERMISSIONS =
private static final List<Pair<String, String>> PERMISSIONS =
Arrays.asList(
Pair.of("PERM_READ", "#{workbasketAccessItem.permRead}"),
Pair.of("PERM_OPEN", "#{workbasketAccessItem.permOpen}"),
@ -35,38 +39,40 @@ public class WorkbasketAccessSqlProvider {
Pair.of("PERM_CUSTOM_11", "#{workbasketAccessItem.permCustom11}"),
Pair.of("PERM_CUSTOM_12", "#{workbasketAccessItem.permCustom1}"));
private WorkbasketAccessSqlProvider() {}
public static String findById() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ "ID, "
+ commonSelectStatements()
+ "FROM WORKBASKET_ACCESS_LIST WHERE ID = #{id} "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findByWorkbasketId() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ "WBA.ID, WB.KEY, "
+ commonSelectStatements()
+ "FROM WORKBASKET_ACCESS_LIST AS WBA "
+ "LEFT JOIN WORKBASKET AS WB ON WORKBASKET_ID = WB.ID "
+ "WHERE WORKBASKET_ID = #{id} "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findByAccessId() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ "WBA.ID, WB.KEY, "
+ commonSelectStatements()
+ "FROM WORKBASKET_ACCESS_LIST AS WBA "
+ "LEFT JOIN WORKBASKET AS WB ON WORKBASKET_ID = WB.ID "
+ "WHERE ACCESS_ID = #{id} "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String insert() {
@ -96,7 +102,7 @@ public class WorkbasketAccessSqlProvider {
}
public static String findByWorkbasketAndAccessId() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "<choose>"
+ "<when test=\"_databaseId == 'db2'\">"
+ "SELECT "
@ -110,12 +116,12 @@ public class WorkbasketAccessSqlProvider {
+ "FROM WORKBASKET_ACCESS_LIST "
+ "WHERE WORKBASKET_ID = #{workbasketId} AND ACCESS_ID IN"
+ "(<foreach item='item' collection='accessIds' separator=',' >#{item}</foreach>) "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findByWorkbasketKeyDomainAndAccessId() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "<choose>"
+ "<when test=\"_databaseId == 'db2'\">"
+ "SELECT "
@ -135,7 +141,7 @@ public class WorkbasketAccessSqlProvider {
+ "AND ACCESS_ID IN"
+ "(<foreach item='item' collection='accessIds' separator=',' >#{item}</foreach>)"
+ "<if test=\"_databaseId == 'db2'\">with UR</if>"
+ "</script>";
+ CLOSING_SCRIPT_TAG;
}
private static String commonUpdateStatement() {

44
lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketSqlProvider.java
View File

@ -1,5 +1,9 @@
package pro.taskana.workbasket.internal;
import static pro.taskana.common.internal.util.SqlProviderUtil.CLOSING_SCRIPT_TAG;
import static pro.taskana.common.internal.util.SqlProviderUtil.DB2_WITH_UR;
import static pro.taskana.common.internal.util.SqlProviderUtil.OPENING_SCRIPT_TAG;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@ -8,7 +12,7 @@ import pro.taskana.common.internal.util.Pair;
public class WorkbasketSqlProvider {
public static final List<Pair<String, String>> COLUMNS =
private static final List<Pair<String, String>> COLUMNS =
Arrays.asList(
Pair.of("ID", "#{workbasket.id}"),
Pair.of("KEY", "#{workbasket.key}"),
@ -29,69 +33,71 @@ public class WorkbasketSqlProvider {
Pair.of("ORG_LEVEL_4", "#{workbasket.orgLevel4}"),
Pair.of("MARKED_FOR_DELETION", "#{workbasket.markedForDeletion}"));
private WorkbasketSqlProvider() {}
public static String findById() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ commonSelectFields(false)
+ " FROM WORKBASKET WHERE ID = #{id}"
+ "<if test=\"_databaseId == 'db2'\">with UR </if>"
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findSummaryById() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ commonSelectFields(true)
+ " FROM WORKBASKET WHERE ID = #{id} "
+ "<if test=\"_databaseId == 'db2'\">with UR </if>"
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findByKeyAndDomain() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ commonSelectFields(false)
+ " FROM WORKBASKET WHERE UPPER(KEY) = UPPER(#{key}) and UPPER(DOMAIN) = UPPER(#{domain}) "
+ "<if test=\"_databaseId == 'db2'\">with UR </if>"
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findDistributionTargets() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ commonSelectFields(true)
+ " FROM WORKBASKET "
+ "WHERE ID IN (SELECT TARGET_ID FROM DISTRIBUTION_TARGETS WHERE SOURCE_ID = #{id}) "
+ "<if test=\"_databaseId == 'db2'\">with UR </if>"
+ "</script>";
+ DB2_WITH_UR
+ CLOSING_SCRIPT_TAG;
}
public static String findDistributionSources() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT "
+ commonSelectFields(true)
+ " FROM WORKBASKET "
+ "WHERE ID IN (SELECT SOURCE_ID FROM DISTRIBUTION_TARGETS WHERE TARGET_ID = #{id}) "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "</script>";
+ CLOSING_SCRIPT_TAG;
}
public static String findAll() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "SELECT * FROM WORKBASKET ORDER BY ID "
+ "<if test=\"_databaseId == 'db2'\">with UR </if> "
+ "</script>";
+ CLOSING_SCRIPT_TAG;
}
public static String insert() {
return "<script>"
return OPENING_SCRIPT_TAG
+ "INSERT INTO WORKBASKET ("
+ commonSelectFields(false)
+ ") "
+ "VALUES ("
+ valueReferences()
+ ") "
+ "</script>";
+ CLOSING_SCRIPT_TAG;
}
public static String update() {