TSK-391 Remove custom field condition from task query

lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java

@@ -395,15 +395,6 @@ public interface TaskQuery extends BaseQuery<TaskSummary> {
      */
     TaskQuery businessProcessIdLike(String... businessProcessIds);
 
-    /**
-     * Filter the custom fields with this query. The scan will be run over all 10 fields.
-     *
-     * @param customFields
-     *            the value in the fields
-     * @return the query
-     */
-    TaskQuery customFieldsIn(String... customFields);
-
     /**
      * Add the values of custom attribute number num for exact matching to your query.
      *

lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java

@@ -58,7 +58,6 @@ public class TaskQueryImpl implements TaskQuery {
     private String[] ownerLike;
     private Boolean isRead;
     private Boolean isTransferred;
-    private String[] customFields;
     private String[] porCompanyIn;
     private String[] porCompanyLike;
     private String[] porSystemIn;
@@ -353,12 +352,6 @@ public class TaskQueryImpl implements TaskQuery {
         return this;
     }
 
-    @Override
-    public TaskQuery customFieldsIn(String... customFields) {
-        this.customFields = customFields;
-        return this;
-    }
-
     @Override
     public TaskQuery parentBusinessProcessIdIn(String... parentBusinessProcessIds) {
         this.parentBusinessProcessIdIn = parentBusinessProcessIds;
@@ -892,10 +885,6 @@ public class TaskQueryImpl implements TaskQuery {
         return ownerLike;
     }
 
-    public String[] getCustomFields() {
-        return customFields;
-    }
-
     public Boolean getIsRead() {
         return isRead;
     }
@@ -1220,8 +1209,6 @@ public class TaskQueryImpl implements TaskQuery {
         builder.append(isRead);
         builder.append(", isTransferred=");
         builder.append(isTransferred);
-        builder.append(", customFields=");
-        builder.append(Arrays.toString(customFields));
         builder.append(", porCompanyIn=");
         builder.append(Arrays.toString(porCompanyIn));
         builder.append(", porCompanyLike=");

lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java

@@ -101,7 +101,6 @@ public interface QueryMapper {
         + "<if test='custom15Like != null'>AND (<foreach item='item' collection='custom15Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
         + "<if test='custom16In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom16In' separator=',' >#{item}</foreach>)</if> "
         + "<if test='custom16Like != null'>AND (<foreach item='item' collection='custom16Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
-        + "<if test='customFields != null'>AND (t.CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_9 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_10 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
         + "</where>"
         + "<if test='!orderBy.isEmpty()'>ORDER BY <foreach item='item' collection='orderBy' separator=',' >${item}</foreach></if> "
         + "</script>")
@@ -400,7 +399,18 @@ public interface QueryMapper {
         + "<if test='custom9Like != null'>AND (<foreach item='item' collection='custom9Like' separator=' OR '>UPPER(t.CUSTOM_9) LIKE #{item}</foreach>)</if> "
         + "<if test='custom10In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom10In' separator=',' >#{item}</foreach>)</if> "
         + "<if test='custom10Like != null'>AND (<foreach item='item' collection='custom10Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
-        + "<if test='customFields != null'>AND (t.CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_9 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_10 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
+        + "<if test='custom11In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom11In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom11Like != null'>AND (<foreach item='item' collection='custom11Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom12In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom12In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom12Like != null'>AND (<foreach item='item' collection='custom12Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom13In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom13In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom13Like != null'>AND (<foreach item='item' collection='custom13Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom14In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom14In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom14Like != null'>AND (<foreach item='item' collection='custom14Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom15In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom15In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom15Like != null'>AND (<foreach item='item' collection='custom15Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom16In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom16In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom16Like != null'>AND (<foreach item='item' collection='custom16Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
         + "</where>"
         + "<if test='!orderBy.isEmpty()'>ORDER BY <foreach item='item' collection='orderBy' separator=',' >${item}</foreach></if> "
         + "</script>")
@@ -597,7 +607,18 @@ public interface QueryMapper {
         + "<if test='custom9Like != null'>AND (<foreach item='item' collection='custom9Like' separator=' OR '>UPPER(t.CUSTOM_9) LIKE #{item}</foreach>)</if> "
         + "<if test='custom10In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom10In' separator=',' >#{item}</foreach>)</if> "
         + "<if test='custom10Like != null'>AND (<foreach item='item' collection='custom10Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
-        + "<if test='customFields != null'>AND (t.CUSTOM_1 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_2 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_3 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_4 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_5 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_6 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_7 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_8 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_9 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>) OR t.CUSTOM_10 IN(<foreach item='item' collection='customFields' separator=',' >#{item}</foreach>))</if> "
+        + "<if test='custom11In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom11In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom11Like != null'>AND (<foreach item='item' collection='custom11Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom12In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom12In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom12Like != null'>AND (<foreach item='item' collection='custom12Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom13In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom13In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom13Like != null'>AND (<foreach item='item' collection='custom13Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom14In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom14In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom14Like != null'>AND (<foreach item='item' collection='custom14Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom15In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom15In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom15Like != null'>AND (<foreach item='item' collection='custom15Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
+        + "<if test='custom16In != null'>AND t.CUSTOM_10 IN(<foreach item='item' collection='custom16In' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='custom16Like != null'>AND (<foreach item='item' collection='custom16Like' separator=' OR '>UPPER(t.CUSTOM_10) LIKE #{item}</foreach>)</if> "
         + "</where>"
         + "<if test='!orderBy.isEmpty()'>ORDER BY <foreach item='item' collection='orderBy' separator=',' >${item}</foreach></if> "
         + "</script>")

lib/taskana-core/src/test/java/pro/taskana/impl/TaskQueryImplTest.java

@@ -59,7 +59,6 @@ public class TaskQueryImplTest {
         doReturn(intermediate).when(taskServiceMock).augmentTaskSummariesByContainedSummaries(any());
 
         List<TaskSummary> result = taskQueryImpl.nameIn("test", "asd", "blubber")
-            .customFieldsIn("cool", "bla")
             .priorityIn(1, 2)
             .stateIn(TaskState.CLAIMED, TaskState.COMPLETED)
             .list();
@@ -76,7 +75,6 @@ public class TaskQueryImplTest {
         doReturn(intermediate).when(taskServiceMock).augmentTaskSummariesByContainedSummaries(any());
 
         List<TaskSummary> result = taskQueryImpl.nameIn("test", "asd", "blubber")
-            .customFieldsIn("cool", "bla")
             .priorityIn(1, 2)
             .stateIn(TaskState.CLAIMED, TaskState.COMPLETED)
             .list(1, 1);
@@ -93,7 +91,6 @@ public class TaskQueryImplTest {
         // when(taskServiceMock.augmentTaskSummariesByContainedSummaries(any())).thenReturn(intermediate);
 
         TaskSummary result = taskQueryImpl.nameIn("test", "asd", "blubber")
-            .customFieldsIn("cool", "bla")
             .priorityIn(1, 2)
             .stateIn(TaskState.CLAIMED, TaskState.COMPLETED)
             .single();

lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java

@@ -204,7 +204,7 @@ public class TaskServiceImplIntAutocommitTest {
             .stateIn(TaskState.CLAIMED)
             .workbasketKeyDomainIn(new KeyDomain("asd", "novatec"), new KeyDomain("asdasdasd", "novatec"))
             .ownerIn("test", "test2", "bla")
-            .customFieldsIn("test")
+            .customAttributeIn("16", "test")
             .classificationKeyIn("pId1", "pId2")
             .primaryObjectReferenceCompanyIn("first comp", "sonstwo gmbh")
             .primaryObjectReferenceSystemIn("sys")

lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java

@@ -351,7 +351,7 @@ public class TaskServiceImplIntExplicitTest {
             .stateIn(TaskState.CLAIMED)
             .workbasketKeyDomainIn(new KeyDomain("k1", "novatec"))
             .ownerIn("test", "test2", "bla")
-            .customFieldsIn("test")
+            .customAttributeLike("13", "test")
             .classificationKeyIn("pId1", "pId2")
             .primaryObjectReferenceCompanyIn("first comp", "sonstwo gmbh")
             .primaryObjectReferenceSystemIn("sys")

rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java

@@ -57,7 +57,7 @@ public class TaskController {
             // get all
             return ResponseEntity.status(HttpStatus.OK).body(taskLogic.getAll());
         }
-        return ResponseEntity.status(HttpStatus.OK).body(taskLogic.inspectPrams(params));
+        return ResponseEntity.status(HttpStatus.OK).body(taskLogic.inspectParams(params));
     }
 
     @GetMapping(path = "/{taskId}")

rest/taskana-rest-spring/src/main/java/pro/taskana/rest/query/TaskFilter.java

@@ -55,7 +55,7 @@ public class TaskFilter {
         return taskService.createTaskQuery().list();
     }
 
-    public List<TaskSummary> inspectPrams(MultiValueMap<String, String> params)
+    public List<TaskSummary> inspectParams(MultiValueMap<String, String> params)
         throws NotAuthorizedException, InvalidArgumentException {
         TaskQuery taskQuery = taskService.createTaskQuery();
 
@@ -117,10 +117,6 @@ public class TaskFilter {
         if (params.containsKey(IS_TRANSFERRED)) {
             taskQuery.transferredEquals(Boolean.getBoolean(params.get(IS_TRANSFERRED).get(0)));
         }
-        if (params.containsKey(CUSTOM)) {
-            String[] custom = extractCommaSeperatedFields(params.get(CUSTOM));
-            taskQuery.customFieldsIn(custom);
-        }
         return taskQuery.list();
     }