BPMSPL-193 - Expose the jBPM Executor as a Public API

kiegroup · Jul 17, 2015 · 25c23dc · 25c23dc
1 parent 908c313
commit 25c23dc
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 26 deletions.
diff --git a/jbpm-console-ng-executor-service/jbpm-console-ng-executor-service-backend/pom.xml b/jbpm-console-ng-executor-service/jbpm-console-ng-executor-service-backend/pom.xml
@@ -35,6 +35,11 @@
       <artifactId>jbpm-console-ng-executor-service-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.kie</groupId>
+      <artifactId>kie-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.kie</groupId>
       <artifactId>kie-internal</artifactId>

diff --git a/...nd/src/main/java/org/jbpm/console/ng/es/backend/server/ExecutorServiceEntryPointImpl.java b/...nd/src/main/java/org/jbpm/console/ng/es/backend/server/ExecutorServiceEntryPointImpl.java
@@ -36,10 +36,13 @@
 import org.jbpm.console.ng.ga.model.QueryFilter;
 import org.jbpm.console.ng.ga.service.GenericServiceEntryPoint;
 import org.jbpm.executor.RequeueAware;
-import org.kie.internal.executor.api.CommandContext;
-import org.kie.internal.executor.api.ExecutorService;
-import org.kie.internal.executor.api.RequestInfo;
-import org.kie.internal.executor.api.STATUS;
+import org.kie.api.executor.CommandContext;
+import org.kie.api.executor.ErrorInfo;
+import org.kie.api.executor.ExecutionResults;
+import org.kie.api.executor.ExecutorService;
+import org.kie.api.executor.RequestInfo;
+import org.kie.api.executor.STATUS;
+import org.kie.api.runtime.query.QueryContext;
 import org.uberfire.paging.PageResponse;
 
 @Service
@@ -51,38 +54,38 @@ public class ExecutorServiceEntryPointImpl implements ExecutorServiceEntryPoint
 
     @Override
     public List<RequestSummary> getQueuedRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getQueuedRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getQueuedRequests(new QueryContext(0, 100)));
     }
 
     @Override
     public List<RequestSummary> getCompletedRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getCompletedRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getCompletedRequests(new QueryContext(0, 100)));
     }
 
     @Override
     public List<RequestSummary> getInErrorRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getInErrorRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getInErrorRequests(new QueryContext(0, 100)));
     }
 
     @Override
     public List<RequestSummary> getCancelledRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getCancelledRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getCancelledRequests(new QueryContext(0, 100)));
     }
 
     @Override
     public List<ErrorSummary> getAllErrors() {
-        return RequestSummaryHelper.adaptErrorList(executor.getAllErrors());
+        return RequestSummaryHelper.adaptErrorList(executor.getAllErrors(new QueryContext(0, 100)));
     }
 
     @Override
     public List<RequestSummary> getAllRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getAllRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getAllRequests(new QueryContext(0, 100)));
     }
 
     @Override
     public List<RequestSummary> getRequestsByStatus(List<String> statuses) {
         List<STATUS> statusList = RequestSummaryHelper.adaptStatusList(statuses);
-        return RequestSummaryHelper.adaptRequestList(executor.getRequestsByStatus(statusList));
+        return RequestSummaryHelper.adaptRequestList(executor.getRequestsByStatus(statusList, new QueryContext(0, 100)));
     }
 
     @Override
@@ -198,7 +201,7 @@ public void setThreadPoolSize(int nroOfThreads) {
 
     @Override
     public List<RequestSummary> getPendingRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getPendingRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getPendingRequests(new QueryContext(0, 100)));
     }
 
     @Override
@@ -208,12 +211,12 @@ public List<RequestSummary> getPendingRequestById(Long id) {
 
     @Override
     public List<RequestSummary> getRunningRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getRunningRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getRunningRequests(new org.kie.api.runtime.query.QueryContext(0, 100)));
     }
 
     @Override
     public List<RequestSummary> getFutureQueuedRequests() {
-        return RequestSummaryHelper.adaptRequestList(executor.getFutureQueuedRequests());
+        return RequestSummaryHelper.adaptRequestList(executor.getFutureQueuedRequests(new org.kie.api.runtime.query.QueryContext(0, 100)));
     }
 
     @Override
@@ -245,12 +248,15 @@ private List<RequestSummary> getRequests(QueryFilter filter) {
         if (filter.getParams() != null) {
             states = (List<String>) filter.getParams().get("states");
         }
+        QueryContext qf = new QueryContext(filter.getOffset(), filter.getCount() + 1,
+                filter.getOrderBy(), filter.isAscending());
+
         Collection<RequestInfo> requestInfoList = null;
         if (states == null || states.isEmpty()) {
-            requestInfoList = executor.getAllRequests();
+            requestInfoList = executor.getAllRequests(qf);
         }else{
             List<STATUS> statusList = RequestSummaryHelper.adaptStatusList(states);
-            requestInfoList =executor.getRequestsByStatus(statusList);
+            requestInfoList =executor.getRequestsByStatus(statusList, qf);
         }
         List<RequestSummary> requestSummarys = new ArrayList<RequestSummary>(requestInfoList.size());
         for(RequestInfo requestInfo:requestInfoList){

diff --git a/...ice-backend/src/main/java/org/jbpm/console/ng/es/backend/server/RequestSummaryHelper.java b/...ice-backend/src/main/java/org/jbpm/console/ng/es/backend/server/RequestSummaryHelper.java
@@ -25,10 +25,10 @@
 import org.jbpm.console.ng.es.model.ErrorSummary;
 import org.jbpm.console.ng.es.model.RequestParameterSummary;
 import org.jbpm.console.ng.es.model.RequestSummary;
-import org.kie.internal.executor.api.CommandContext;
-import org.kie.internal.executor.api.ErrorInfo;
-import org.kie.internal.executor.api.RequestInfo;
-import org.kie.internal.executor.api.STATUS;
+import org.kie.api.executor.CommandContext;
+import org.kie.api.executor.ErrorInfo;
+import org.kie.api.executor.RequestInfo;
+import org.kie.api.executor.STATUS;
 
 public class RequestSummaryHelper {
 

diff --git a/...src/main/java/org/jbpm/console/ng/es/client/editors/requestlist/RequestListPresenter.java b/...src/main/java/org/jbpm/console/ng/es/client/editors/requestlist/RequestListPresenter.java
@@ -130,8 +130,8 @@ public void getData(Range visibleRange) {
         // If we are refreshing after a search action, we need to go back to offset 0
         if (currentFilter.getParams() == null || currentFilter.getParams().isEmpty()
                 || currentFilter.getParams().get("textSearch") == null || currentFilter.getParams().get("textSearch").equals("")) {
-            currentFilter.setOffset(visibleRange.getStart());
-            currentFilter.setCount(visibleRange.getLength());
+            currentFilter.setOffset(view.getListGrid().getPageStart());
+            currentFilter.setCount(view.getListGrid().getPageSize());
         } else {
             currentFilter.setOffset(0);
             currentFilter.setCount(view.getListGrid().getPageSize());

diff --git a/.../src/main/java/org/jbpm/console/ng/es/client/editors/requestlist/RequestListViewImpl.java b/.../src/main/java/org/jbpm/console/ng/es/client/editors/requestlist/RequestListViewImpl.java
@@ -280,7 +280,7 @@ public Number getValue( RequestSummary object ) {
         };
         taskIdColumn.setSortable( true );
         extendedPagedTable.addColumn(taskIdColumn, constants.Id());
-        taskIdColumn.setDataStoreName( "Id" );
+        taskIdColumn.setDataStoreName( "r.id" );
     }
 
     private void initJobTypeColumn(ExtendedPagedTable extendedPagedTable){
@@ -293,7 +293,7 @@ public String getValue( RequestSummary object ) {
         };
         jobTypeColumn.setSortable( true );
         extendedPagedTable.addColumn(jobTypeColumn, constants.Type());
-        jobTypeColumn.setDataStoreName( "CommandName" );
+        jobTypeColumn.setDataStoreName( "r.commandName" );
     }
 
     private void initStatusColumn(ExtendedPagedTable extendedPagedTable){
@@ -306,7 +306,7 @@ public String getValue( RequestSummary object ) {
         };
         statusColumn.setSortable( true );
         extendedPagedTable.addColumn(statusColumn, constants.Status());
-        statusColumn.setDataStoreName( "Status" );
+        statusColumn.setDataStoreName( "r.status" );
     }
 
     private void initDueDateColumn(ExtendedPagedTable extendedPagedTable){
@@ -319,7 +319,7 @@ public String getValue( RequestSummary object ) {
         };
         taskNameColumn.setSortable( true );
         extendedPagedTable.addColumn(taskNameColumn, constants.Due_On());
-        taskNameColumn.setDataStoreName( "Time" );
+        taskNameColumn.setDataStoreName( "r.time" );
     }
 
     private Column<RequestSummary, RequestSummary> initActionsColumn(){