Merge branch 'develop' into develop-aps1

fixed request objects to allow nulls
fixed missing @Path(query) for PIs and HPIs
2023-01-19 17:00:50 -05:00 · 2023-01-19 21:56:29 +00:00 · 2023-01-10 17:04:49 -05:00 · 2022-12-02 12:19:14 -05:00 · 2022-12-02 12:15:53 -05:00 · 2022-10-03 10:20:08 -04:00
45 changed files with 1576 additions and 835 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -2,135 +2,74 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-api</artifactId>
-	<version>1.2-SNAPSHOT</version>
-	<name>Alfresco Process Services ReST API Client for Java</name>
+	<version>2.0-SNAPSHOT-aps1</version>
+
+	<name>Alfresco Process Services ReST API for Java</name>
+	<description>An APS API library for APS v1.x REST API clients</description>
+	<url>https://bitbucket.org/inteligr8/aps-public-rest-api</url>
+
+	<licenses>
+		<license>
+			<name>GNU GENERAL PUBLIC LICENSE, Version 3, 29 June 2007</name>
+			<url>https://www.gnu.org/licenses/lgpl-3.0.txt</url>
+		</license>
+	</licenses>
+
+	<scm>
+		<connection>scm:git:https://bitbucket.org/inteligr8/aps-public-rest-api.git</connection>
+		<developerConnection>scm:git:git@bitbucket.org:inteligr8/aps-public-rest-api.git</developerConnection>
+		<url>https://bitbucket.org/inteligr8/aps-public-rest-api</url>
+	</scm>
+	<organization>
+		<name>Inteligr8</name>
+		<url>https://www.inteligr8.com</url>
+	</organization>
+	<developers>
+		<developer>
+			<id>brian.long</id>
+			<name>Brian Long</name>
+			<email>brian@inteligr8.com</email>
+			<url>https://twitter.com/brianmlong</url>
+		</developer>
+	</developers>

 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
 		<maven.compiler.source>8</maven.compiler.source>
 		<maven.compiler.target>8</maven.compiler.target>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
-
-		<!-- If you want to build for your specific version, point to your own 
-			installation -->
-		<aps.baseUrl>http://localhost:8080</aps.baseUrl>
-		<aps.app.tag>aps1</aps.app.tag>
-
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.2.14.RELEASE</spring.version>
-		<jersey.version>2.34</jersey.version>
-		<cxf.version>3.3.2</cxf.version>
+		
+		<jersey.version>2.35</jersey.version>
+		<cxf.version>3.4.7</cxf.version>
 	</properties>

 	<dependencies>
 		<dependency>
-			<groupId>com.inteligr8</groupId>
-			<artifactId>common-rest-api</artifactId>
-			<version>1.1-SNAPSHOT</version>
+			<groupId>jakarta.ws.rs</groupId>
+			<artifactId>jakarta.ws.rs-api</artifactId>
+			<version>2.1.6</version>
 		</dependency>
 		<dependency>
-			<groupId>org.glassfish.jersey.ext</groupId>
-			<artifactId>jersey-proxy-client</artifactId>
-			<version>${jersey.version}</version>
-			<scope>provided</scope>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>
+			<version>2.12.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-rs-client</artifactId>
+			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
 			<version>${cxf.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.core</groupId>
-			<artifactId>jersey-client</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-multipart</artifactId>
 			<version>${jersey.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.inject</groupId>
-			<artifactId>jersey-hk2</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jersey.media</groupId>
-			<artifactId>jersey-media-json-jackson</artifactId>
-			<version>${jersey.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.9</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<classifier>${aps.app.tag}</classifier>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.0.0-M5</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>javadoc</id>
-						<phase>package</phase>
-						<goals><goal>jar</goal></goals>
-						<configuration>
-							<show>public</show>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>

 	<profiles>
 		<!-- Implement when descriptor is available -->
@@ -262,6 +201,68 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>ossrh-release</id>
+			<properties>
+				<maven.deploy.skip>true</maven.deploy.skip>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-source-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>source</id>
+								<phase>package</phase>
+								<goals><goal>jar-no-fork</goal></goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.3.2</version>
+						<executions>
+							<execution>
+								<id>javadoc</id>
+								<phase>package</phase>
+								<goals><goal>jar</goal></goals>
+								<configuration>
+									<show>public</show>
+									<additionalJOption>-Xdoclint:none</additionalJOption>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<phase>verify</phase>
+								<goals><goal>sign</goal></goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
+						<configuration>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+						<executions>
+							<execution>
+								<id>ossrh-deploy</id>
+								<phase>deploy</phase>
+								<goals><goal>deploy</goal></goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 	
 	<pluginRepositories>
@@ -269,20 +270,5 @@
 			<id>mulesoft-releases</id>
 			<url>https://repository.mulesoft.org/releases</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>inteligr8-public</id>
-			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-		</pluginRepository>
 	</pluginRepositories>
-	
-	<distributionManagement>
-		<repository>
-			<id>inteligr8-releases</id>
-			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
-		</repository>
-		<snapshotRepository>
-			<id>inteligr8-snapshots</id>
-			<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
 </project>
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java
@@ -1,165 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-import com.inteligr8.rs.ClientCxfConfiguration;
-import com.inteligr8.rs.ClientJerseyConfiguration;
-
-/**
- * This class provides a POJO &amp; Spring-based implementation of the
- * ClientConfiguration interface.  You can use it outside of the Spring
- * context, but you will need the spring-context and spring-beans libraries in
- * your non-Spring application.
- * 
- * @author brian@inteligr8.com
- */
-@Configuration
-@ComponentScan
-public class ApsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration {
-
-	@Value("${process.service.baseUrl:http://localhost:8080/activiti-app}")
-	private String baseUrl;
-
-	@Value("${process.service.security.basicAuth.username:admin@app.activiti.com}")
-	private String basicAuthUsername;
-
-	@Value("${process.service.security.basicAuth.password:admin}")
-	private String basicAuthPassword;
-
-	@Value("${process.service.security.bearerToken:#{null}}")
-	private String bearerToken;
-
-	@Value("${process.service.security.oauth.tokenUrl:#{null}}")
-	private String oAuthTokenUrl;
-
-	@Value("${process.service.security.oauth.clientId:#{null}}")
-	private String oAuthClientId;
-
-	@Value("${process.service.security.oauth.clientSecret:#{null}}")
-	private String oAuthClientSecret;
-
-	@Value("${process.service.security.oauth.authCode:#{null}}")
-	private String oAuthAuthCode;
-
-	@Value("${process.service.security.oauth.authRedirectUri:#{null}}")
-	private String oAuthAuthRedirectUri;
-
-	@Value("${process.service.security.oauth.grantUsername:#{null}}")
-	private String oAuthUsername;
-
-	@Value("${process.service.security.oauth.grantPassword:#{null}}")
-	private String oAuthPassword;
-
-	@Value("${process.service.cxf.defaultBusEnabled:true}")
-	private boolean defaultBusEnabled;
-	
-	@Value("${process.service.jersey.putBodyRequired:true}")
-	private boolean putBodyRequired;
-
-	public String getBaseUrl() {
-		return this.baseUrl;
-	}
-	
-	public void setBaseUrl(String baseUrl) {
-		this.baseUrl = baseUrl;
-	}
-	
-	public String getBasicAuthUsername() {
-		return this.basicAuthUsername;
-	}
-
-	public void setBasicAuthUsername(String basicAuthUsername) {
-		this.basicAuthUsername = basicAuthUsername;
-	}
-	
-	public String getBasicAuthPassword() {
-		return this.basicAuthPassword;
-	}
-
-	public void setBasicAuthPassword(String basicAuthPassword) {
-		this.basicAuthPassword = basicAuthPassword;
-	}
-	
-	public String getBearerToken() {
-		return this.bearerToken;
-	}
-
-	public void setBearerToken(String bearerToken) {
-		this.bearerToken = bearerToken;
-	}
-	
-	public String getOAuthTokenUrl() {
-		return this.oAuthTokenUrl;
-	}
-
-	public void setOAuthTokenUrl(String oAuthTokenUrl) {
-		this.oAuthTokenUrl = oAuthTokenUrl;
-	}
-	
-	public String getOAuthClientId() {
-		return this.oAuthClientId;
-	}
-
-	public void setOAuthClientId(String oAuthClientId) {
-		this.oAuthClientId = oAuthClientId;
-	}
-	
-	public String getOAuthClientSecret() {
-		return this.oAuthClientSecret;
-	}
-
-	public void setOAuthClientSecret(String oAuthClientSecret) {
-		this.oAuthClientSecret = oAuthClientSecret;
-	}
-	
-	public String getOAuthAuthCode() {
-		return this.oAuthAuthCode;
-	}
-
-	public void setOAuthAuthCode(String oAuthAuthCode) {
-		this.oAuthAuthCode = oAuthAuthCode;
-	}
-	
-	public String getOAuthAuthRedirectUri() {
-		return this.oAuthAuthRedirectUri;
-	}
-
-	public void setOAuthAuthRedirectUri(String oAuthAuthRedirectUri) {
-		this.oAuthAuthRedirectUri = oAuthAuthRedirectUri;
-	}
-	
-	public String getOAuthUsername() {
-		return this.oAuthUsername;
-	}
-
-	public void setOAuthUsername(String oAuthUsername) {
-		this.oAuthUsername = oAuthUsername;
-	}
-	
-	public String getOAuthPassword() {
-		return this.oAuthPassword;
-	}
-
-	public void setOAuthPassword(String oAuthPassword) {
-		this.oAuthPassword = oAuthPassword;
-	}
-	
-	public boolean isDefaultBusEnabled() {
-		return this.defaultBusEnabled;
-	}
-
-	public void setDefaultBusEnabled(boolean defaultBusEnabled) {
-		this.defaultBusEnabled = defaultBusEnabled;
-	}
-	
-	public boolean isPutBodyRequired() {
-		return this.putBodyRequired;
-	}
-
-	public void setPutBodyRequired(boolean putBodyRequired) {
-		this.putBodyRequired = putBodyRequired;
-	}
-
-}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java
@@ -1,43 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.inteligr8.rs.ClientCxfConfiguration;
-import com.inteligr8.rs.ClientCxfImpl;
-
-/**
- * This class provides a POJO &amp; Spring-based implementation of the Apache
- * CXF client.  You can use it outside of the Spring context, but you will need
- * the spring-context and spring-beans libraries in your non-Spring
- * application.
- * 
- * @author brian@inteligr8.com
- */
-@Component("aps.client.cxf")
-@Lazy
-public class ApsClientCxfImpl extends ClientCxfImpl {
-	
-	@Autowired
-	private ApsClientConfiguration config;
-	
-	/**
-	 * This constructor is for Spring use
-	 */
-	protected ApsClientCxfImpl() {
-	}
-	
-	/**
-	 * This constructor is for POJO use
-	 */
-	public ApsClientCxfImpl(ApsClientConfiguration config) {
-		this.config = config;
-	}
-	
-	@Override
-	protected ClientCxfConfiguration getConfig() {
-		return this.config;
-	}
-
-}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java
@@ -1,43 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.inteligr8.rs.ClientJerseyConfiguration;
-import com.inteligr8.rs.ClientJerseyImpl;
-
-/**
- * This class provides a POJO &amp; Spring-based implementation of the Apache
- * CXF client.  You can use it outside of the Spring context, but you will need
- * the spring-context and spring-beans libraries in your non-Spring
- * application.
- * 
- * @author brian@inteligr8.com
- */
-@Component("aps.client.jersey")
-@Lazy
-public class ApsClientJerseyImpl extends ClientJerseyImpl {
-	
-	@Autowired
-	private ApsClientConfiguration config;
-	
-	/**
-	 * This constructor is for Spring use
-	 */
-	protected ApsClientJerseyImpl() {
-	}
-	
-	/**
-	 * This constructor is for POJO use
-	 */
-	public ApsClientJerseyImpl(ApsClientConfiguration config) {
-		this.config = config;
-	}
-	
-	@Override
-	protected ClientJerseyConfiguration getConfig() {
-		return this.config;
-	}
-
-}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java
@@ -1,90 +1,77 @@
+/*
+ * 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.AdminApi;
 import com.inteligr8.alfresco.activiti.api.AppDefinitionsApi;
 import com.inteligr8.alfresco.activiti.api.AppVersionApi;
+import com.inteligr8.alfresco.activiti.api.HistoricProcessInstancesApi;
 import com.inteligr8.alfresco.activiti.api.ModelsApi;
 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.rs.AuthorizationFilter;
-import com.inteligr8.rs.Client;
-import com.inteligr8.rs.ClientConfiguration;

 /**
- * This class serves as the base implementation for the JAX-RS API for the APS
- * Public ReST API.
+ * This interface consolidates the JAX-RS APIs available in the APS Public
+ * ReST API.
 * 
 * @author brian@inteligr8.com
 */
-public abstract class ApsPublicRestApi {
+public interface ApsPublicRestApi {
 	
-	abstract ClientConfiguration getConfig();
+	<T> T getApi(Class<T> apiClass);
 	
-	abstract Client getClient();
-	
-	protected final <T> T getApi(Class<T> apiClass) {
-		return this.getApi(null, apiClass);
-	}
-
-	protected <T> T getApi(AuthorizationFilter authFilter, Class<T> apiClass) {
-		return this.getClient().getApi(authFilter, apiClass);
-	}
-	
-	public AdminApi getAdminApi() {
+	default AdminApi getAdminApi() {
 		return this.getApi(AdminApi.class);
 	}
 	
-	public AdminApi getAdminApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, AdminApi.class);
-	}
-	
-	public AppDefinitionsApi getAppDefinitionsApi() {
+	default AppDefinitionsApi getAppDefinitionsApi() {
 		return this.getApi(AppDefinitionsApi.class);
 	}
 	
-	public AppDefinitionsApi getAppDefinitionsApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, AppDefinitionsApi.class);
-	}
-	
-	public AppVersionApi getAppVersionApi() {
+	default AppVersionApi getAppVersionApi() {
 		return this.getApi(AppVersionApi.class);
 	}
+    
+    default HistoricProcessInstancesApi getHistoricProcessInstancesApi() {
+        return this.getApi(HistoricProcessInstancesApi.class);
+    }
 	
-	public AppVersionApi getAppVersionApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, AppVersionApi.class);
-	}
-	
-	public ModelsApi getModelsApi() {
+	default ModelsApi getModelsApi() {
 		return this.getApi(ModelsApi.class);
 	}
 	
-	public ModelsApi getModelsApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, ModelsApi.class);
-	}
-	
-	public ProcessInstancesApi getProcessInstancesApi() {
+	default ProcessInstancesApi getProcessInstancesApi() {
 		return this.getApi(ProcessInstancesApi.class);
 	}
 	
-	public ProcessInstancesApi getProcessInstancesApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, ProcessInstancesApi.class);
-	}
-	
-	public ProfileApi getProfileApi() {
+	default ProfileApi getProfileApi() {
 		return this.getApi(ProfileApi.class);
 	}
 	
-	public ProfileApi getProfileApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, ProfileApi.class);
-	}
-	
-	public TasksApi getTasksApi() {
+	default TasksApi getTasksApi() {
 		return this.getApi(TasksApi.class);
 	}
 	
-	public TasksApi getTasksApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, TasksApi.class);
+	
+	/**
+	 * The following are not part of the official open source or enterprise APIs
+	 */
+	default ShareApi getShareApi() {
+		return this.getApi(ShareApi.class);
 	}

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java
@@ -1,56 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi;
-import com.inteligr8.rs.AuthorizationFilter;
-import com.inteligr8.rs.Client;
-import com.inteligr8.rs.ClientConfiguration;
-
-/**
- * This class provides the Apache CXF client to the JAX-RS API for the APS
- * Public ReST API.
- * 
- * @author brian@inteligr8.com
- */
-@Component("aps.api.cxf")
-@Lazy
-public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi {
-	
-	@Autowired
-	private ApsClientCxfImpl client;
-	
-	/**
-	 * This constructor is for Spring use
-	 */
-	protected ApsPublicRestApiCxfImpl() {
-	}
-
-	/**
-	 * This constructor is for POJO use
-	 */
-	public ApsPublicRestApiCxfImpl(ApsClientCxfImpl client) {
-		this.client = client;
-	}
-	
-	@Override
-	ClientConfiguration getConfig() {
-		return this.client.getConfig();
-	}
-	
-	@Override
-	Client getClient() {
-		return this.client;
-	}
-	
-	public AppDefinitionsCxfApi getAppDefinitionsCxfApi() {
-		return this.getApi(AppDefinitionsCxfApi.class);
-	}
-	
-	public AppDefinitionsCxfApi getAppDefinitionsCxfApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, AppDefinitionsCxfApi.class);
-	}
-
-}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java
@@ -1,56 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Component;
-
-import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi;
-import com.inteligr8.rs.AuthorizationFilter;
-import com.inteligr8.rs.Client;
-import com.inteligr8.rs.ClientConfiguration;
-
-/**
- * This class provides the Jersey client to the JAX-RS API for the APS Public
- * ReST API.
- * 
- * @author brian@inteligr8.com
- */
-@Component("aps.api.jersey")
-@Lazy
-public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi {
-	
-	@Autowired
-	private ApsClientJerseyImpl client;
-	
-	/**
-	 * This constructor is for Spring use
-	 */
-	protected ApsPublicRestApiJerseyImpl() {
-	}
-
-	/**
-	 * This constructor is for POJO use
-	 */
-	public ApsPublicRestApiJerseyImpl(ApsClientJerseyImpl client) {
-		this.client = client;
-	}
-	
-	@Override
-	ClientConfiguration getConfig() {
-		return this.client.getConfig();
-	}
-	
-	@Override
-	Client getClient() {
-		return this.client;
-	}
-	
-	public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {
-		return this.getApi(AppDefinitionsJerseyApi.class);
-	}
-	
-	public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi(AuthorizationFilter authFilter) {
-		return this.getApi(authFilter, AppDefinitionsJerseyApi.class);
-	}
-
-}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestCxfApi.java
@@ -0,0 +1,18 @@
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.alfresco.activiti.api.AppDefinitionsCxfApi;
+
+/**
+ * This interface appends Apache CXF implementation specific methods to the
+ * JAX-RS API of the APS Public ReST API.  This is due to a lack of multi-part
+ * in the JAX-RS specification.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsPublicRestCxfApi extends ApsPublicRestApi {
+	
+	default AppDefinitionsCxfApi getAppDefinitionsCxfApi() {
+		return this.getApi(AppDefinitionsCxfApi.class);
+	}
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestJerseyApi.java
@@ -0,0 +1,18 @@
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.alfresco.activiti.api.AppDefinitionsJerseyApi;
+
+/**
+ * This interface appends Jersey implementation specific methods to the JAX-RS
+ * API of the APS Public ReST API.  This is due to a lack of multi-part in the
+ * JAX-RS specification.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ApsPublicRestJerseyApi extends ApsPublicRestApi {
+	
+	default AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {
+		return this.getApi(AppDefinitionsJerseyApi.class);
+	}
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java
@@ -1,30 +1,96 @@
-
+/*
+ * 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.api;

 import java.util.List;

+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;

 import com.inteligr8.alfresco.activiti.model.Group;
+import com.inteligr8.alfresco.activiti.model.GroupLight;
+import com.inteligr8.alfresco.activiti.model.ResultList;
 import com.inteligr8.alfresco.activiti.model.Tenant;
+import com.inteligr8.alfresco.activiti.model.UserLight;

@Path("/api/enterprise/admin")
 public interface AdminApi {

    @GET
    @Path("/tenants")
-    @Produces({ "application/json" })
+    @Produces({ MediaType.APPLICATION_JSON })
    public List<Tenant> getTenants();
    
    @GET
    @Path("/groups")
-    @Produces({ "application/json" })
-    public List<Group> getGroups(
+    @Produces({ MediaType.APPLICATION_JSON })
+    public List<GroupLight> getGroups(
    		@QueryParam("tenantId") Long tenantId,
    		@QueryParam("functional") Boolean functional,
    		@QueryParam("summary") Boolean summary);
+    
+    @POST
+    @Path("/groups")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    @Produces({ MediaType.APPLICATION_JSON })
+    public GroupLight createGroup(
+    		Group group);
+    
+    @GET
+    @Path("/groups/{groupId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public Group getGroup(
+    		@PathParam("groupId") long groupId,
+    		@QueryParam("includeAllUsers") Boolean includeAllUsers,
+    		@QueryParam("summary") Boolean summary);
+    
+    @GET
+    @Path("/groups/${groupId}/related-groups")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public List<GroupLight> getRelatedGroups(
+    		@PathParam("groupId") long groupId);
+    
+    @POST
+    @Path("/groups/${groupId}/related-groups/${relatedGroupId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public void addRelatedGroup(
+    		@PathParam("groupId") long groupId,
+    		@PathParam("relatedGroupId") long relatedGroupId,
+    		@PathParam("type") String type);
+    
+    @DELETE
+    @Path("/groups/${groupId}/related-groups/${relatedGroupId}")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public void deleteRelatedGroup(
+    		@PathParam("groupId") long groupId,
+    		@PathParam("relatedGroupId") long relatedGroupId);
+
+    @GET
+    @Path("groups/{groupId}/users")
+    @Produces({ MediaType.APPLICATION_JSON })
+    ResultList<UserLight> getMembers(
+    		@PathParam("groupId") long groupId,
+    		@QueryParam("filter") String filter,
+    		@QueryParam("page") Integer page,
+    		@QueryParam("pageSize") Integer pageSize);

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsApi.java
@@ -1,4 +1,17 @@
-
+/*
+ * 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.api;

 import java.io.File;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsCxfApi.java
@@ -9,10 +9,9 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;

-import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
-
 import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
+import com.inteligr8.alfresco.activiti.model.FileMultipartCxf;

@Path("/api/enterprise/app-definitions")
 public interface AppDefinitionsCxfApi {
@@ -22,7 +21,7 @@ public interface AppDefinitionsCxfApi {
    @Consumes({ MediaType.MULTIPART_FORM_DATA })
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionRepresentation import_(
-    		MultipartBody body,
+    		FileMultipartCxf body,
    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);

    @POST
@@ -31,7 +30,7 @@ public interface AppDefinitionsCxfApi {
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionRepresentation import_(
    		@PathParam("modelId") Long appId,
-    		MultipartBody body,
+    		FileMultipartCxf body,
    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);

    @POST
@@ -39,7 +38,7 @@ public interface AppDefinitionsCxfApi {
    @Consumes({ MediaType.MULTIPART_FORM_DATA })
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionUpdateResultRepresentation publishApp(
-    		MultipartBody body);
+    		FileMultipartCxf body);

    @POST
    @Path("{modelId}/publish-app")
@@ -47,6 +46,6 @@ public interface AppDefinitionsCxfApi {
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionUpdateResultRepresentation publishApp(
    		@PathParam("modelId") Long appId,
-    		MultipartBody body);
+    		FileMultipartCxf body);

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppDefinitionsJerseyApi.java
@@ -9,11 +9,9 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;

-import org.glassfish.jersey.media.multipart.FormDataMultiPart;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-
 import com.inteligr8.alfresco.activiti.model.AppDefinitionRepresentation;
 import com.inteligr8.alfresco.activiti.model.AppDefinitionUpdateResultRepresentation;
+import com.inteligr8.alfresco.activiti.model.FileMultipartJersey;

@Path("/api/enterprise/app-definitions")
 public interface AppDefinitionsJerseyApi {
@@ -23,7 +21,7 @@ public interface AppDefinitionsJerseyApi {
    @Consumes({ MediaType.MULTIPART_FORM_DATA })
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionRepresentation importApp(
-    		@FormDataParam("file") FormDataMultiPart file,
+    		FileMultipartJersey file,
    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);

    @POST
@@ -32,7 +30,7 @@ public interface AppDefinitionsJerseyApi {
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionRepresentation importApp(
    		@PathParam("modelId") Long appId,
-    		@FormDataParam("file") FormDataMultiPart file,
+    		FileMultipartJersey file,
    		@QueryParam("renewIdmEntries") Boolean renewIdmEntries);

    @POST
@@ -40,7 +38,7 @@ public interface AppDefinitionsJerseyApi {
    @Consumes({ MediaType.MULTIPART_FORM_DATA })
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionUpdateResultRepresentation publishApp(
-    		FormDataMultiPart file);
+    		FileMultipartJersey file);

    @POST
    @Path("{modelId}/publish-app")
@@ -48,6 +46,6 @@ public interface AppDefinitionsJerseyApi {
    @Produces({ MediaType.APPLICATION_JSON })
    AppDefinitionUpdateResultRepresentation publishApp(
    		@PathParam("modelId") Long appId,
-    		FormDataMultiPart file);
+    		FileMultipartJersey file);

 }
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/AppVersionApi.java
@@ -1,4 +1,17 @@
-
+/*
+ * 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.api;

 import javax.ws.rs.GET;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/GroupsApi.java
@@ -0,0 +1,45 @@
+/*
+ * 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.api;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+
+import com.inteligr8.alfresco.activiti.model.GroupLight;
+import com.inteligr8.alfresco.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.UserLight;
+
+@Path("/api/enterprise/groups")
+public interface GroupsApi {
+
+    @GET
+    @Produces({ "application/json" })
+    ResultList<GroupLight> query(
+    		@QueryParam("filter") String filter,
+    		@QueryParam("groupId") Long groupId,
+    		@QueryParam("externalId") String externalId,
+    		@QueryParam("externalIdCaseInsensitive") String externalIdCaseInsensitve,
+    		@QueryParam("tenantId") Long tenantId);
+
+    @GET
+    @Path("{groupId}/users")
+    @Produces({ "application/json" })
+    ResultList<UserLight> queryMembers(
+    		@PathParam("groupId") long groupId);
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricProcessInstancesApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/HistoricProcessInstancesApi.java
@@ -0,0 +1,35 @@
+/*
+ * 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.api;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import com.inteligr8.alfresco.activiti.model.HistoricProcessInstanceQueryRepresentation;
+import com.inteligr8.alfresco.activiti.model.ProcessInstance;
+import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
+
+@Path("/api/enterprise/historic-process-instances")
+public interface HistoricProcessInstancesApi {
+
+    @POST
+    @Path("query")
+    @Consumes({ "application/json" })
+    @Produces({ "application/json" })
+    ResultListDataRepresentation<ProcessInstance> query(HistoricProcessInstanceQueryRepresentation request);
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ModelsApi.java
@@ -1,4 +1,17 @@
-
+/*
+ * 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.api;

 import javax.ws.rs.GET;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProcessInstancesApi.java
@@ -1,4 +1,17 @@
-
+/*
+ * 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.api;

 import java.util.List;
@@ -14,6 +27,8 @@ import javax.ws.rs.Produces;

 import com.inteligr8.alfresco.activiti.model.CreateProcessInstance;
 import com.inteligr8.alfresco.activiti.model.ProcessInstance;
+import com.inteligr8.alfresco.activiti.model.ProcessInstanceQueryRepresentation;
+import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;
 import com.inteligr8.alfresco.activiti.model.Variable;

@Path("/api/enterprise/process-instances")
@@ -23,6 +38,12 @@ public interface ProcessInstancesApi {
    @Consumes({ "application/json" })
    @Produces({ "application/json" })
    ProcessInstance create(CreateProcessInstance processInstance);
+
+    @POST
+    @Path("query")
+    @Consumes({ "application/json" })
+    @Produces({ "application/json" })
+    ResultListDataRepresentation<ProcessInstance> query(ProcessInstanceQueryRepresentation request);
    
    @GET
    @Path("{processInstanceId}")
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ProfileApi.java
@@ -1,4 +1,17 @@
-
+/*
+ * 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.api;

 import javax.ws.rs.GET;
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/ShareApi.java
@@ -0,0 +1,50 @@
+/*
+ * 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.api;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import com.inteligr8.alfresco.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.ShareInfoRequest;
+import com.inteligr8.alfresco.activiti.model.SharePermission;
+
+/**
+ * This is an undocumented API.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Path("/app/rest/models")
+public interface ShareApi {
+
+    @GET
+    @Path("/{modelId}/share-info")
+    @Produces({ MediaType.APPLICATION_JSON })
+    public ResultList<SharePermission> getShareInfo(
+    		@PathParam("modelId") String modelId);
+
+    @PUT
+    @Path("/{modelId}/share-info")
+    @Consumes({ MediaType.APPLICATION_JSON })
+    public void setShareInfo(
+    		@PathParam("modelId") String modelId,
+    		ShareInfoRequest request);
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/api/TasksApi.java
@@ -1,4 +1,17 @@
-
+/*
+ * 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.api;

 import java.util.List;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/FileMultipartCxf.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/FileMultipartCxf.java
@@ -0,0 +1,38 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
+import org.apache.cxf.jaxrs.ext.multipart.MultipartBody;
+
+public class FileMultipartCxf extends MultipartBody {
+	
+	public static FileMultipartCxf from(String filename, InputStream istream) throws IOException {
+		return new FileMultipartCxf(Arrays.asList(toAttachment(filename, istream)));
+	}
+ 	
+	public FileMultipartCxf(List<Attachment> atts) throws IOException {
+		super(atts);
+	}
+ 	
+	public FileMultipartCxf(List<Attachment> atts, boolean outbound) {
+		super(atts, outbound);
+	}
+	
+	public Attachment getFileAttachment() {
+		return this.getAttachment("file");
+	}
+
+	private static Attachment toAttachment(String filename, InputStream istream) {
+		if (filename == null) {
+			return new Attachment("file", istream, new ContentDisposition("form-data; name=\"file\""));
+		} else {
+			return new Attachment("file", istream, new ContentDisposition("form-data; name=\"file\"; filename=\"" + filename + "\""));
+		}
+	}
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/FileMultipartJersey.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/FileMultipartJersey.java
@@ -0,0 +1,38 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.io.InputStream;
+import java.text.ParseException;
+
+import org.glassfish.jersey.media.multipart.BodyPart;
+import org.glassfish.jersey.media.multipart.FormDataBodyPart;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataMultiPart;
+
+public class FileMultipartJersey extends FormDataMultiPart {
+	
+	public static FileMultipartJersey from(String filename, InputStream istream) throws ParseException {
+		FileMultipartJersey multipart = new FileMultipartJersey();
+		multipart.bodyPart(toBodyPart(filename, istream));
+		return multipart;
+	}
+	
+	private FileMultipartJersey() {
+	}
+	
+	public FormDataBodyPart getFileAttachment() {
+		return this.getField("file");
+	}
+
+	private static BodyPart toBodyPart(String filename, InputStream istream) throws ParseException {
+		if (filename == null) {
+			return new FormDataBodyPart()
+					.contentDisposition(new FormDataContentDisposition("form-data; name=\"file\""))
+					.entity(istream);
+		} else {
+			return new FormDataBodyPart()
+					.contentDisposition(new FormDataContentDisposition("form-data; name=\"file\"; filename=\"" + filename + "\""))
+					.entity(istream);
+		}
+	}
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/Group.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Group.java
@@ -1,4 +1,3 @@
-
 package com.inteligr8.alfresco.activiti.model;

 import java.util.ArrayList;
@@ -31,7 +30,7 @@ public class Group {
    @JsonProperty("externalId")
    private String externalId;
    @JsonProperty("groups")
-    private List<Group> groups = new ArrayList<Group>();
+    private List<GroupLight> groups = new ArrayList<GroupLight>();
    @JsonProperty("id")
    private Long id;
    @JsonProperty("lastSyncTimeStamp")
@@ -85,15 +84,15 @@ public class Group {
        return this;
    }

-    public List<Group> getGroups() {
+    public List<GroupLight> getGroups() {
        return groups;
    }

-    public void setGroups(List<Group> groups) {
+    public void setGroups(List<GroupLight> groups) {
        this.groups = groups;
    }

-    public Group withGroups(List<Group> groups) {
+    public Group withGroups(List<GroupLight> groups) {
        this.groups = groups;
        return this;
    }
@@ -229,3 +228,7 @@ public class Group {
 	}

 }
+
+
+
+
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/GroupLight.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/GroupLight.java
@@ -0,0 +1,94 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GroupLight {
+
+    @JsonProperty("id")
+    private Long id;
+    @JsonProperty("externalId")
+    private String externalId;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("parentGroupId")
+    private Long parentGroupId;
+    @JsonProperty("status")
+    private String status;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public GroupLight() {
+    }
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	public GroupLight withId(Long id) {
+		this.setId(id);
+		return this;
+	}
+
+	public String getExternalId() {
+		return externalId;
+	}
+
+	public void setExternalId(String externalId) {
+		this.externalId = externalId;
+	}
+	
+	public GroupLight withExternalId(String externalId) {
+		this.setExternalId(externalId);
+		return this;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public GroupLight withName(String name) {
+		this.setName(name);
+		return this;
+	}
+
+	public Long getParentGroupId() {
+		return parentGroupId;
+	}
+
+	public void setParentGroupId(Long parentGroupId) {
+		this.parentGroupId = parentGroupId;
+	}
+	
+	public GroupLight withParentGroupId(Long parentGroupId) {
+		this.setParentGroupId(parentGroupId);
+		return this;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+	
+	public GroupLight withStatus(String status) {
+		this.setStatus(status);
+		return this;
+	}
+    
+}
+
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/HistoricProcessInstanceQueryRepresentation.java
@@ -0,0 +1,397 @@
+
+
+package com.inteligr8.alfresco.activiti.model;
+
+import java.time.OffsetDateTime;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "excludeSubprocesses",
+    "finished",
+    "finishedAfter",
+    "finishedBefore",
+    "includeProcessVariables",
+    "involvedUser",
+    "order",
+    "processBusinessKey",
+    "processDefinitionId",
+    "processDefinitionKey",
+    "processInstanceId",
+    "processInstanceIds",
+    "size",
+    "sort",
+    "start",
+    "startedAfter",
+    "startedBefore",
+    "startedBy",
+    "superProcessInstanceId",
+    "tenantId",
+    "tenantIdLike",
+    "variables",
+    "withoutTenantId"
+})
+public class HistoricProcessInstanceQueryRepresentation {
+
+    @JsonProperty("excludeSubprocesses")
+    private Boolean excludeSubprocesses;
+    @JsonProperty("finished")
+    private Boolean finished;
+    @JsonProperty("finishedAfter")
+    private OffsetDateTime finishedAfter;
+    @JsonProperty("finishedBefore")
+    private OffsetDateTime finishedBefore;
+    @JsonProperty("includeProcessVariables")
+    private Boolean includeProcessVariables;
+    @JsonProperty("involvedUser")
+    private String involvedUser;
+    @JsonProperty("order")
+    private String order;
+    @JsonProperty("processBusinessKey")
+    private String processBusinessKey;
+    @JsonProperty("processDefinitionId")
+    private String processDefinitionId;
+    @JsonProperty("processDefinitionKey")
+    private String processDefinitionKey;
+    @JsonProperty("processInstanceId")
+    private String processInstanceId;
+    @JsonProperty("processInstanceIds")
+    private List<String> processInstanceIds;
+    @JsonProperty("size")
+    private Integer size;
+    @JsonProperty("sort")
+    private String sort;
+    @JsonProperty("start")
+    private Integer start;
+    @JsonProperty("startedAfter")
+    private OffsetDateTime startedAfter;
+    @JsonProperty("startedBefore")
+    private OffsetDateTime startedBefore;
+    @JsonProperty("startedBy")
+    private String startedBy;
+    @JsonProperty("superProcessInstanceId")
+    private String superProcessInstanceId;
+    @JsonProperty("tenantId")
+    private String tenantId;
+    @JsonProperty("tenantIdLike")
+    private String tenantIdLike;
+    @JsonProperty("variables")
+    private List<QueryVariable> variables;
+    @JsonProperty("withoutTenantId")
+    private Boolean withoutTenantId;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public HistoricProcessInstanceQueryRepresentation() {
+    }
+
+    public Boolean isExcludeSubprocesses() {
+        return excludeSubprocesses;
+    }
+
+    public void setExcludeSubprocesses(Boolean excludeSubprocesses) {
+        this.excludeSubprocesses = excludeSubprocesses;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withExcludeSubprocesses(Boolean excludeSubprocesses) {
+        this.excludeSubprocesses = excludeSubprocesses;
+        return this;
+    }
+
+    public Boolean isFinished() {
+        return finished;
+    }
+
+    public void setFinished(Boolean finished) {
+        this.finished = finished;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withFinished(Boolean finished) {
+        this.finished = finished;
+        return this;
+    }
+
+    public OffsetDateTime getFinishedAfter() {
+        return finishedAfter;
+    }
+
+    public void setFinishedAfter(OffsetDateTime finishedAfter) {
+        this.finishedAfter = finishedAfter;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withFinishedAfter(OffsetDateTime finishedAfter) {
+        this.finishedAfter = finishedAfter;
+        return this;
+    }
+
+    public OffsetDateTime getFinishedBefore() {
+        return finishedBefore;
+    }
+
+    public void setFinishedBefore(OffsetDateTime finishedBefore) {
+        this.finishedBefore = finishedBefore;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withFinishedBefore(OffsetDateTime finishedBefore) {
+        this.finishedBefore = finishedBefore;
+        return this;
+    }
+
+    public Boolean isIncludeProcessVariables() {
+        return includeProcessVariables;
+    }
+
+    public void setIncludeProcessVariables(Boolean includeProcessVariables) {
+        this.includeProcessVariables = includeProcessVariables;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withIncludeProcessVariables(Boolean includeProcessVariables) {
+        this.includeProcessVariables = includeProcessVariables;
+        return this;
+    }
+
+    public String getInvolvedUser() {
+        return involvedUser;
+    }
+
+    public void setInvolvedUser(String involvedUser) {
+        this.involvedUser = involvedUser;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withInvolvedUser(String involvedUser) {
+        this.involvedUser = involvedUser;
+        return this;
+    }
+
+    public String getOrder() {
+        return order;
+    }
+
+    public void setOrder(String order) {
+        this.order = order;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withOrder(String order) {
+        this.order = order;
+        return this;
+    }
+
+    public String getProcessBusinessKey() {
+        return processBusinessKey;
+    }
+
+    public void setProcessBusinessKey(String processBusinessKey) {
+        this.processBusinessKey = processBusinessKey;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withProcessBusinessKey(String processBusinessKey) {
+        this.processBusinessKey = processBusinessKey;
+        return this;
+    }
+
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+        return this;
+    }
+
+    public String getProcessDefinitionKey() {
+        return processDefinitionKey;
+    }
+
+    public void setProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withProcessDefinitionKey(String processDefinitionKey) {
+        this.processDefinitionKey = processDefinitionKey;
+        return this;
+    }
+
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+        return this;
+    }
+
+    public List<String> getProcessInstanceIds() {
+        return processInstanceIds;
+    }
+
+    public void setProcessInstanceIds(List<String> processInstanceIds) {
+        this.processInstanceIds = processInstanceIds;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withProcessInstanceIds(List<String> processInstanceIds) {
+        this.processInstanceIds = processInstanceIds;
+        return this;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withSize(Integer size) {
+        this.size = size;
+        return this;
+    }
+
+    public String getSort() {
+        return sort;
+    }
+
+    public void setSort(String sort) {
+        this.sort = sort;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withSort(String sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public Integer getStart() {
+        return start;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withStart(Integer start) {
+        this.start = start;
+        return this;
+    }
+
+    public OffsetDateTime getStartedAfter() {
+        return startedAfter;
+    }
+
+    public void setStartedAfter(OffsetDateTime startedAfter) {
+        this.startedAfter = startedAfter;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withStartedAfter(OffsetDateTime startedAfter) {
+        this.startedAfter = startedAfter;
+        return this;
+    }
+
+    public OffsetDateTime getStartedBefore() {
+        return startedBefore;
+    }
+
+    public void setStartedBefore(OffsetDateTime startedBefore) {
+        this.startedBefore = startedBefore;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withStartedBefore(OffsetDateTime startedBefore) {
+        this.startedBefore = startedBefore;
+        return this;
+    }
+
+    public String getStartedBy() {
+        return startedBy;
+    }
+
+    public void setStartedBy(String startedBy) {
+        this.startedBy = startedBy;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withStartedBy(String startedBy) {
+        this.startedBy = startedBy;
+        return this;
+    }
+
+    public String getSuperProcessInstanceId() {
+        return superProcessInstanceId;
+    }
+
+    public void setSuperProcessInstanceId(String superProcessInstanceId) {
+        this.superProcessInstanceId = superProcessInstanceId;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withSuperProcessInstanceId(String superProcessInstanceId) {
+        this.superProcessInstanceId = superProcessInstanceId;
+        return this;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withTenantId(String tenantId) {
+        this.tenantId = tenantId;
+        return this;
+    }
+
+    public String getTenantIdLike() {
+        return tenantIdLike;
+    }
+
+    public void setTenantIdLike(String tenantIdLike) {
+        this.tenantIdLike = tenantIdLike;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withTenantIdLike(String tenantIdLike) {
+        this.tenantIdLike = tenantIdLike;
+        return this;
+    }
+
+    public List<QueryVariable> getVariables() {
+    	if (variables == null)
+    		variables = new LinkedList<>();
+        return variables;
+    }
+
+    public void setVariables(List<QueryVariable> variables) {
+        this.variables = variables;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withVariables(List<QueryVariable> variables) {
+        this.variables = variables;
+        return this;
+    }
+
+    public Boolean isWithoutTenantId() {
+        return withoutTenantId;
+    }
+
+    public void setWithoutTenantId(Boolean withoutTenantId) {
+        this.withoutTenantId = withoutTenantId;
+    }
+
+    public HistoricProcessInstanceQueryRepresentation withWithoutTenantId(Boolean withoutTenantId) {
+        this.withoutTenantId = withoutTenantId;
+        return this;
+    }
+    
+    
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/Permission.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/Permission.java
@@ -0,0 +1,33 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class Permission extends PermissionLight {
+	
+	@JsonProperty
+	private UserLight person;
+	@JsonProperty
+	private GroupLight group;
+
+	public UserLight getPerson() {
+		return person;
+	}
+
+	public void setPerson(UserLight person) {
+		this.person = person;
+	}
+
+	public GroupLight getGroup() {
+		return group;
+	}
+
+	public void setGroup(GroupLight group) {
+		this.group = group;
+	}
+	
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/PermissionLevel.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/PermissionLevel.java
@@ -0,0 +1,13 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum PermissionLevel {
+	
+	@JsonProperty("write")
+	Write,
+
+	@JsonProperty("read")
+	Read
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/PermissionLight.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/PermissionLight.java
@@ -0,0 +1,73 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PermissionLight {
+	
+	@JsonProperty
+	private String id;
+	@JsonProperty
+	private PermissionLevel permission;
+	@JsonProperty
+	private Long personId;
+	@JsonProperty
+	private Long groupId;
+
+	public String getId() {
+		return id;
+	}
+	
+	public void setId(String id) {
+		this.id = id;
+	}
+	
+	public PermissionLight withId(String id) {
+		this.setId(id);
+		return this;
+	}
+	
+	public PermissionLevel getPermission() {
+		return permission;
+	}
+	
+	public void setPermission(PermissionLevel permission) {
+		this.permission = permission;
+	}
+	
+	public PermissionLight withPermission(PermissionLevel permission) {
+		this.setPermission(permission);
+		return this;
+	}
+
+	public Long getPersonId() {
+		return personId;
+	}
+
+	public void setPersonId(Long personId) {
+		this.personId = personId;
+	}
+	
+	public PermissionLight withPersonId(Long personId) {
+		this.setPersonId(personId);
+		return this;
+	}
+
+	public Long getGroupId() {
+		return groupId;
+	}
+
+	public void setGroupId(Long groupId) {
+		this.groupId = groupId;
+	}
+	
+	public PermissionLight withGroupId(Long groupId) {
+		this.setGroupId(groupId);
+		return this;
+	}
+	
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstance.java
@@ -11,26 +11,26 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;

@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonPropertyOrder({
-    "businessKey",
-    "ended",
-    "graphicalNotationDefined",
    "id",
    "name",
-    "processDefinitionCategory",
-    "processDefinitionDeploymentId",
-    "processDefinitionDescription",
+    "businessKey",
    "processDefinitionId",
-    "processDefinitionKey",
-    "processDefinitionName",
-    "processDefinitionVersion",
-    "startFormDefined",
-    "started",
-    "startedBy",
-    "suspended",
    "tenantId",
+    "started",
+    "ended",
+    "startedBy",
+    "processDefinitionName",
+    "processDefinitionDescription",
+    "processDefinitionKey",
+    "processDefinitionCategory",
+    "processDefinitionVersion",
+    "processDefinitionDeploymentId",
+    "graphicalNotationDefined",
+    "startFormDefined",
+    "suspended",
    "variables"
 })
-public class ProcessInstance {
+public class ProcessInstance extends Datum {

    @JsonProperty("businessKey")
    private String businessKey;
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstanceQueryRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ProcessInstanceQueryRepresentation.java
@@ -0,0 +1,154 @@
+
+
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "appDefinitionId",
+    "page",
+    "processDefinitionId",
+    "processInstanceId",
+    "size",
+    "sort",
+    "start",
+    "state"
+})
+public class ProcessInstanceQueryRepresentation {
+    
+    public enum Sort {
+        @JsonProperty("created-asc")
+        CreatedAsc,
+        @JsonProperty("created-desc")
+        CreatedDesc,
+        @JsonProperty("ended-asc")
+        EndedAsc,
+        @JsonProperty("ended-desc")
+        EndedDesc,
+    }
+    
+    public enum State {
+        @JsonProperty("all")
+        All,
+        @JsonProperty("completed")
+        Completed,
+        @JsonProperty("running")
+        Running
+    }
+
+    @JsonProperty("appDefinitionId")
+    private Long appDefinitionId;
+    @JsonProperty("processDefinitionId")
+    private String processDefinitionId;
+    @JsonProperty("processInstanceId")
+    private String processInstanceId;
+    @JsonProperty("size")
+    private Integer size;
+    @JsonProperty("sort")
+    private Sort sort;
+    @JsonProperty("start")
+    private Integer start;
+    @JsonProperty("state")
+    private State state;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public ProcessInstanceQueryRepresentation() {
+    }
+
+    public Long getAppDefinitionId() {
+        return appDefinitionId;
+    }
+
+    public void setAppDefinitionId(Long appDefinitionId) {
+        this.appDefinitionId = appDefinitionId;
+    }
+
+    public ProcessInstanceQueryRepresentation withAppDefinitionId(Long appDefinitionId) {
+        this.appDefinitionId = appDefinitionId;
+        return this;
+    }
+
+    public String getProcessDefinitionId() {
+        return processDefinitionId;
+    }
+
+    public void setProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+    }
+
+    public ProcessInstanceQueryRepresentation withProcessDefinitionId(String processDefinitionId) {
+        this.processDefinitionId = processDefinitionId;
+        return this;
+    }
+
+    public String getProcessInstanceId() {
+        return processInstanceId;
+    }
+
+    public void setProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+    }
+
+    public ProcessInstanceQueryRepresentation withProcessInstanceId(String processInstanceId) {
+        this.processInstanceId = processInstanceId;
+        return this;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public ProcessInstanceQueryRepresentation withSize(Integer size) {
+        this.size = size;
+        return this;
+    }
+
+    public Sort getSort() {
+        return sort;
+    }
+
+    public void setSort(Sort sort) {
+        this.sort = sort;
+    }
+
+    public ProcessInstanceQueryRepresentation withSort(Sort sort) {
+        this.sort = sort;
+        return this;
+    }
+
+    public Integer getStart() {
+        return start;
+    }
+
+    public void setStart(Integer start) {
+        this.start = start;
+    }
+
+    public ProcessInstanceQueryRepresentation withStart(Integer start) {
+        this.start = start;
+        return this;
+    }
+    
+    public State getState() {
+        return state;
+    }
+    
+    public void setState(State state) {
+        this.state = state;
+    }
+    
+    public ProcessInstanceQueryRepresentation withState(State state) {
+        this.state = state;
+        return this;
+    }
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/QueryVariable.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/QueryVariable.java
@@ -0,0 +1,90 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "name",
+    "operation",
+    "type",
+    "value"
+})
+public class QueryVariable {
+
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("operation")
+    private String operation;
+    @JsonProperty("type")
+    private String type;
+    @JsonProperty("value")
+    private Object value;
+
+    /**
+     * No args constructor for use in serialization
+     */
+    public QueryVariable() {
+    }
+
+    public QueryVariable(String name, String operation, String type, Object value) {
+        this.name = name;
+        this.operation = operation;
+        this.type = type;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public QueryVariable withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public QueryVariable withOperation(String operation) {
+        this.operation = operation;
+        return this;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public QueryVariable withType(String type) {
+        this.type = type;
+        return this;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    public QueryVariable withValue(Object value) {
+        this.value = value;
+        return this;
+    }
+    
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ResultList.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ResultList.java
@@ -0,0 +1,54 @@
+
+package com.inteligr8.alfresco.activiti.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ResultList<T> {
+    
+    @JsonProperty("size")
+    private Integer size;
+    @JsonProperty("total")
+    private Integer total;
+    @JsonProperty("start")
+    private Integer start;
+    @JsonProperty("data")
+    private List<T> data = new LinkedList<T>();
+    
+    public Integer getSize() {
+		return size;
+	}
+    
+    public void setSize(Integer size) {
+		this.size = size;
+	}
+    
+    public Integer getTotal() {
+		return total;
+	}
+    
+    public void setTotal(Integer total) {
+		this.total = total;
+	}
+
+    public Integer getStart() {
+		return start;
+	}
+    
+    public void setStart(Integer start) {
+		this.start = start;
+	}
+    
+    public List<T> getData() {
+		return data;
+	}
+    
+    public void setData(List<T> data) {
+		this.data = data;
+	}
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ResultListDataRepresentation.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ResultListDataRepresentation.java
@@ -26,10 +26,10 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
    "start",
    "total"
 })
-public class ResultListDataRepresentation {
+public class ResultListDataRepresentation<T extends Datum> {

    @JsonProperty("data")
-    private List<Datum> data = new ArrayList<Datum>();
+    private List<T> data = new ArrayList<>();
    @JsonProperty("size")
    private Integer size;
    @JsonProperty("start")
@@ -40,16 +40,16 @@ public class ResultListDataRepresentation {
    private Map<String, Object> additionalProperties = new HashMap<String, Object>();

    @JsonProperty("data")
-    public List<Datum> getData() {
+    public List<T> getData() {
        return data;
    }

    @JsonProperty("data")
-    public void setData(List<Datum> data) {
+    public void setData(List<T> data) {
        this.data = data;
    }

-    public ResultListDataRepresentation withData(List<Datum> data) {
+    public ResultListDataRepresentation<T> withData(List<T> data) {
        this.data = data;
        return this;
    }
@@ -64,7 +64,7 @@ public class ResultListDataRepresentation {
        this.size = size;
    }

-    public ResultListDataRepresentation withSize(Integer size) {
+    public ResultListDataRepresentation<T> withSize(Integer size) {
        this.size = size;
        return this;
    }
@@ -79,7 +79,7 @@ public class ResultListDataRepresentation {
        this.start = start;
    }

-    public ResultListDataRepresentation withStart(Integer start) {
+    public ResultListDataRepresentation<T> withStart(Integer start) {
        this.start = start;
        return this;
    }
@@ -94,7 +94,7 @@ public class ResultListDataRepresentation {
        this.total = total;
    }

-    public ResultListDataRepresentation withTotal(Integer total) {
+    public ResultListDataRepresentation<T> withTotal(Integer total) {
        this.total = total;
        return this;
    }
@@ -109,7 +109,7 @@ public class ResultListDataRepresentation {
        this.additionalProperties.put(name, value);
    }

-    public ResultListDataRepresentation withAdditionalProperty(String name, Object value) {
+    public ResultListDataRepresentation<T> withAdditionalProperty(String name, Object value) {
        this.additionalProperties.put(name, value);
        return this;
    }
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/ShareInfoRequest.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/ShareInfoRequest.java
@@ -0,0 +1,47 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ShareInfoRequest {
+	
+	@JsonProperty
+	private List<PermissionLight> added = new LinkedList<>();
+	@JsonProperty
+	private List<PermissionLight> removed = new LinkedList<>();
+	@JsonProperty
+	private List<PermissionLight> updated = new LinkedList<>();
+	
+	
+	
+	public List<PermissionLight> getAdded() {
+		return added;
+	}
+	
+	public void setAdded(List<PermissionLight> added) {
+		this.added = added;
+	}
+	
+	public List<PermissionLight> getRemoved() {
+		return removed;
+	}
+	
+	public void setRemoved(List<PermissionLight> removed) {
+		this.removed = removed;
+	}
+	
+	public List<PermissionLight> getUpdated() {
+		return updated;
+	}
+	
+	public void setUpdated(List<PermissionLight> updated) {
+		this.updated = updated;
+	}
+
+}
--- a/src/main/java/com/inteligr8/alfresco/activiti/model/SharePermission.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/model/SharePermission.java
@@ -0,0 +1,34 @@
+package com.inteligr8.alfresco.activiti.model;
+
+import java.time.OffsetDateTime;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SharePermission extends Permission {
+	
+	@JsonProperty
+	private OffsetDateTime shareDate;
+	@JsonProperty
+	private Long sharedBy;
+	
+	public OffsetDateTime getShareDate() {
+		return shareDate;
+	}
+	
+	public void setShareDate(OffsetDateTime shareDate) {
+		this.shareDate = shareDate;
+	}
+	
+	public Long getSharedBy() {
+		return sharedBy;
+	}
+	
+	public void setSharedBy(Long sharedBy) {
+		this.sharedBy = sharedBy;
+	}
+
+}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ArrayResponseUnitTest.java
@@ -1,37 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import java.util.List;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.alfresco.activiti.model.Tenant;
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiJerseyImpl.class, ApsClientJerseyImpl.class})
-public class ArrayResponseUnitTest extends ConditionalIT {
-	
-	@Autowired
-	@Qualifier("aps.api.jersey")
-	private ApsPublicRestApi client;
-	
-	@Override
-	public ClientConfiguration getConfiguration() {
-		return this.client.getConfig();
-	}
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testTenants() {
-		List<Tenant> objs = this.client.getAdminApi().getTenants();
-		
-		Assertions.assertNotNull(objs);
-	}
-
-}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConditionalIT.java
@@ -1,35 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.impl.client.DefaultRedirectStrategy;
-import org.apache.http.impl.client.HttpClientBuilder;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-public abstract class ConditionalIT {
-	
-	public abstract ClientConfiguration getConfiguration();
-	
-	public boolean hostExists() {
-		String uri = this.getConfiguration().getBaseUrl();
-		
-		HttpUriRequest request = RequestBuilder.get()
-				.setUri(uri)
-				.build();
-		
-		HttpClient client = HttpClientBuilder.create()
-				.setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
-				.build();
-		
-		try {
-			HttpResponse response = client.execute(request);
-			return response.getStatusLine().getStatusCode() < 300;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionClientIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionClientIT.java
@@ -1,54 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import java.util.Arrays;
-import java.util.UUID;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIf;
-
-import com.inteligr8.alfresco.activiti.model.AppVersion;
-import com.inteligr8.alfresco.activiti.model.CreateProcessInstance;
-import com.inteligr8.alfresco.activiti.model.ProcessInstance;
-import com.inteligr8.alfresco.activiti.model.User;
-import com.inteligr8.alfresco.activiti.model.Variable;
-
-public abstract class ConnectionClientIT extends ConditionalIT {
-	
-	public abstract ApsPublicRestApi getClient();
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testAppVersion() {
-		AppVersion obj = this.getClient().getAppVersionApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("1", obj.getMajorVersion());
-		Assertions.assertEquals("bpmSuite", obj.getType());
-	}
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testProfile() {
-		User obj = this.getClient().getProfileApi().get();
-		
-		Assertions.assertNotNull(obj);
-		Assertions.assertEquals("admin@app.activiti.com", obj.getEmail());
-	}
-	
-	@Test
-	@EnabledIf("hostExists")
-	public void testStartProcess() {
-		CreateProcessInstance request = new CreateProcessInstance();
-		request.setProcessDefinitionKey("qcDocument");
-		request.setVariables(Arrays.asList(new Variable("acsNodeId", null, null, UUID.randomUUID().toString())));
-		
-		ProcessInstance response = this.getClient().getProcessInstancesApi().create(request);
-		
-		Assertions.assertNotNull(response);
-		Assertions.assertNotNull(response.getId());
-		Assertions.assertNotNull(response.getId().length() > 0);
-		Assertions.assertEquals("qcDocument", response.getProcessDefinitionKey());
-	}
-
-}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientPojoIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientPojoIT.java
@@ -1,32 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.junit.jupiter.api.BeforeAll;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-public class ConnectionCxfClientPojoIT extends ConnectionClientIT {
-	
-	private static ApsPublicRestApi client;
-	
-	@BeforeAll
-	public static void initClient() {
-		ApsClientConfiguration config = new ApsClientConfiguration();
-		config.setBaseUrl("http://localhost:8080/activiti-app");
-		config.setBasicAuthUsername("admin");
-		config.setBasicAuthPassword("admin");
-		
-		client = new ApsPublicRestApiCxfImpl(
-				new ApsClientCxfImpl(config));
-	}
-	
-	@Override
-	public ApsPublicRestApi getClient() {
-		return client;
-	}
-	
-	@Override
-	public ClientConfiguration getConfiguration() {
-		return client.getConfig();
-	}
-
-}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientSpringIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionCxfClientSpringIT.java
@@ -1,28 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local-oauth.properties"})
-@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientCxfImpl.class})
-public class ConnectionCxfClientSpringIT extends ConnectionClientIT {
-	
-	@Autowired
-	@Qualifier("aps.api.cxf")
-	private ApsPublicRestApi client;
-	
-	@Override
-	public ApsPublicRestApi getClient() {
-		return this.client;
-	}
-	
-	@Override
-	public ClientConfiguration getConfiguration() {
-		return this.client.getConfig();
-	}
-
-}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientPojoIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientPojoIT.java
@@ -1,31 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.junit.jupiter.api.BeforeAll;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-public class ConnectionJerseyClientPojoIT extends ConnectionClientIT {
-	
-	private static ApsPublicRestApi client;
-	
-	@BeforeAll
-	public static void initClient() {
-		ApsClientConfiguration config = new ApsClientConfiguration();
-		config.setBaseUrl("http://localhost:8080/activiti-app");
-		config.setBasicAuthUsername("admin");
-		config.setBasicAuthPassword("admin");
-		
-		client = new ApsPublicRestApiJerseyImpl(
-				new ApsClientJerseyImpl(config));
-	}
-	
-	public ApsPublicRestApi getClient() {
-		return client;
-	}
-	
-	@Override
-	public ClientConfiguration getConfiguration() {
-		return client.getConfig();
-	}
-
-}
--- a/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientSpringIT.java
+++ b/src/test/java/com/inteligr8/alfresco/activiti/ConnectionJerseyClientSpringIT.java
@@ -1,27 +0,0 @@
-package com.inteligr8.alfresco.activiti;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
-
-import com.inteligr8.rs.ClientConfiguration;
-
-@TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {ApsClientConfiguration.class, ApsPublicRestApiCxfImpl.class, ApsClientJerseyImpl.class})
-public class ConnectionJerseyClientSpringIT extends ConnectionClientIT {
-	
-	@Autowired
-	@Qualifier("aps.api.jersey")
-	private ApsPublicRestApi client;
-	
-	public ApsPublicRestApi getClient() {
-		return this.client;
-	}
-	
-	@Override
-	public ClientConfiguration getConfiguration() {
-		return this.client.getConfig();
-	}
-
-}
--- a/src/test/resources/local-oauth.properties
+++ b/src/test/resources/local-oauth.properties
@@ -1,5 +0,0 @@
-process.service.baseUrl=http://localhost:8080/activiti-app
-process.service.security.oauth.tokenUrl=http://auth.example.org:8080/auth/realms/alfresco/protocol/openid-connect/token
-process.service.security.oauth.clientId=api
-process.service.security.oauth.grantUsername=admin
-process.service.security.oauth.grantPassword=admin
--- a/src/test/resources/local.properties
+++ b/src/test/resources/local.properties
@@ -1,3 +0,0 @@
-process.service.baseUrl=http://localhost:8080/activiti-app
-process.service.security.basicAuth.username=admin@app.activiti.com
-process.service.security.basicAuth.password=admin
Author	SHA1	Message	Date
Brian Long	9f6d6661e2	Merge branch 'develop' into develop-aps1	2023-01-19 17:00:50 -05:00
Brian Long	a3cef80cb3	fixed request objects to allow nulls	2023-01-19 21:56:29 +00:00
Brian Long	9d031414d3	fixed missing @Path(query) for PIs and HPIs	2023-01-10 17:04:49 -05:00
Brian M. Long	38b95c3425	Merge branch 'develop' into develop-aps1	2022-12-02 12:19:14 -05:00
Brian M. Long	7048e42ca1	added process instance query operations	2022-12-02 12:15:53 -05:00
Brian Long	41351f7d34	Merge branch 'develop' into develop-aps1	2022-10-03 10:20:08 -04:00
Brian Long	8697d67b39	added back CXF/Jersey (optional)	2022-10-03 10:19:41 -04:00
Brian Long	ffbad94822	added '-aps1' to version	2022-10-03 10:00:07 -04:00
Brian Long	f93e201329	added docs; maven central prep; removed CXF/Jersey	2022-10-03 09:57:08 -04:00
Brian Long	ef89e478cb	fixed model for share-info	2022-05-03 22:10:27 +01:00
Brian Long	c38b82f75b	added undocumented ShareApi	2022-05-03 19:03:30 +01:00
Brian M. Long	ed9fe6dfc5	using interface default impl	2022-05-03 13:07:00 -04:00
Brian Long	a14564c87f	split API/client	2022-05-02 23:30:39 +01:00
Brian Long	06c8bf5f2f	fixed multipart handling; similar to ACS API	2022-04-18 15:44:42 -04:00