diff --git a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java
index 3857c58..956a245 100644
--- a/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java
+++ b/src/main/java/com/inteligr8/activiti/api/BaseJobsApi.java
@@ -31,6 +31,7 @@ import com.inteligr8.activiti.model.ProcessInstanceAction;
import com.inteligr8.activiti.model.ProcessInstanceAction.ActionValue;
import com.inteligr8.activiti.model.Job;
import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.activiti.model.SortOrder;
public interface BaseJobsApi {
@@ -80,7 +81,10 @@ public interface BaseJobsApi {
@QueryParam("dueBefore") LocalDate dueBefore,
@QueryParam("dueAfter") LocalDate dueAfter,
@QueryParam("withoutTenantId") Boolean withoutTenatId,
- @QueryParam("sort") String sort);
+ @QueryParam("sort") String sort,
+ @QueryParam("order") SortOrder sortOrder,
+ @QueryParam("start") Integer pageStart,
+ @QueryParam("size") Integer pageSize);
@GET
@Produces({ MediaType.APPLICATION_JSON })
@@ -94,7 +98,10 @@ public interface BaseJobsApi {
@QueryParam("dueAfter") LocalDate dueAfter,
@QueryParam("tenantId") String tenantId,
@QueryParam("tenantIdLike") String tenantIdLike,
- @QueryParam("sort") String sort);
+ @QueryParam("sort") String sort,
+ @QueryParam("order") SortOrder sortOrder,
+ @QueryParam("start") Integer pageStart,
+ @QueryParam("size") Integer pageSize);
@GET
@Produces({ MediaType.APPLICATION_JSON })
@@ -109,7 +116,10 @@ public interface BaseJobsApi {
@QueryParam("dueAfter") LocalDate dueAfter,
@QueryParam("exceptionMessage") String exceptionMessage,
@QueryParam("withoutTenantId") Boolean withoutTenatId,
- @QueryParam("sort") String sort);
+ @QueryParam("sort") String sort,
+ @QueryParam("order") SortOrder sortOrder,
+ @QueryParam("start") Integer pageStart,
+ @QueryParam("size") Integer pageSize);
@GET
@Produces({ MediaType.APPLICATION_JSON })
@@ -125,7 +135,10 @@ public interface BaseJobsApi {
@QueryParam("exceptionMessage") String exceptionMessage,
@QueryParam("tenantId") String tenantId,
@QueryParam("tenantIdLike") String tenantIdLike,
- @QueryParam("sort") String sort);
+ @QueryParam("sort") String sort,
+ @QueryParam("order") SortOrder sortOrder,
+ @QueryParam("start") Integer pageStart,
+ @QueryParam("size") Integer pageSize);
@GET
@Produces({ MediaType.APPLICATION_JSON })
@@ -141,7 +154,10 @@ public interface BaseJobsApi {
@QueryParam("dueAfter") LocalDate dueAfter,
@QueryParam("exceptionMessage") String exceptionMessage,
@QueryParam("withoutTenantId") Boolean withoutTenatId,
- @QueryParam("sort") String sort);
+ @QueryParam("sort") String sort,
+ @QueryParam("order") SortOrder sortOrder,
+ @QueryParam("start") Integer pageStart,
+ @QueryParam("size") Integer pageSize);
@GET
@Produces({ MediaType.APPLICATION_JSON })
@@ -158,6 +174,9 @@ public interface BaseJobsApi {
@QueryParam("exceptionMessage") String exceptionMessage,
@QueryParam("tenantId") String tenantId,
@QueryParam("tenantIdLike") String tenantIdLike,
- @QueryParam("sort") String sort);
+ @QueryParam("sort") String sort,
+ @QueryParam("order") SortOrder sortOrder,
+ @QueryParam("start") Integer pageStart,
+ @QueryParam("size") Integer pageSize);
}
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestApi.java
new file mode 100644
index 0000000..8dda998
--- /dev/null
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsProtectedRestApi.java
@@ -0,0 +1,36 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see .
+ */
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.alfresco.activiti.api.ShareApi;
+import com.inteligr8.alfresco.activiti.api.TemplatesApi;
+
+/**
+ * This interface consolidates the JAX-RS APIs available in the Activiti & APS
+ * public ReST APIs, plus some useful non-public APIs available in APS.
+ *
+ * @author brian@inteligr8.com
+ */
+public interface ApsProtectedRestApi extends ApsPublicRestApi {
+
+ default ShareApi getShareApi() {
+ return this.getApi(ShareApi.class);
+ }
+
+ default TemplatesApi getTemplatesApi() {
+ return this.getApi(TemplatesApi.class);
+ }
+
+}
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
index 79971a5..c68fc41 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
@@ -17,28 +17,30 @@ package com.inteligr8.alfresco.activiti;
import com.inteligr8.activiti.ActivitiPublicRestApi;
import com.inteligr8.alfresco.activiti.api.AdminApi;
import com.inteligr8.alfresco.activiti.api.AppDefinitionsApi;
+import com.inteligr8.alfresco.activiti.api.AppDeploymentsApi;
import com.inteligr8.alfresco.activiti.api.AppVersionApi;
import com.inteligr8.alfresco.activiti.api.HistoricApi;
import com.inteligr8.alfresco.activiti.api.ModelsApi;
+import com.inteligr8.alfresco.activiti.api.ProcessDefinitionsApi;
import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi;
import com.inteligr8.alfresco.activiti.api.ProfileApi;
-import com.inteligr8.alfresco.activiti.api.ShareApi;
import com.inteligr8.alfresco.activiti.api.TasksApi;
-import com.inteligr8.alfresco.activiti.api.TemplatesApi;
/**
- * This interface consolidates the JAX-RS APIs available in the APS Public
- * ReST API.
+ * This interface consolidates the JAX-RS APIs available in the Activiti & APS
+ * public ReST APIs.
*
* @author brian@inteligr8.com
*/
public interface ApsPublicRestApi extends ActivitiPublicRestApi {
- T getApi(Class apiClass);
-
default AdminApi getAdminApi() {
return this.getApi(AdminApi.class);
}
+
+ default AppDeploymentsApi getAppDeploymentsApi() {
+ return this.getApi(AppDeploymentsApi.class);
+ }
default AppDefinitionsApi getAppDefinitionsApi() {
return this.getApi(AppDefinitionsApi.class);
@@ -55,6 +57,10 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
default ModelsApi getModelsApi() {
return this.getApi(ModelsApi.class);
}
+
+ default ProcessDefinitionsApi getProcessDefinitionsApi() {
+ return this.getApi(ProcessDefinitionsApi.class);
+ }
default ProcessInstancesApi getProcessInstancesApi() {
return this.getApi(ProcessInstancesApi.class);
@@ -67,17 +73,5 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
default TasksApi getTasksApi() {
return this.getApi(TasksApi.class);
}
-
-
- /**
- * The following are not part of the official open source or enterprise APIs
- */
- default ShareApi getShareApi() {
- return this.getApi(ShareApi.class);
- }
-
- default TemplatesApi getTemplatesApi() {
- return this.getApi(TemplatesApi.class);
- }
}
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java
index a6a1b06..f5f616f 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDeploymentsApi.java
@@ -30,7 +30,7 @@ public interface AppDeploymentsApi {
@GET
@Path("runtime-app-deployment")
- @Produces({ "application/json" })
+ @Produces({ MediaType.APPLICATION_JSON })
AppDeployment get(
@QueryParam("deploymentId") String deploymentId);