Commit ee0f0b48 authored by Brian Long's avatar Brian Long
Browse files

added DecisionTable support

parent 04d26fb2

pom.xml

+12 −12
Original line number Diff line number Diff line
@@ -42,26 +42,26 @@ 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

		<maven.compiler.source>1.8</maven.compiler.source>

		<maven.compiler.target>1.8</maven.compiler.target>

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

		<maven.version>3.9.9</maven.version>

		

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

		<jersey.version>2.46</jersey.version>

	</properties>



	<dependencies>

		<dependency>

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

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

			<version>2.0.17</version>

			<version>3.0.5</version>

		</dependency>

		<dependency>

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

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

			<version>2.0.5-jersey</version>

			<version>3.0.2-jersey</version>

		</dependency>

		<dependency>

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

			<artifactId>commons-lang3</artifactId>

			<version>3.4</version>

			<version>3.17.0</version>

		</dependency>

		<dependency>

			<groupId>org.glassfish.jersey.inject</groupId>
@@ -76,7 +76,7 @@ 
		<dependency>

			<groupId>org.apache.maven.shared</groupId>

			<artifactId>file-management</artifactId>

			<version>3.0.0</version>

			<version>3.1.0</version>

		</dependency>

		<dependency>

			<groupId>org.apache.maven</groupId>
@@ -87,7 +87,7 @@ 
		<dependency>

			<groupId>org.apache.maven.plugin-tools</groupId>

			<artifactId>maven-plugin-annotations</artifactId>

			<version>3.6.0</version>

			<version>3.15.1</version>

			<scope>provided</scope>

		</dependency>

		<dependency>
@@ -111,7 +111,7 @@ 
		<dependency>

			<groupId>junit</groupId>

			<artifactId>junit</artifactId>

			<version>4.12</version>

			<version>4.13.2</version>

			<scope>test</scope>

		</dependency>

	</dependencies>
@@ -121,7 +121,7 @@ 
			<plugins>

				<plugin>

					<artifactId>maven-invoker-plugin</artifactId>

					<version>3.2.2</version>

					<version>3.9.0</version>

					<configuration>

						<projectsDirectory>${basedir}/src/it</projectsDirectory>

						<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -146,7 +146,7 @@ 
		<plugins>

			<plugin>

				<artifactId>maven-plugin-plugin</artifactId>

				<version>3.6.1</version>

				<version>3.15.1</version>

				<configuration>

					<goalPrefix>aps-model</goalPrefix>

				</configuration>
@@ -168,7 +168,7 @@ 
			<plugin>

				<groupId>org.codehaus.plexus</groupId>

				<artifactId>plexus-component-metadata</artifactId>

				<version>2.0.0</version>

				<version>2.2.0</version>

				<executions>

					<execution>

						<goals>
@@ -269,7 +269,7 @@ 
					<plugin>

						<groupId>org.sonatype.plugins</groupId>

						<artifactId>nexus-staging-maven-plugin</artifactId>

						<version>1.6.13</version>

						<version>1.7.0</version>

						<extensions>true</extensions>

						<configuration>

							<serverId>ossrh</serverId>

src/main/java/com/inteligr8/maven/aps/modeling/crawler/ApsAppCrawlable.java

+5 −0
Original line number Diff line number Diff line
@@ -45,4 +45,9 @@ public interface ApsAppCrawlable { 
	 */

	ApsFileTransformer getFormJsonTransformer();



    /**

     * @return A file transformer for APS Decision Table JSON files.

     */

    ApsFileTransformer getDecisionTableJsonTransformer();



}

src/main/java/com/inteligr8/maven/aps/modeling/crawler/ApsAppCrawler.java

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ public class ApsAppCrawler { 


		this.transform(crawlable.getAppJsonTransformer(), this.appDescriptor, this.appName, null);

		this.crawlModels("form-models", crawlable.getFormJsonTransformer());

        this.crawlModels("decision-table-models", crawlable.getDecisionTableJsonTransformer());

		this.crawlModels("bpmn-models", processTransformers);

		this.crawlModels("bpmn-subprocess-models", crawlable.getProcessJsonTransformer());

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import org.apache.maven.settings.crypto.SettingsDecrypter; 


import com.inteligr8.alfresco.activiti.ApsClientJerseyConfiguration;

import com.inteligr8.alfresco.activiti.ApsClientJerseyImpl;

import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;

import com.inteligr8.alfresco.activiti.ApsProtectedRestApiJerseyImpl;

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



/**
@@ -66,7 +66,7 @@ public abstract class ApsAddressibleGoal extends DisablableGoal { 
    @Component

    private SettingsDecrypter decrypter;

	

	private ApsPublicRestApiJerseyImpl api;

	private ApsProtectedRestApiJerseyImpl api;

	

	/**

	 * Retrieves an APS client configuration.
@@ -146,11 +146,11 @@ public abstract class ApsAddressibleGoal extends DisablableGoal { 
	 * @return An APS API instance.

     * @throws MojoExecutionException The APS API failed to initialize.

	 */

	public synchronized ApsPublicRestApiJerseyImpl getApsApi() throws MojoExecutionException {

	public synchronized ApsProtectedRestApiJerseyImpl getApsApi() throws MojoExecutionException {

		if (this.api == null) {

			ApsClientJerseyConfiguration config = this.getApsClientConfiguration();

			ApsClientJerseyImpl apsClient = new ApsClientJerseyImpl(config);

			this.api = new ApsPublicRestApiJerseyImpl(apsClient);

			this.api = new ApsProtectedRestApiJerseyImpl(apsClient);

		}

		

		return this.api;

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import org.apache.maven.plugin.MojoExecutionException; 
import org.apache.maven.plugins.annotations.Parameter;



import com.inteligr8.activiti.model.ResultList;

import com.inteligr8.alfresco.activiti.ApsPublicRestApiJerseyImpl;

import com.inteligr8.alfresco.activiti.ApsPublicRestApi;

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

import com.inteligr8.alfresco.activiti.model.ModelRepresentation;
@@ -49,7 +49,7 @@ public abstract class ApsAppAddressibleGoal extends ApsAddressibleGoal { 
     * @throws MojoExecutionException The APS API failed to initialize.

	 */

	protected Map<String, ModelRepresentation> buildAppNameMap() throws MojoExecutionException {

		ApsPublicRestApiJerseyImpl api = this.getApsApi();

		ApsPublicRestApi api = this.getApsApi();

		

		Map<String, ModelRepresentation> apps = new HashMap<>(16);