Commit 78b7fc2e authored by Brian Long's avatar Brian Long
Browse files

updated to latest APS API/client

parent 63ffd776

pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -44,19 +44,19 @@ 
		<maven.compiler.target>1.8</maven.compiler.target>

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

		

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

		<jersey.version>2.39.1</jersey.version>

	</properties>



	<dependencies>

		<dependency>

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

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

			<version>2.0.3-aps1</version>

			<version>2.0.8</version>

		</dependency>

		<dependency>

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

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

			<version>2.0.2-jersey</version>

			<version>2.0.3-jersey</version>

		</dependency>

		<dependency>

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

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

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import java.util.Map; 
import org.apache.maven.plugin.MojoExecutionException;

import org.apache.maven.plugins.annotations.Parameter;



import com.inteligr8.activiti.model.Datum;

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.ResultListDataRepresentation;

import com.inteligr8.alfresco.activiti.model.Tenant;
@@ -70,7 +70,7 @@ public abstract class ApsAppAccessibleGoal extends ApsAddressibleGoal { 
		Map<String, Long> apps = new HashMap<>(16);



		this.getLog().debug("Searching for all APS Apps");

		ResultListDataRepresentation results = api.getModelsApi().get("everyone", null, ModelType.App.getId(), null);

		ResultListDataRepresentation<Datum> results = api.getModelsApi().get("everyone", null, ModelType.App.getId(), null);

		this.getLog().debug("Found " + results.getTotal() + " APS Apps");

		for (Datum datum : results.getData()) {

			String name = (String)datum.getAdditionalProperties().get("name");

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

+3 −3
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ import org.apache.maven.plugins.annotations.Mojo; 
import org.apache.maven.plugins.annotations.Parameter;

import org.codehaus.plexus.component.annotations.Component;



import com.inteligr8.activiti.model.Datum;

import com.inteligr8.activiti.model.ResultList;

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

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

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

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

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

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

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

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

import com.inteligr8.alfresco.activiti.model.SharePermission;
@@ -108,7 +108,7 @@ public class ApsShareGoal extends ApsAddressibleGoal { 
	}

	

	private void shareModels(ModelsApi.ModelType modelType, Set<String> readers, Set<String> editors) {

		ResultListDataRepresentation models = this.getApsApi().getModelsApi().get(null, null, modelType.getId(), null);

		ResultListDataRepresentation<Datum> models = this.getApsApi().getModelsApi().get(null, null, modelType.getId(), null);

		if (models.getData() == null)

			return;

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

+4 −3
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ import java.util.regex.Pattern; 
import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.inteligr8.activiti.model.Datum;

import com.inteligr8.alfresco.activiti.ApsPublicRestApi;

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

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

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

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

import com.inteligr8.alfresco.activiti.model.Tenant;
@@ -196,8 +196,9 @@ public class ApsAppTranslator implements ApsAppCrawlable { 
		return map;

	}

	

	@SuppressWarnings("unchecked")

    protected Index<Long, String> buildApsModelIndex(ModelType modelType) {

		ResultListDataRepresentation results = this.api.getModelsApi().get("everyone", null, modelType.getId(), null);

		ResultListDataRepresentation<Datum> results = this.api.getModelsApi().get("everyone", null, modelType.getId(), null);

		this.logger.debug("APS {} models found: {} out of {}", modelType, results.getSize(), results.getTotal());



		Index<Long, String> map = new Index<>(results.getSize().intValue(), false);