inteligr8/aps-model-maven-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated aps-public-rest projects

Browse Source
This commit is contained in:
Brian Long 2022-05-03 13:46:48 +01:00
parent cf051cac8a
commit 0c9dff2e23
6 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pom.xml
View File

@ -34,36 +34,27 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<maven.version>3.6.3</maven.version> <maven.version>3.6.3</maven.version>
<jersey.version>2.34</jersey.version> <jersey.version>2.35</jersey.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>aps-public-rest-api</artifactId> <artifactId>aps-public-rest-api</artifactId>
<version>1.2.3</version> <version>2.0.0</version>
<classifier>aps1</classifier> <classifier>aps1</classifier>
</dependency> </dependency>
<dependency>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>aps-public-rest-client</artifactId>
<version>2.0.0</version>
<classifier>jersey</classifier>
</dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.4</version> <version>3.4</version>
</dependency> </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> <dependency>
<groupId>org.glassfish.jersey.inject</groupId> <groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId> <artifactId>jersey-hk2</artifactId>

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

@ -4,7 +4,7 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.settings.Server; 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.ApsClientJerseyImpl;
import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl; import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;
@ -36,9 +36,9 @@ public abstract class ApsAddressibleGoal extends DisablableGoal {
private ApsPublicRestApiJerseyImpl api; private ApsPublicRestApiJerseyImpl api;
public ApsClientConfiguration getApsClientConfiguration() { public ApsClientJerseyConfiguration getApsClientConfiguration() {
this.getLog().debug("Configuring APS to URL: " + this.activitiAppBaseUrl); this.getLog().debug("Configuring APS to URL: " + this.activitiAppBaseUrl);
ApsClientConfiguration config = new ApsClientConfiguration(); ApsClientJerseyConfiguration config = new ApsClientJerseyConfiguration();
config.setBaseUrl(this.activitiAppBaseUrl); config.setBaseUrl(this.activitiAppBaseUrl);
switch (this.activitiAppAuthType.toUpperCase()) { switch (this.activitiAppAuthType.toUpperCase()) {
case "BASIC": case "BASIC":
@ -88,7 +88,7 @@ public abstract class ApsAddressibleGoal extends DisablableGoal {
public synchronized ApsPublicRestApiJerseyImpl getApsApi() { public synchronized ApsPublicRestApiJerseyImpl getApsApi() {
if (this.api == null) { if (this.api == null) {
ApsClientConfiguration config = this.getApsClientConfiguration(); ApsClientJerseyConfiguration config = this.getApsClientConfiguration();
ApsClientJerseyImpl apsClient = new ApsClientJerseyImpl(config); ApsClientJerseyImpl apsClient = new ApsClientJerseyImpl(config);
this.api = new ApsPublicRestApiJerseyImpl(apsClient); this.api = new ApsPublicRestApiJerseyImpl(apsClient);
} }

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

@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode; 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.Index;
import com.inteligr8.maven.aps.modeling.util.ModelUtil; 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 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> apsProcessIndex;
private Index<Long, String> fileProcessIndex; private Index<Long, String> fileProcessIndex;
public ApsAppJsonTranslator( public ApsAppJsonTranslator(
Map<String, Group> apsOrgIndex, Map<String, GroupLight> apsOrgIndex,
Index<Long, String> apsProcessIndex, Index<Long, String> apsProcessIndex,
Index<Long, String> fileProcessIndex) { Index<Long, String> fileProcessIndex) {
this.apsOrgIndex = apsOrgIndex; this.apsOrgIndex = apsOrgIndex;

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

@ -16,7 +16,7 @@ import com.inteligr8.alfresco.activiti.ApsPublicRestApi;
import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl; import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;
import com.inteligr8.alfresco.activiti.api.ModelsApi.ModelType; import com.inteligr8.alfresco.activiti.api.ModelsApi.ModelType;
import com.inteligr8.alfresco.activiti.model.Datum; 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.ResultListDataRepresentation;
import com.inteligr8.alfresco.activiti.model.Tenant; import com.inteligr8.alfresco.activiti.model.Tenant;
import com.inteligr8.maven.aps.modeling.crawler.ApsAppCrawlable; import com.inteligr8.maven.aps.modeling.crawler.ApsAppCrawlable;
@ -31,7 +31,7 @@ public class ApsAppTranslator implements ApsAppCrawlable {
private final File appDirectory; private final File appDirectory;
private boolean indexesBuilt = false; private boolean indexesBuilt = false;
private Map<String, Group> apsOrgIndex; private Map<String, GroupLight> apsOrgIndex;
private Index<Long, String> apsFormIndex; private Index<Long, String> apsFormIndex;
private Index<Long, String> apsProcessIndex; private Index<Long, String> apsProcessIndex;
private Index<Long, String> fileFormIndex; private Index<Long, String> fileFormIndex;
@ -137,11 +137,11 @@ public class ApsAppTranslator implements ApsAppCrawlable {
return (tenants == null || tenants.isEmpty()) ? null : tenants.iterator().next().getId(); return (tenants == null || tenants.isEmpty()) ? null : tenants.iterator().next().getId();
} }
protected Map<String, Group> buildApsGroupMap(long tenantId) { protected Map<String, GroupLight> buildApsGroupMap(long tenantId) {
List<Group> groups = this.api.getAdminApi().getGroups(tenantId, true, true); List<GroupLight> groups = this.api.getAdminApi().getGroups(tenantId, true, true);
Map<String, Group> map = new HashMap<>(groups.size()); Map<String, GroupLight> map = new HashMap<>(groups.size());
for (Group group : groups) for (GroupLight group : groups)
map.put(group.getName(), group); map.put(group.getName(), group);
return map; return map;
} }

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

@ -22,7 +22,7 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.SAXException; 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.Index;
import com.inteligr8.maven.aps.modeling.util.ModelUtil; 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 Logger logger = LoggerFactory.getLogger(ApsProcessBpmnTranslator.class);
private final Index<Long, String> apsIndex; 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> apsFormIndex;
private final Index<Long, String> fileFormIndex; private final Index<Long, String> fileFormIndex;
public ApsProcessBpmnTranslator( public ApsProcessBpmnTranslator(
Index<Long, String> apsProcessIndex, Index<Long, String> apsProcessIndex,
Map<String, Group> apsOrgIndex, Map<String, GroupLight> apsOrgIndex,
Index<Long, String> apsFormIndex, Index<Long, String> apsFormIndex,
Index<Long, String> fileFormIndex) { Index<Long, String> fileFormIndex) {
this.apsIndex = apsProcessIndex; this.apsIndex = apsProcessIndex;

6
src/main/java/com/inteligr8/maven/aps/modeling/translator/ApsProcessJsonTranslator.java
View File

@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode; 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.Index;
import com.inteligr8.maven.aps.modeling.util.ModelUtil; import com.inteligr8.maven.aps.modeling.util.ModelUtil;
@ -18,12 +18,12 @@ public class ApsProcessJsonTranslator implements ApsFileTranslator {
private final Logger logger = LoggerFactory.getLogger(ApsProcessJsonTranslator.class); private final Logger logger = LoggerFactory.getLogger(ApsProcessJsonTranslator.class);
private final Index<Long, String> apsIndex; 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> apsFormIndex;
public ApsProcessJsonTranslator( public ApsProcessJsonTranslator(
Index<Long, String> apsProcessIndex, Index<Long, String> apsProcessIndex,
Map<String, Group> apsOrgIndex, Map<String, GroupLight> apsOrgIndex,
Index<Long, String> apsFormIndex) { Index<Long, String> apsFormIndex) {
this.apsIndex = apsProcessIndex; this.apsIndex = apsProcessIndex;
this.apsOrgIndex = apsOrgIndex; this.apsOrgIndex = apsOrgIndex;