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

TSK-406: optimizations from review.

This commit is contained in:
Holger Hagen 2018-03-28 16:36:02 +02:00 committed by Mustapha Zorgati
parent c1809373a4
commit db8de1063e
5 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskController.java
View File

@ -1,7 +1,6 @@
package pro.taskana.rest; package pro.taskana.rest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -203,28 +202,25 @@ public class TaskController extends AbstractPagingController {
String[] owners = extractCommaSeperatedFields(params.get(OWNER)); String[] owners = extractCommaSeperatedFields(params.get(OWNER));
taskQuery.ownerIn(owners); taskQuery.ownerIn(owners);
} }
// objectReference filter if (params.containsKey(POR_COMPANY)) {
if (params.keySet().stream().filter(s -> s.startsWith(POR_PREFIX)).toArray().length > 0) { String[] companies = extractCommaSeperatedFields(params.get(POR_COMPANY));
if (params.containsKey(POR_COMPANY)) { taskQuery.primaryObjectReferenceCompanyIn(companies);
String[] companies = extractCommaSeperatedFields(params.get(POR_COMPANY)); }
taskQuery.primaryObjectReferenceCompanyIn(companies); if (params.containsKey(POR_SYSTEM)) {
} String[] systems = extractCommaSeperatedFields(params.get(POR_SYSTEM));
if (params.containsKey(POR_SYSTEM)) { taskQuery.primaryObjectReferenceSystemIn(systems);
String[] systems = extractCommaSeperatedFields(params.get(POR_SYSTEM)); }
taskQuery.primaryObjectReferenceSystemIn(systems); if (params.containsKey(POR_SYSTEM_INSTANCE)) {
} String[] systemInstances = extractCommaSeperatedFields(params.get(POR_SYSTEM_INSTANCE));
if (params.containsKey(POR_SYSTEM_INSTANCE)) { taskQuery.primaryObjectReferenceSystemInstanceIn(systemInstances);
String[] systemInstances = extractCommaSeperatedFields(params.get(POR_SYSTEM_INSTANCE)); }
taskQuery.primaryObjectReferenceSystemInstanceIn(systemInstances); if (params.containsKey(POR_TYPE)) {
} String[] types = extractCommaSeperatedFields(params.get(POR_TYPE));
if (params.containsKey(POR_TYPE)) { taskQuery.primaryObjectReferenceTypeIn(types);
String[] types = extractCommaSeperatedFields(params.get(POR_TYPE)); }
taskQuery.primaryObjectReferenceTypeIn(types); if (params.containsKey(POR_VALUE)) {
} String[] values = extractCommaSeperatedFields(params.get(POR_VALUE));
if (params.containsKey(POR_VALUE)) { taskQuery.primaryObjectReferenceValueIn(values);
String[] values = extractCommaSeperatedFields(params.get(POR_VALUE));
taskQuery.primaryObjectReferenceValueIn(values);
}
} }
return taskQuery; return taskQuery;
} }
@ -282,9 +278,9 @@ public class TaskController extends AbstractPagingController {
} }
private String[] extractCommaSeperatedFields(List<String> list) { private String[] extractCommaSeperatedFields(List<String> list) {
List<String> values = new ArrayList<>(); return list.stream()
list.forEach(item -> values.addAll(Arrays.asList(item.split(",")))); .map(item -> item.split(","))
return values.toArray(new String[0]); .toArray(String[]::new);
} }
private TaskState[] extractStates(MultiValueMap<String, String> params) throws InvalidArgumentException { private TaskState[] extractStates(MultiValueMap<String, String> params) throws InvalidArgumentException {

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/ClassificationSummaryResourceAssembler.java
View File

@ -8,7 +8,7 @@ import pro.taskana.rest.ClassificationController;
import pro.taskana.rest.resource.ClassificationSummaryResource; import pro.taskana.rest.resource.ClassificationSummaryResource;
/** /**
* @author HH * Resource assembler for {@link ClassificationSummaryResource}.
*/ */
public class ClassificationSummaryResourceAssembler public class ClassificationSummaryResourceAssembler
extends ResourceAssemblerSupport<ClassificationSummary, ClassificationSummaryResource> { extends ResourceAssemblerSupport<ClassificationSummary, ClassificationSummaryResource> {

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskResourceAssembler.java
View File

@ -8,7 +8,7 @@ import pro.taskana.rest.TaskController;
import pro.taskana.rest.resource.TaskResource; import pro.taskana.rest.resource.TaskResource;
/** /**
* @author HH * Resource assembler for {@link TaskResource}.
*/ */
public class TaskResourceAssembler public class TaskResourceAssembler
extends ResourceAssemblerSupport<Task, TaskResource> { extends ResourceAssemblerSupport<Task, TaskResource> {

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourceAssembler.java
View File

@ -8,7 +8,7 @@ import pro.taskana.rest.TaskController;
import pro.taskana.rest.resource.TaskSummaryResource; import pro.taskana.rest.resource.TaskSummaryResource;
/** /**
* @author HH * Resource assembler for {@link TaskSummaryResource}.
*/ */
public class TaskSummaryResourceAssembler public class TaskSummaryResourceAssembler
extends ResourceAssemblerSupport<TaskSummary, TaskSummaryResource> { extends ResourceAssemblerSupport<TaskSummary, TaskSummaryResource> {

2
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/resource/mapper/TaskSummaryResourcesAssembler.java
View File

@ -13,7 +13,7 @@ import pro.taskana.rest.TaskController;
import pro.taskana.rest.resource.TaskSummaryResource; import pro.taskana.rest.resource.TaskSummaryResource;
/** /**
* @author HH * Resources assembler for {@link TaskSummaryResource}.
*/ */
public class TaskSummaryResourcesAssembler extends AbstractRessourcesAssembler { public class TaskSummaryResourcesAssembler extends AbstractRessourcesAssembler {