BZ-1074322 - REST /task/query parameter pageSize=10 returns all the t…

…asks (cherry picked from commit f440fb8)
kiegroup · Mar 20, 2014 · b5ac771 · b5ac771
1 parent 8de5aa5
commit b5ac771
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/kie-remote/kie-services-remote/src/main/java/org/kie/services/remote/rest/ResourceBase.java b/kie-remote/kie-services-remote/src/main/java/org/kie/services/remote/rest/ResourceBase.java
@@ -437,7 +437,7 @@ protected static <T> List<T> paginate(int[] pageInfo, List<T> results) {
     protected static int getMaxNumResultsNeeded(int [] pageInfo) { 
         int numResults = pageInfo[PAGE_NUM]*pageInfo[PAGE_SIZE];
         if( pageInfo[PAGE_NUM] == 0 ) { 
-            numResults = Integer.MAX_VALUE;
+            numResults = 1000;
         } 
         return numResults;
     }

diff --git a/kie-remote/kie-services-remote/src/main/java/org/kie/services/remote/rest/TaskResource.java b/kie-remote/kie-services-remote/src/main/java/org/kie/services/remote/rest/TaskResource.java
@@ -23,12 +23,10 @@
 import org.jbpm.services.task.impl.model.command.DeleteBAMTaskSummariesCommand;
 import org.jbpm.services.task.impl.model.xml.JaxbContent;
 import org.jbpm.services.task.impl.model.xml.JaxbTask;
-import org.jbpm.services.task.query.TaskSummaryImpl;
 import org.kie.api.task.model.OrganizationalEntity;
 import org.kie.api.task.model.Status;
 import org.kie.api.task.model.Task;
 import org.kie.api.task.model.TaskSummary;
-import org.kie.services.client.serialization.JaxbSerializationProvider;
 import org.kie.services.client.serialization.jaxb.impl.JaxbCommandsRequest;
 import org.kie.services.client.serialization.jaxb.impl.JaxbCommandsResponse;
 import org.kie.services.client.serialization.jaxb.impl.task.JaxbTaskSummaryListResponse;
@@ -145,15 +143,17 @@ public Response query(@Context UriInfo uriInfo) {
         List<String> statusStrList = getStringListParam(allowedQueryParams[4], false, params, "query");
         List<Status> statuses = convertStringListToStatusList(statusStrList);
 
+        int [] pageInfo = getPageNumAndPageSize(params, oper);
+        int maxResults = getMaxNumResultsNeeded(pageInfo);
         TaskCommand<?> queryCmd 
             = new GetTasksByVariousFieldsCommand(workItemIds, taskIds, procInstIds, 
                     busAdmins, potOwners, taskOwners, 
-                    statuses, language, union);
+                    statuses, language, union, maxResults);
 
         List<TaskSummary> results = (List<TaskSummary>) doRestTaskOperation(null, queryCmd);
-
+        
         logger.debug("{} results found.", results.size());
-        results = paginate(getPageNumAndPageSize(params, oper), results);
+        results = paginate(pageInfo, results);
         logger.debug("Returning {} results after pagination.", results.size());
 
         JaxbTaskSummaryListResponse responseObj = new JaxbTaskSummaryListResponse(results);