Merge branch 'stable' into stable-jersey

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-client</artifactId>
-	<version>2.0.2-jersey</version>
+	<version>3.0.1-jersey</version>
 	
 	<name>Alfresco Process Services ReST API Client for Java</name>
 	<description>An APS Client library for building Jersey-based REST API clients</description>
@@ -38,27 +38,27 @@
 
 	<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.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.release>11</maven.compiler.release>
 		<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
 
-		<aps.app.tag>aps1</aps.app.tag>
-
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.2.14.RELEASE</spring.version>
-		<jersey.version>2.35</jersey.version>
+		<junit.version>5.10.0</junit.version>
+		<spring.version>6.0.19</spring.version>
+		<jersey.version>3.1.8</jersey.version>
+		<jackson.version>2.17.2</jackson.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.1-jersey</version>
+			<version>3.0.0-jersey</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>aps-public-rest-api</artifactId>
-			<version>2.0.3-${aps.app.tag}</version>
+			<version>3.0.2</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
 		<dependency>
@@ -76,13 +76,13 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.9</version>
+			<version>4.5.14</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.17.2</version>
+			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -91,13 +91,19 @@
 			<groupId>org.glassfish.jersey.inject</groupId>
 			<artifactId>jersey-hk2</artifactId>
 			<version>${jersey.version}</version>
-			<scope>test</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-jackson</artifactId>
 			<version>${jersey.version}</version>
-			<scope>test</scope>
+		</dependency>
+		
+		<!-- Jersey inclusion fallout -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
 		</dependency>
 	</dependencies>
 	
@@ -130,7 +136,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.1.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>
@@ -141,7 +147,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.1.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>

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

@@ -61,6 +61,12 @@ public abstract class ApsClientConfiguration implements ClientConfiguration {
 	@Value("${process.service.security.oauth.grantPassword:#{null}}")
 	private String oAuthPassword;
 
+    @Value("${process.service.http.connectTimeout:#{null}}")
+    private Integer connectTimeoutInMillis;
+
+    @Value("${process.service.http.responseTimeout:#{null}}")
+    private Integer responseTimeoutInMillis;
+
 	public String getBaseUrl() {
 		return this.baseUrl;
 	}
@@ -148,5 +154,23 @@ public abstract class ApsClientConfiguration implements ClientConfiguration {
 	public void setOAuthPassword(String oAuthPassword) {
 		this.oAuthPassword = oAuthPassword;
 	}
+    
+    @Override
+    public Integer getConnectTimeoutInMillis() {
+        return this.connectTimeoutInMillis;
+    }
+    
+    public void setConnectTimeoutInMillis(Integer connectTimeoutInMillis) {
+        this.connectTimeoutInMillis = connectTimeoutInMillis;
+    }
+    
+    @Override
+    public Integer getResponseTimeoutInMillis() {
+        return this.responseTimeoutInMillis;
+    }
+    
+    public void setResponseTimeoutInMillis(Integer responseTimeoutInMillis) {
+        this.responseTimeoutInMillis = responseTimeoutInMillis;
+    }
 
 }

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

@@ -0,0 +1,41 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti;
+
+import com.inteligr8.rs.Client;
+
+/**
+ * This class serves as the entrypoint to the JAX-RS API for the APS Public
+ * ReST API.
+ * 
+ * @author brian@inteligr8.com
+ */
+public class ApsProtectedRestApiImpl implements ApsProtectedRestApi {
+	
+	private Client client;
+	
+	public ApsProtectedRestApiImpl(Client client) {
+		this.client = client;
+	}
+	
+	public Client getClient() {
+		return this.client;
+	}
+	
+	public final <T> T getApi(Class<T> apiClass) {
+		return this.client.getApi(apiClass);
+	}
+
+}

src/main/jersey/com/inteligr8/alfresco/activiti/ApsProtectedRestApiJerseyImpl.java

@@ -0,0 +1,39 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.alfresco.activiti;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the Jersey client to the JAX-RS API for the Activiti &
+ * APS public ReST API and some non-public APS ReST API.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("aps.protected-api.jersey")
+@Lazy
+public class ApsProtectedRestApiJerseyImpl extends ApsProtectedRestApiImpl implements ApsPublicRestJerseyApi {
+
+	/**
+	 * This constructor is for Spring or POJO use
+	 */
+	@Autowired
+	public ApsProtectedRestApiJerseyImpl(ApsClientJerseyImpl client) {
+		super(client);
+	}
+
+}

src/test/jersey/com/inteligr8/alfresco/activiti/ResultListResponseUnitTest.java

@@ -25,7 +25,7 @@ import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import com.inteligr8.alfresco.activiti.model.GroupLight;
-import com.inteligr8.alfresco.activiti.model.ResultList;
+import com.inteligr8.activiti.model.ResultList;
 import com.inteligr8.alfresco.activiti.model.UserLight;
 import com.inteligr8.rs.ClientConfiguration;