v2.0.4-jersey

pom.xml

@@ -6,10 +6,10 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-client</artifactId>
-	<version>2.0.1-cxf</version>
+	<version>2.0.4-jersey</version>
 	
 	<name>Alfresco Content Services ReST API Client for Java</name>
-	<description>An ACS Client library for building CXF-based REST API clients</description>
+	<description>An ACS Client library for building Jersey-based REST API clients</description>
 	<url>https://bitbucket.org/inteligr8/acs-public-rest-client</url>
 
 	<licenses>
@@ -46,20 +46,21 @@
 		<acs.platform.tag>acs7</acs.platform.tag>
 
 		<junit.version>5.7.2</junit.version>
-		<spring.version>5.2.14.RELEASE</spring.version>
-		<cxf.version>3.4.7</cxf.version>
+		<spring.version>5.3.6</spring.version>
+		<jersey.version>2.39.1</jersey.version>
+		<jackson.version>2.15.1</jackson.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.1-cxf</version>
+			<version>2.0.8-jersey</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>acs-public-rest-api</artifactId>
-			<version>2.0.1-${acs.platform.tag}</version>
+			<version>2.1-SNAPSHOT-${acs.platform.tag}</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
 		<dependency>
@@ -77,15 +78,35 @@
 		<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.19.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 library fallout -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
 	</dependencies>
 	
 	<build>
@@ -100,7 +121,7 @@
 						<goals><goal>add-source</goal></goals>
 						<configuration>
 							<sources>
-								<source>src/main/cxf</source>
+								<source>src/main/jersey</source>
 							</sources>
 						</configuration>
 					</execution>
@@ -109,7 +130,7 @@
 						<goals><goal>add-test-source</goal></goals>
 						<configuration>
 							<sources>
-								<source>src/test/cxf</source>
+								<source>src/test/jersey</source>
 							</sources>
 						</configuration>
 					</execution>
@@ -117,7 +138,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>
@@ -128,7 +149,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/acs/AcsClientConfiguration.java

@@ -61,6 +61,12 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
 	@Value("${content.service.security.oauth.grantPassword:#{null}}")
 	private String oAuthPassword;
 
+    @Value("${content.service.http.connectTimeout:#{null}}")
+    private Integer connectTimeoutInMillis;
+
+    @Value("${content.service.http.responseTimeout:#{null}}")
+    private Integer responseTimeoutInMillis;
+
 	public String getBaseUrl() {
 		return this.baseUrl;
 	}
@@ -148,5 +154,23 @@ public abstract class AcsClientConfiguration 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/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyConfiguration.java

@@ -18,11 +18,11 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import com.inteligr8.rs.ClientCxfConfiguration;
+import com.inteligr8.rs.ClientJerseyConfiguration;
 
 /**
  * This class provides a POJO & Spring-based implementation of the
- * ClientCxfConfiguration interface.  You can use it outside of the Spring
+ * 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.
  * 
@@ -30,17 +30,17 @@ import com.inteligr8.rs.ClientCxfConfiguration;
  */
 @Configuration
 @ComponentScan
-public class AcsClientCxfConfiguration extends AcsClientConfiguration implements ClientCxfConfiguration {
-
-	@Value("${content.service.cxf.defaultBusEnabled:true}")
-	private boolean defaultBusEnabled;
+public class AcsClientJerseyConfiguration extends AcsClientConfiguration implements ClientJerseyConfiguration {
 	
-	public boolean isDefaultBusEnabled() {
-		return this.defaultBusEnabled;
+	@Value("${content.service.jersey.putBodyRequired:true}")
+	private boolean putBodyRequired;
+	
+	public boolean isPutBodyRequired() {
+		return this.putBodyRequired;
 	}
 
-	public void setDefaultBusEnabled(boolean defaultBusEnabled) {
-		this.defaultBusEnabled = defaultBusEnabled;
+	public void setPutBodyRequired(boolean putBodyRequired) {
+		this.putBodyRequired = putBodyRequired;
 	}
 
 }

src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java

@@ -18,25 +18,25 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import com.inteligr8.rs.ClientCxfImpl;
+import com.inteligr8.rs.ClientJerseyImpl;
 
 /**
- * This class provides a POJO & Spring-based implementation of the Apache
- * CXF client.  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.
+ * This class provides a POJO & 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("acs.client.cxf")
+@Component("acs.client.jersey")
 @Lazy
-public class AcsClientCxfImpl extends ClientCxfImpl {
+public class AcsClientJerseyImpl extends ClientJerseyImpl {
 	
 	/**
-	 * This constructor is for Spring or POJO use
+	 * This constructor is for Spring and POJO use
 	 */
 	@Autowired
-	public AcsClientCxfImpl(AcsClientCxfConfiguration config) {
+	public AcsClientJerseyImpl(AcsClientJerseyConfiguration config) {
 		super(config);
 	}
 

src/main/jersey/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java

@@ -19,20 +19,20 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 /**
- * This class provides the Apache CXF client to the JAX-RS API for the ACS
- * Public ReST API.
+ * This class provides the Jersey client to the JAX-RS API for the ACS Public
+ * ReST API.
  * 
  * @author brian@inteligr8.com
  */
-@Component("acs.api.cxf")
+@Component("acs.api.jersey")
 @Lazy
-public class AcsPublicRestApiCxfImpl extends AcsPublicRestApiImpl implements AcsPublicRestCxfApi {
+public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApiImpl implements AcsPublicRestJerseyApi {
 
 	/**
 	 * This constructor is for Spring or POJO use
 	 */
 	@Autowired
-	public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) {
+	public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) {
 		super(client);
 	}
 

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

@@ -1 +0,0 @@
-org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl

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/acs/ConnectionJerseyClientIT.java

@@ -22,11 +22,11 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
-public class ConnectionCxfClientIT extends ConnectionClientIT {
+@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
+public class ConnectionJerseyClientIT extends ConnectionClientIT {
 	
 	@Autowired
-	@Qualifier("acs.api.cxf")
+	@Qualifier("acs.api.jersey")
 	private AcsPublicRestApiImpl api;
 	
 	@Override

src/test/jersey/com/inteligr8/alfresco/acs/JerseyUploadIT.java

@@ -16,6 +16,7 @@ package com.inteligr8.alfresco.acs;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.text.ParseException;
 import java.util.Collections;
 
 import org.junit.jupiter.api.Assertions;
@@ -28,16 +29,16 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
 import com.inteligr8.alfresco.acs.model.Node;
 import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
-import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartCxf;
+import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartJersey;
 import com.inteligr8.rs.ClientConfiguration;
 
 @TestPropertySource(locations = {"/local.properties"})
-@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
-public class CxfUploadIT extends UploadIT {
+@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
+public class JerseyUploadIT extends UploadIT {
 	
 	@Autowired
-	@Qualifier("acs.api.cxf")
-	private AcsPublicRestApiCxfImpl api;
+	@Qualifier("acs.api.jersey")
+	private AcsPublicRestApiJerseyImpl api;
 	
 	@Override
 	public AcsPublicRestApi getApi() {
@@ -51,14 +52,14 @@ public class CxfUploadIT extends UploadIT {
 	
 	@Test
 	@EnabledIf("hostExists")
-	public void uploadFile() throws IOException {
+	public void uploadFile() throws IOException, ParseException {
 		String folderNodeId = this.getSharedFolder();
 		
 		NodeBodyCreate nodeBody = new NodeBodyCreate().nodeType("trx:transferReport").name("test-name1.txt")
 				.properties(Collections.singletonMap("cm:author", "Brian"));
 		
 		ByteArrayInputStream istream = new ByteArrayInputStream("This is a test".getBytes());
-		NodeBodyCreateMultipartCxf body = NodeBodyCreateMultipartCxf.from(nodeBody, "test-name2.txt", istream, true, null, null);
+		NodeBodyCreateMultipartJersey body = NodeBodyCreateMultipartJersey.from(nodeBody, "test-name2.txt", istream, true, null, null);
 		
 		Node newNode = this.api.getNodesExtApi().createNode(folderNodeId, body).getEntry();
 		Assertions.assertNotNull(newNode);