v3.0.2 pom

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-api</artifactId>
-	<version>3.0.1</version>
+	<version>3.0.2</version>
 
 	<name>Alfresco Process Services ReST API for Java</name>
 	<description>An APS API library for building REST API clients that support both the CXF and Jersey frameworks</description>

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);
 
 }

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 <https://www.gnu.org/licenses/>.
+ */
+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);
+    }
+
+}

src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java

@@ -17,29 +17,31 @@ 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> T getApi(Class<T> 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);
 	}
@@ -56,6 +58,10 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		return this.getApi(ModelsApi.class);
 	}
     
+    default ProcessDefinitionsApi getProcessDefinitionsApi() {
+        return this.getApi(ProcessDefinitionsApi.class);
+    }
+	
 	default ProcessInstancesApi getProcessInstancesApi() {
 		return this.getApi(ProcessInstancesApi.class);
 	}
@@ -68,16 +74,4 @@ public interface ApsPublicRestApi extends ActivitiPublicRestApi {
 		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);
-    }
-
 }

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);