Merge branch 'develop-jersey' into stable-jersey

pom.xml

@@ -5,11 +5,11 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>aps-public-rest-client</artifactId>
-	<version>3.0.3</version>
-
+	<version>3.0.0-jersey</version>
+	
 	<name>Alfresco Process Services ReST API Client for Java</name>
-	<description>An APS Client library for building REST API clients that support either the CXF and Jersey frameworks</description>
-	<url>https://git.inteligr8.com/inteligr8/aps-public-rest-client</url>
+	<description>An APS Client library for building Jersey-based REST API clients</description>
+	<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
 
 	<licenses>
 		<license>
@@ -19,9 +19,9 @@
 	</licenses>
 
 	<scm>
-		<connection>scm:git:https://git.inteligr8.com/inteligr8/aps-public-rest-client.git</connection>
-		<developerConnection>scm:git:git@git.inteligr8.com:inteligr8/aps-public-rest-client.git</developerConnection>
-		<url>https://git.inteligr8.com/inteligr8/aps-public-rest-client</url>
+		<connection>scm:git:https://bitbucket.org/inteligr8/aps-public-rest-client.git</connection>
+		<developerConnection>scm:git:git@bitbucket.org:inteligr8/aps-public-rest-client.git</developerConnection>
+		<url>https://bitbucket.org/inteligr8/aps-public-rest-client</url>
 	</scm>
 	<organization>
 		<name>Inteligr8</name>
@@ -41,27 +41,30 @@
 		<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>
 
-		<spring.version>6.2.18</spring.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>3.0.4</version>
+			<version>3.0.0-jersey</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>aps-public-rest-api</artifactId>
-			<version>3.1.0</version>
+			<version>3.0.0</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
-
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.14.3</version>
+			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -82,31 +85,83 @@
 			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<!-- Jersey libraries -->
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey.version}</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		
+		<!-- Jersey inclusion fallout -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
 	</dependencies>
 	
 	<build>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.5</version>
-				</plugin>
-				<plugin>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.5.5</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>build-helper-maven-plugin</artifactId>
-					<version>3.6.1</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.2.0</version>
+				<executions>
+					<execution>
+						<id>add-jaxrs-src</id>
+						<goals><goal>add-source</goal></goals>
+						<configuration>
+							<sources>
+								<source>src/main/jersey</source>
+							</sources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>add-test-src</id>
+						<goals><goal>add-test-source</goal></goals>
+						<configuration>
+							<sources>
+								<source>src/test/jersey</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.1.0</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>${junit.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>3.1.0</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>${junit.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
 	</build>
 
 	<profiles>
 		<profile>
-			<id>central-publish</id>
+			<id>ossrh-release</id>
 			<properties>
 				<maven.deploy.skip>true</maven.deploy.skip>
 			</properties>
@@ -124,6 +179,7 @@
 					</plugin>
 					<plugin>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>3.3.2</version>
 						<executions>
 							<execution>
 								<id>javadoc</id>
@@ -147,20 +203,19 @@
 						</executions>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.central</groupId>
-						<artifactId>central-publishing-maven-plugin</artifactId>
-						<version>0.10.0</version>
-						<extensions>true</extensions>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>1.6.13</version>
 						<configuration>
-							<publishingServerId>central</publishingServerId>
-							<autoPublish>true</autoPublish>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
-						<!-- for some reason this is required... -->
 						<executions>
 							<execution>
-								<id>deploy</id>
+								<id>ossrh-deploy</id>
 								<phase>deploy</phase>
-								<goals><goal>publish</goal></goals>
+								<goals><goal>deploy</goal></goals>
 							</execution>
 						</executions>
 					</plugin>

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

@@ -0,0 +1,46 @@
+/*
+ * 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.Value;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+import com.inteligr8.rs.ClientJerseyConfiguration;
+
+/**
+ * This class provides a POJO &amp; Spring-based implementation of the
+ * ClientJerseyConfiguration interface.  You can use it outside of the Spring
+ * context, but you will need the spring-context and spring-beans libraries in
+ * your non-Spring application.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Configuration
+@ComponentScan
+public class ApsClientJerseyConfiguration extends ApsClientConfiguration implements ClientJerseyConfiguration {
+	
+	@Value("${process.service.jersey.putBodyRequired:true}")
+	private boolean putBodyRequired;
+	
+	public boolean isPutBodyRequired() {
+		return this.putBodyRequired;
+	}
+
+	public void setPutBodyRequired(boolean putBodyRequired) {
+		this.putBodyRequired = putBodyRequired;
+	}
+
+}

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

@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+import com.inteligr8.rs.ClientJerseyImpl;
+
+/**
+ * This class provides a POJO &amp; Spring-based implementation of the Jersey
+ * client configured for APS.  You can use it outside of the Spring context,
+ * but you will need the spring-context and spring-beans libraries in your
+ * non-Spring application.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("aps.client.jersey")
+@Lazy
+public class ApsClientJerseyImpl extends ClientJerseyImpl {
+	
+	/**
+	 * This constructor is for Spring and POJO use
+	 */
+	@Autowired
+	public ApsClientJerseyImpl(ApsClientJerseyConfiguration config) {
+		super(config);
+	}
+
+}

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

@@ -14,28 +14,26 @@
  */
 package com.inteligr8.alfresco.activiti;
 
-import com.inteligr8.rs.Client;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
 
 /**
- * This class serves as the entrypoint to the JAX-RS API for the APS Public
+ * This class provides the Jersey client 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);
+@Component("aps.api.jersey")
+@Lazy
+public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApiImpl implements ApsPublicRestJerseyApi {
+
+	/**
+	 * This constructor is for Spring or POJO use
+	 */
+	@Autowired
+	public ApsPublicRestApiJerseyImpl(ApsClientJerseyImpl client) {
+		super(client);
 	}
 
 }

src/test/jersey/META-INF/services/javax.ws.rs.client.ClientBuilder

@@ -0,0 +1 @@
+org.glassfish.jersey.client.JerseyClientBuilder

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

@@ -0,0 +1,51 @@
+/*
+ * 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 java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import com.inteligr8.alfresco.activiti.model.Tenant;
+import com.inteligr8.rs.ClientConfiguration;
+
+@TestPropertySource(locations = {"/local.properties"})
+@SpringJUnitConfig(classes = {ApsClientJerseyConfiguration.class, ApsPublicRestApiJerseyImpl.class, ApsClientJerseyImpl.class})
+public class ArrayResponseUnitTest extends ConditionalIT {
+	
+	@Autowired
+	@Qualifier("aps.api.jersey")
+	private ApsPublicRestApiImpl api;
+	
+	@Override
+	public ClientConfiguration getConfiguration() {
+		return this.api.getClient().getConfig();
+	}
+	
+	@Test
+	@EnabledIf("hostExists")
+	public void testTenants() {
+		List<Tenant> objs = this.api.getAdminApi().getTenants();
+		
+		Assertions.assertNotNull(objs);
+	}
+
+}

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

@@ -0,0 +1,45 @@
+/*
+ * 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.junit.jupiter.api.BeforeAll;
+
+import com.inteligr8.rs.ClientConfiguration;
+
+public class ConnectionJerseyClientPojoIT extends ConnectionClientIT {
+	
+	private static ApsPublicRestApiImpl api;
+	
+	@BeforeAll
+	public static void initClient() {
+		ApsClientJerseyConfiguration config = new ApsClientJerseyConfiguration();
+		config.setBaseUrl("http://localhost:8080/activiti-app");
+		config.setBasicAuthUsername("admin");
+		config.setBasicAuthPassword("admin");
+		
+		api = new ApsPublicRestApiJerseyImpl(
+				new ApsClientJerseyImpl(config));
+	}
+	
+	public ApsPublicRestApiImpl getApi() {
+		return api;
+	}
+	
+	@Override
+	public ClientConfiguration getConfiguration() {
+		return api.getClient().getConfig();
+	}
+
+}

src/test/jersey/com/inteligr8/alfresco/activiti/ConnectionJerseyClientSpringIT.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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import com.inteligr8.rs.ClientConfiguration;
+
+@TestPropertySource(locations = {"/local.properties"})
+@SpringJUnitConfig(classes = {ApsClientJerseyConfiguration.class, ApsPublicRestApiJerseyImpl.class, ApsClientJerseyImpl.class})
+public class ConnectionJerseyClientSpringIT extends ConnectionClientIT {
+	
+	@Autowired
+	@Qualifier("aps.api.jersey")
+	private ApsPublicRestApiImpl api;
+	
+	public ApsPublicRestApiImpl getApi() {
+		return this.api;
+	}
+	
+	@Override
+	public ClientConfiguration getConfiguration() {
+		return this.api.getClient().getConfig();
+	}
+
+}

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

@@ -0,0 +1,57 @@
+/*
+ * 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 java.util.List;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import com.inteligr8.alfresco.activiti.model.GroupLight;
+import com.inteligr8.activiti.model.ResultList;
+import com.inteligr8.alfresco.activiti.model.UserLight;
+import com.inteligr8.rs.ClientConfiguration;
+
+@TestPropertySource(locations = {"/local.properties"})
+@SpringJUnitConfig(classes = {ApsClientJerseyConfiguration.class, ApsPublicRestApiJerseyImpl.class, ApsClientJerseyImpl.class})
+public class ResultListResponseUnitTest extends ConditionalIT {
+	
+	@Autowired
+	@Qualifier("aps.api.jersey")
+	private ApsPublicRestApiImpl api;
+	
+	@Override
+	public ClientConfiguration getConfiguration() {
+		return this.api.getClient().getConfig();
+	}
+	
+	@Test
+	@EnabledIf("hostExists")
+	public void testGroupMembers() {
+		List<GroupLight> groups = this.api.getAdminApi().getGroups(1L, false, false);
+		Assertions.assertFalse(groups.isEmpty());
+		
+		for (GroupLight group : groups) {
+			ResultList<UserLight> users = this.api.getAdminApi().getMembers(group.getId(), null, null, null);
+			Assertions.assertNotNull(users);
+		}
+	}
+
+}