From db8de1063ec136b7142595cb58639b04d68f9713 Mon Sep 17 00:00:00 2001
From: Holger Hagen <19706592+holgerhagen@users.noreply.github.com>
Date: Wed, 28 Mar 2018 16:36:02 +0200
Subject: [PATCH] TSK-406: optimizations from review.

---
 .../java/pro/taskana/rest/TaskController.java | 48 +++++++++----------
 ...lassificationSummaryResourceAssembler.java |  2 +-
 .../mapper/TaskResourceAssembler.java         |  2 +-
 .../mapper/TaskSummaryResourceAssembler.java  |  2 +-
 .../mapper/TaskSummaryResourcesAssembler.java |  2 +-
 5 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java
index 112661004..d15b4d760 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java
@@ -1,7 +1,6 @@
 package pro.taskana.rest;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -203,28 +202,25 @@ public class TaskController extends AbstractPagingController {
             String[] owners = extractCommaSeperatedFields(params.get(OWNER));
             taskQuery.ownerIn(owners);
         }
-        // objectReference filter
-        if (params.keySet().stream().filter(s -> s.startsWith(POR_PREFIX)).toArray().length > 0) {
-            if (params.containsKey(POR_COMPANY)) {
-                String[] companies = extractCommaSeperatedFields(params.get(POR_COMPANY));
-                taskQuery.primaryObjectReferenceCompanyIn(companies);
-            }
-            if (params.containsKey(POR_SYSTEM)) {
-                String[] systems = extractCommaSeperatedFields(params.get(POR_SYSTEM));
-                taskQuery.primaryObjectReferenceSystemIn(systems);
-            }
-            if (params.containsKey(POR_SYSTEM_INSTANCE)) {
-                String[] systemInstances = extractCommaSeperatedFields(params.get(POR_SYSTEM_INSTANCE));
-                taskQuery.primaryObjectReferenceSystemInstanceIn(systemInstances);
-            }
-            if (params.containsKey(POR_TYPE)) {
-                String[] types = extractCommaSeperatedFields(params.get(POR_TYPE));
-                taskQuery.primaryObjectReferenceTypeIn(types);
-            }
-            if (params.containsKey(POR_VALUE)) {
-                String[] values = extractCommaSeperatedFields(params.get(POR_VALUE));
-                taskQuery.primaryObjectReferenceValueIn(values);
-            }
+        if (params.containsKey(POR_COMPANY)) {
+            String[] companies = extractCommaSeperatedFields(params.get(POR_COMPANY));
+            taskQuery.primaryObjectReferenceCompanyIn(companies);
+        }
+        if (params.containsKey(POR_SYSTEM)) {
+            String[] systems = extractCommaSeperatedFields(params.get(POR_SYSTEM));
+            taskQuery.primaryObjectReferenceSystemIn(systems);
+        }
+        if (params.containsKey(POR_SYSTEM_INSTANCE)) {
+            String[] systemInstances = extractCommaSeperatedFields(params.get(POR_SYSTEM_INSTANCE));
+            taskQuery.primaryObjectReferenceSystemInstanceIn(systemInstances);
+        }
+        if (params.containsKey(POR_TYPE)) {
+            String[] types = extractCommaSeperatedFields(params.get(POR_TYPE));
+            taskQuery.primaryObjectReferenceTypeIn(types);
+        }
+        if (params.containsKey(POR_VALUE)) {
+            String[] values = extractCommaSeperatedFields(params.get(POR_VALUE));
+            taskQuery.primaryObjectReferenceValueIn(values);
         }
         return taskQuery;
     }
@@ -282,9 +278,9 @@ public class TaskController extends AbstractPagingController {
     }
 
     private String[] extractCommaSeperatedFields(List<String> list) {
-        List<String> values = new ArrayList<>();
-        list.forEach(item -> values.addAll(Arrays.asList(item.split(","))));
-        return values.toArray(new String[0]);
+        return list.stream()
+            .map(item -> item.split(","))
+            .toArray(String[]::new);
     }
 
     private TaskState[] extractStates(MultiValueMap<String, String> params) throws InvalidArgumentException {
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java
index 5d3adbe31..ec6f9ab3b 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java
@@ -8,7 +8,7 @@ import pro.taskana.rest.ClassificationController;
 import pro.taskana.rest.resource.ClassificationSummaryResource;
 
 /**
- * @author HH
+ * Resource assembler for {@link ClassificationSummaryResource}.
  */
 public class ClassificationSummaryResourceAssembler
     extends ResourceAssemblerSupport<ClassificationSummary, ClassificationSummaryResource> {
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java
index 8c181d764..ed8444d63 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java
@@ -8,7 +8,7 @@ import pro.taskana.rest.TaskController;
 import pro.taskana.rest.resource.TaskResource;
 
 /**
- * @author HH
+ * Resource assembler for {@link TaskResource}.
  */
 public class TaskResourceAssembler
     extends ResourceAssemblerSupport<Task, TaskResource> {
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java
index 664ec01ee..8a7134d10 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java
@@ -8,7 +8,7 @@ import pro.taskana.rest.TaskController;
 import pro.taskana.rest.resource.TaskSummaryResource;
 
 /**
- * @author HH
+ * Resource assembler for {@link TaskSummaryResource}.
  */
 public class TaskSummaryResourceAssembler
     extends ResourceAssemblerSupport<TaskSummary, TaskSummaryResource> {
diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java
index 65d73137d..96249fcbc 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java
@@ -13,7 +13,7 @@ import pro.taskana.rest.TaskController;
 import pro.taskana.rest.resource.TaskSummaryResource;
 
 /**
- * @author HH
+ * Resources assembler for {@link TaskSummaryResource}.
  */
 public class TaskSummaryResourcesAssembler extends AbstractRessourcesAssembler {