Merge branch 'develop' into stable (2c771002) · Commits · Inteligr8 / aps-public-rest-api

pom.xml

+29 −31

Original line number	Diff line number	Diff line
		@@ -4,17 +4,19 @@
		<modelVersion>4.0.0</modelVersion>
		<groupId>com.inteligr8.alfresco</groupId>
		<artifactId>aps-public-rest-api</artifactId>
		<version>1.1.3</version>
		<version>1.2.0</version>
		<name>Alfresco Process Services ReST API Client for Java</name>

		<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>https://activiti.alfresco.com</aps.baseUrl>
		<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>
		@@ -46,6 +48,12 @@
		<version>${jersey.version}</version>
		<scope>test</scope>
		</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>
		@@ -80,6 +88,12 @@

		<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>
		@@ -128,6 +142,7 @@
		<id>raml-codegen</id>
		<properties>
		<aps.ramlUrl>${aps.baseUrl}/activiti-app/raml/activiti.raml</aps.ramlUrl>
		<basePackage>com.inteligr8.alfresco.activiti</basePackage>
		</properties>
		<build>
		<plugins>
		@@ -137,31 +152,13 @@
		<configuration>
		<filesets>
		<fileset>
		<directory>src/main/java</directory>
		<includes>
		<include>com/inteligr8/alfresco/activiti/raml/*/</include>
		</includes>
		</fileset>
		</filesets>
		</configuration>
		<executions>
		<execution>
		<id>delete-extras</id>
		<phase>process-sources</phase>
		<goals><goal>clean</goal></goals>
		<configuration>
		<excludeDefaultDirectories>true</excludeDefaultDirectories>
		<filesets>
		<fileset>
		<directory>${project.build.directory}/ramlgen/java</directory>
		<directory>src/gen/java</directory>
		<includes>
		<include>com/inteligr8/alfresco/activiti/raml/*/__*.java</include>
		<include>*/</include>
		</includes>
		</fileset>
		</filesets>
		</configuration>
		</execution>
		</executions>
		</plugin>
		<plugin>
		<groupId>com.googlecode.maven-download-plugin</groupId>
		@@ -241,22 +238,23 @@
		</executions>
		</plugin>
		<plugin>
		<groupId>org.mule.raml.codegen</groupId>
		<artifactId>raml-client-generator-maven-plugin</artifactId>
		<version>0.11</version>
		<groupId>org.raml.jaxrs</groupId>
		<artifactId>raml-to-jaxrs-maven-plugin</artifactId>
		<version>3.0.7</version>
		<executions>
		<execution>
		<id>raml-aps-codegen</id>
		<id>raml-codegen</id>
		<phase>generate-sources</phase>
		<goals>
		<goal>generate-client</goal>
		<goal>generate</goal>
		</goals>
		<configuration>
		<basePackage>com.inteligr8.alfresco.activiti.raml</basePackage>
		<resourcePackage>${basePackage}.resource</resourcePackage>
		<modelPackage>${basePackage}.model</modelPackage>
		<supportPackage>${basePackage}.support</supportPackage>
		<generateTypesWith>jackson</generateTypesWith>
		<ramlFile>${project.build.directory}/regexed/activiti.raml</ramlFile>
		<includeAdditionalProperties>false</includeAdditionalProperties>
		<outputDir>${project.build.directory}/ramlgen/java</outputDir>
		<outputVersion>v2</outputVersion>
		<outputDirectory>${basedir}/src/gen/java</outputDirectory>
		</configuration>
		</execution>
		</executions>

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

+18 −0

Original line number	Diff line number	Diff line
		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.ModelsApi;
		import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi;
		import com.inteligr8.alfresco.activiti.api.ProfileApi;
		import com.inteligr8.alfresco.activiti.api.TasksApi;
		@@ -37,6 +39,14 @@ public abstract class ApsPublicRestApi {
		return this.getApi(authFilter, AdminApi.class);
		}

		public AppDefinitionsApi getAppDefinitionsApi() {
		return this.getApi(AppDefinitionsApi.class);
		}

		public AppDefinitionsApi getAppDefinitionsApi(AuthorizationFilter authFilter) {
		return this.getApi(authFilter, AppDefinitionsApi.class);
		}

		public AppVersionApi getAppVersionApi() {
		return this.getApi(AppVersionApi.class);
		}
		@@ -45,6 +55,14 @@ public abstract class ApsPublicRestApi {
		return this.getApi(authFilter, AppVersionApi.class);
		}

		public ModelsApi getModelsApi() {
		return this.getApi(ModelsApi.class);
		}

		public ModelsApi getModelsApi(AuthorizationFilter authFilter) {
		return this.getApi(authFilter, ModelsApi.class);
		}

		public ProcessInstancesApi getProcessInstancesApi() {
		return this.getApi(ProcessInstancesApi.class);
		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ 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;

		@@ -43,4 +45,12 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi {
		return this.client;
		}

		public AppDefinitionsCxfApi getAppDefinitionsCxfApi() {
		return this.getApi(AppDefinitionsCxfApi.class);
		}

		public AppDefinitionsCxfApi getAppDefinitionsCxfApi(AuthorizationFilter authFilter) {
		return this.getApi(authFilter, AppDefinitionsCxfApi.class);
		}

		}

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@ 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;

		@@ -43,4 +45,12 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi {
		return this.client;
		}

		public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi() {
		return this.getApi(AppDefinitionsJerseyApi.class);
		}

		public AppDefinitionsJerseyApi getAppDefinitionsJerseyApi(AuthorizationFilter authFilter) {
		return this.getApi(authFilter, AppDefinitionsJerseyApi.class);
		}

		}

src/main/java/com/inteligr8/alfresco/activiti/api/AdminApi.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -3,11 +3,12 @@ package com.inteligr8.alfresco.activiti.api;

		import java.util.List;

		import javax.ws.rs.Consumes;
		import javax.ws.rs.GET;
		import javax.ws.rs.Path;
		import javax.ws.rs.Produces;
		import javax.ws.rs.QueryParam;

		import com.inteligr8.alfresco.activiti.model.Group;
		import com.inteligr8.alfresco.activiti.model.Tenant;

		@Path("/api/enterprise/admin")
		@@ -15,8 +16,15 @@ public interface AdminApi {

		@GET
		@Path("/tenants")
		@Consumes({ "application/json" })
		@Produces({ "application/json" })
		public List<Tenant> getTenants();

		@GET
		@Path("/groups")
		@Produces({ "application/json" })
		public List<Group> getGroups(
		@QueryParam("tenantId") Long tenantId,
		@QueryParam("functional") Boolean functional,
		@QueryParam("summary") Boolean summary);

		}