Commit 0c9dff2e authored by Brian Long's avatar Brian Long
Browse files

updated aps-public-rest projects

parent cf051cac

pom.xml

+8 −17
Original line number Diff line number Diff line
@@ -34,36 +34,27 @@ 
		<maven.compiler.target>1.8</maven.compiler.target>

		<maven.version>3.6.3</maven.version>

		

		<jersey.version>2.34</jersey.version>

		<jersey.version>2.35</jersey.version>

	</properties>



	<dependencies>

		<dependency>

			<groupId>com.inteligr8.alfresco</groupId>

			<artifactId>aps-public-rest-api</artifactId>

			<version>1.2.3</version>

			<version>2.0.0</version>

			<classifier>aps1</classifier>

		</dependency>

		<dependency>

			<groupId>com.inteligr8.alfresco</groupId>

			<artifactId>aps-public-rest-client</artifactId>

			<version>2.0.0</version>

			<classifier>jersey</classifier>

		</dependency>

		<dependency>

			<groupId>org.apache.commons</groupId>

			<artifactId>commons-lang3</artifactId>

			<version>3.4</version>

		</dependency>

		<dependency>

			<groupId>org.glassfish.jersey.ext</groupId>

			<artifactId>jersey-proxy-client</artifactId>

			<version>${jersey.version}</version>

		</dependency>

		<dependency>

			<groupId>org.glassfish.jersey.core</groupId>

			<artifactId>jersey-client</artifactId>

			<version>${jersey.version}</version>

		</dependency>

		<dependency>

			<groupId>org.glassfish.jersey.media</groupId>

			<artifactId>jersey-media-multipart</artifactId>

			<version>${jersey.version}</version>

		</dependency>

		<dependency>

			<groupId>org.glassfish.jersey.inject</groupId>

			<artifactId>jersey-hk2</artifactId>

src/main/java/com/inteligr8/maven/aps/modeling/goal/ApsAddressibleGoal.java

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import org.apache.maven.execution.MavenSession; 
import org.apache.maven.plugins.annotations.Parameter;

import org.apache.maven.settings.Server;



import com.inteligr8.alfresco.activiti.ApsClientConfiguration;

import com.inteligr8.alfresco.activiti.ApsClientJerseyConfiguration;

import com.inteligr8.alfresco.activiti.ApsClientJerseyImpl;

import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;
@@ -36,9 +36,9 @@ public abstract class ApsAddressibleGoal extends DisablableGoal { 
	

	private ApsPublicRestApiJerseyImpl api;

	

	public ApsClientConfiguration getApsClientConfiguration() {

	public ApsClientJerseyConfiguration getApsClientConfiguration() {

		this.getLog().debug("Configuring APS to URL: " + this.activitiAppBaseUrl);

		ApsClientConfiguration config = new ApsClientConfiguration();

		ApsClientJerseyConfiguration config = new ApsClientJerseyConfiguration();

		config.setBaseUrl(this.activitiAppBaseUrl);

		switch (this.activitiAppAuthType.toUpperCase()) {

			case "BASIC":
@@ -88,7 +88,7 @@ public abstract class ApsAddressibleGoal extends DisablableGoal { 
	

	public synchronized ApsPublicRestApiJerseyImpl getApsApi() {

		if (this.api == null) {

			ApsClientConfiguration config = this.getApsClientConfiguration();

			ApsClientJerseyConfiguration config = this.getApsClientConfiguration();

			ApsClientJerseyImpl apsClient = new ApsClientJerseyImpl(config);

			this.api = new ApsPublicRestApiJerseyImpl(apsClient);

		}

src/main/java/com/inteligr8/maven/aps/modeling/translator/ApsAppJsonTranslator.java

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory; 


import com.fasterxml.jackson.databind.JsonNode;

import com.fasterxml.jackson.databind.node.ObjectNode;

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

import com.inteligr8.alfresco.activiti.model.GroupLight;

import com.inteligr8.maven.aps.modeling.util.Index;

import com.inteligr8.maven.aps.modeling.util.ModelUtil;
@@ -17,12 +17,12 @@ public class ApsAppJsonTranslator implements ApsFileTranslator { 


	private final Logger logger = LoggerFactory.getLogger(ApsAppJsonTranslator.class);

	

	private Map<String, Group> apsOrgIndex;

	private Map<String, GroupLight> apsOrgIndex;

	private Index<Long, String> apsProcessIndex;

	private Index<Long, String> fileProcessIndex;

	

	public ApsAppJsonTranslator(

			Map<String, Group> apsOrgIndex,

			Map<String, GroupLight> apsOrgIndex,

			Index<Long, String> apsProcessIndex,

			Index<Long, String> fileProcessIndex) {

		this.apsOrgIndex = apsOrgIndex;

src/main/java/com/inteligr8/maven/aps/modeling/translator/ApsAppTranslator.java

+6 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ import com.inteligr8.alfresco.activiti.ApsPublicRestApi; 
import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;

import com.inteligr8.alfresco.activiti.api.ModelsApi.ModelType;

import com.inteligr8.alfresco.activiti.model.Datum;

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

import com.inteligr8.alfresco.activiti.model.GroupLight;

import com.inteligr8.alfresco.activiti.model.ResultListDataRepresentation;

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

import com.inteligr8.maven.aps.modeling.crawler.ApsAppCrawlable;
@@ -31,7 +31,7 @@ public class ApsAppTranslator implements ApsAppCrawlable { 
	private final File appDirectory;

	

	private boolean indexesBuilt = false;

	private Map<String, Group> apsOrgIndex;

	private Map<String, GroupLight> apsOrgIndex;

	private Index<Long, String> apsFormIndex;

	private Index<Long, String> apsProcessIndex;

	private Index<Long, String> fileFormIndex;
@@ -137,11 +137,11 @@ public class ApsAppTranslator implements ApsAppCrawlable { 
		return (tenants == null || tenants.isEmpty()) ? null : tenants.iterator().next().getId();

	}

	

	protected Map<String, Group> buildApsGroupMap(long tenantId) {

		List<Group> groups = this.api.getAdminApi().getGroups(tenantId, true, true);

	protected Map<String, GroupLight> buildApsGroupMap(long tenantId) {

		List<GroupLight> groups = this.api.getAdminApi().getGroups(tenantId, true, true);



		Map<String, Group> map = new HashMap<>(groups.size());

		for (Group group : groups)

		Map<String, GroupLight> map = new HashMap<>(groups.size());

		for (GroupLight group : groups)

			map.put(group.getName(), group);

		return map;

	}

src/main/java/com/inteligr8/maven/aps/modeling/translator/ApsProcessBpmnTranslator.java

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import org.w3c.dom.Element; 
import org.w3c.dom.NodeList;

import org.xml.sax.SAXException;



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

import com.inteligr8.alfresco.activiti.model.GroupLight;

import com.inteligr8.maven.aps.modeling.util.Index;

import com.inteligr8.maven.aps.modeling.util.ModelUtil;
@@ -33,13 +33,13 @@ public class ApsProcessBpmnTranslator implements ApsFileTranslator { 
	

	private final Logger logger = LoggerFactory.getLogger(ApsProcessBpmnTranslator.class);

	private final Index<Long, String> apsIndex;

	private final Map<String, Group> apsOrgIndex;

	private final Map<String, GroupLight> apsOrgIndex;

	private final Index<Long, String> apsFormIndex;

	private final Index<Long, String> fileFormIndex;

	

	public ApsProcessBpmnTranslator(

			Index<Long, String> apsProcessIndex,

			Map<String, Group> apsOrgIndex,

			Map<String, GroupLight> apsOrgIndex,

			Index<Long, String> apsFormIndex,

			Index<Long, String> fileFormIndex) {

		this.apsIndex = apsProcessIndex;