Merge branch 'develop-cxf' into stable-cxf

pom.xml

@@ -6,10 +6,10 @@
 
 	<groupId>com.inteligr8.alfresco</groupId>
 	<artifactId>acs-public-rest-client</artifactId>
-	<version>2.0.4</version>
+	<version>3.0.0-cxf</version>
 	
 	<name>Alfresco Content Services ReST API Client for Java</name>
-	<description>An ACS Client library for building REST API clients that support either the CXF and Jersey frameworks</description>
+	<description>An ACS Client library for building CXF-based REST API clients</description>
 	<url>https://bitbucket.org/inteligr8/acs-public-rest-client</url>
 
 	<licenses>
@@ -39,26 +39,28 @@
 
 	<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>
 
-		<acs.platform.tag>acs7</acs.platform.tag>
+		<acs.platform.tag>acs23</acs.platform.tag>
 
-		<junit.version>5.7.2</junit.version>
-		<spring.version>5.3.6</spring.version>
+		<junit.version>5.10.0</junit.version>
+		<spring.version>6.0.19</spring.version>
+		<cxf.version>4.0.2</cxf.version>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.inteligr8</groupId>
 			<artifactId>common-rest-client</artifactId>
-			<version>2.0.8</version>
+			<version>3.0.0-cxf</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inteligr8.alfresco</groupId>
 			<artifactId>acs-public-rest-api</artifactId>
-			<version>2.1-SNAPSHOT-${acs.platform.tag}</version>
+			<version>3.0.0-${acs.platform.tag}</version>
 			<scope>provided</scope> <!-- explicitly, bring your own version -->
 		</dependency>
 		<dependency>
@@ -82,13 +84,38 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
-			<version>2.19.0</version>
+			<version>2.20.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
 	
 	<build>
 		<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/cxf</source>
+							</sources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>add-test-src</id>
+						<goals><goal>add-test-source</goal></goals>
+						<configuration>
+							<sources>
+								<source>src/test/cxf</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.1.0</version>

src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.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.acs;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+import com.inteligr8.rs.ClientCxfConfiguration;
+
+/**
+ * This class provides a POJO &amp; Spring-based implementation of the
+ * ClientCxfConfiguration 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 AcsClientCxfConfiguration extends AcsClientConfiguration implements ClientCxfConfiguration {
+
+	@Value("${content.service.cxf.defaultBusEnabled:true}")
+	private boolean defaultBusEnabled;
+	
+	public boolean isDefaultBusEnabled() {
+		return this.defaultBusEnabled;
+	}
+
+	public void setDefaultBusEnabled(boolean defaultBusEnabled) {
+		this.defaultBusEnabled = defaultBusEnabled;
+	}
+
+}

src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.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.acs;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+import com.inteligr8.rs.ClientCxfImpl;
+
+/**
+ * This class provides a POJO &amp; 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.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("acs.client.cxf")
+@Lazy
+public class AcsClientCxfImpl extends ClientCxfImpl {
+	
+	/**
+	 * This constructor is for Spring or POJO use
+	 */
+	@Autowired
+	public AcsClientCxfImpl(AcsClientCxfConfiguration config) {
+		super(config);
+	}
+
+}

src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.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.acs;
+
+import org.springframework.beans.factory.annotation.Autowired;
+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.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("acs.api.cxf")
+@Lazy
+public class AcsPublicRestApiCxfImpl extends AcsPublicRestApiImpl implements AcsPublicRestCxfApi {
+
+	/**
+	 * This constructor is for Spring or POJO use
+	 */
+	@Autowired
+	public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) {
+		super(client);
+	}
+
+}

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

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

src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java

@@ -0,0 +1,42 @@
+/*
+ * 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.acs;
+
+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 = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
+public class ConnectionCxfClientIT extends ConnectionClientIT {
+	
+	@Autowired
+	@Qualifier("acs.api.cxf")
+	private AcsPublicRestApiImpl api;
+	
+	@Override
+	public AcsPublicRestApi getApi() {
+		return this.api;
+	}
+	
+	@Override
+	public ClientConfiguration getConfiguration() {
+		return this.api.getClient().getConfig();
+	}
+	
+}

src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java

@@ -0,0 +1,71 @@
+/*
+ * 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.acs;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.Collections;
+
+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.acs.model.Node;
+import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
+import com.inteligr8.alfresco.acs.model.NodeBodyCreateMultipartCxf;
+import com.inteligr8.rs.ClientConfiguration;
+
+@TestPropertySource(locations = {"/local.properties"})
+@SpringJUnitConfig(classes = {AcsClientCxfConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
+public class CxfUploadIT extends UploadIT {
+	
+	@Autowired
+	@Qualifier("acs.api.cxf")
+	private AcsPublicRestApiCxfImpl api;
+	
+	@Override
+	public AcsPublicRestApi getApi() {
+		return this.api;
+	}
+	
+	@Override
+	public ClientConfiguration getConfiguration() {
+		return this.api.getClient().getConfig();
+	}
+	
+	@Test
+	@EnabledIf("hostExists")
+	public void uploadFile() throws IOException {
+		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);
+		
+		Node newNode = this.api.getNodesExtApi().createNode(folderNodeId, body).getEntry();
+		Assertions.assertNotNull(newNode);
+		Assertions.assertNotNull(newNode.getId());
+		Assertions.assertEquals(folderNodeId, newNode.getParentId());
+		Assertions.assertEquals(nodeBody.getNodeType(), newNode.getNodeType());
+		Assertions.assertTrue(newNode.getName().startsWith("test-name1"));
+	}
+	
+}

src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java

@@ -17,7 +17,7 @@ package com.inteligr8.alfresco.acs;
 import java.util.List;
 import java.util.UUID;
 
-import javax.ws.rs.NotFoundException;
+import jakarta.ws.rs.NotFoundException;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

src/test/resources/log4j2.properties

@@ -1,17 +1,17 @@
-rootLogger.level=trace
+rootLogger.level=info
 rootLogger.appenderRef.stdout.ref=STDOUT
 
 logger.spring.name=org.springframework
 logger.spring.level=info
 
 logger.common-rest-api.name=com.inteligr8.rs
-logger.common-rest-api.level=trace
+logger.common-rest-api.level=info
 
 logger.this.name=com.inteligr8.alfresco.acs
-logger.this.level=trace
+logger.this.level=info
 
 logger.jaxrslog.name=jaxrs.request
-logger.jaxrslog.level=trace
+logger.jaxrslog.level=info
 
 appender.stdout.type=Console
 appender.stdout.name=STDOUT