inteligr8/acs-public-rest-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove CXF/Jersey from main develop

Browse Source
This commit is contained in:
Brian Long 2022-10-03 09:02:15 -04:00
parent 2acf8114b4
commit 8531839075
13 changed files with 4 additions and 387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pom.xml
View File

@ -43,30 +43,23 @@
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
<!-- If you want to build for your specific version, point to your own
installation -->
<acs.baseUrl>http://localhost:8080/alfresco</acs.baseUrl>
<acs.platform.tag>acs7</acs.platform.tag>
<it.directory>src/test/none</it.directory>
<acs.platform.tag>acs62</acs.platform.tag>
<junit.version>5.7.2</junit.version>
<spring.version>5.2.14.RELEASE</spring.version>
<jersey.version>2.35</jersey.version>
<cxf.version>3.4.7</cxf.version>
</properties>
<dependencies>
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId>
<version>2.0-SNAPSHOT</version>
<classifier>${jaxrs.impl}</classifier>
<version>2.0.1-cxf</version>
</dependency>
<dependency>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId>
<version>2.0-SNAPSHOT</version>
<classifier>${acs.platform.tag}</classifier>
<version>2.0.1-${acs.platform.tag}</version>
<scope>provided</scope> <!-- explicitly, bring your own version -->
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
@ -96,37 +89,6 @@
<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/${jaxrs.impl}</source>
</sources>
</configuration>
</execution>
<execution>
<id>add-test-src</id>
<goals><goal>add-test-source</goal></goals>
<configuration>
<sources>
<source>src/test/${jaxrs.impl}</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<classifier>${jaxrs.impl}</classifier>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>

32
src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java
View File

@ -1,32 +0,0 @@
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;
}
}

29
src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
View File

@ -1,29 +0,0 @@
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);
}
}

25
src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java
View File

@ -1,25 +0,0 @@
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);
}
}

32
src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyConfiguration.java
View File

@ -1,32 +0,0 @@
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.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 AcsClientJerseyConfiguration extends AcsClientConfiguration implements ClientJerseyConfiguration {
@Value("${content.service.jersey.putBodyRequired:true}")
private boolean putBodyRequired;
public boolean isPutBodyRequired() {
return this.putBodyRequired;
}
public void setPutBodyRequired(boolean putBodyRequired) {
this.putBodyRequired = putBodyRequired;
}
}

29
src/main/jersey/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
View File

@ -1,29 +0,0 @@
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.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("acs.client.jersey")
@Lazy
public class AcsClientJerseyImpl extends ClientJerseyImpl {
/**
* This constructor is for Spring and POJO use
*/
@Autowired
public AcsClientJerseyImpl(AcsClientJerseyConfiguration config) {
super(config);
}
}

25
src/main/jersey/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java
View File

@ -1,25 +0,0 @@
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 Jersey client to the JAX-RS API for the ACS Public
* ReST API.
*
* @author brian@inteligr8.com
*/
@Component("acs.api.jersey")
@Lazy
public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApiImpl implements AcsPublicRestJerseyApi {
/**
* This constructor is for Spring or POJO use
*/
@Autowired
public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) {
super(client);
}
}

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

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

28
src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java
View File

@ -1,28 +0,0 @@
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();
}
}

57
src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java
View File

@ -1,57 +0,0 @@
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"));
}
}

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

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

28
src/test/jersey/com/inteligr8/alfresco/acs/ConnectionJerseyClientIT.java
View File

@ -1,28 +0,0 @@
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 = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
public class ConnectionJerseyClientIT extends ConnectionClientIT {
@Autowired
@Qualifier("acs.api.jersey")
private AcsPublicRestApiImpl api;
@Override
public AcsPublicRestApi getApi() {
return this.api;
}
@Override
public ClientConfiguration getConfiguration() {
return this.api.getClient().getConfig();
}
}

58
src/test/jersey/com/inteligr8/alfresco/acs/JerseyUploadIT.java
View File

@ -1,58 +0,0 @@
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;
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.NodeBodyCreateMultipartJersey;
import com.inteligr8.rs.ClientConfiguration;
@TestPropertySource(locations = {"/local.properties"})
@SpringJUnitConfig(classes = {AcsClientJerseyConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
public class JerseyUploadIT extends UploadIT {
@Autowired
@Qualifier("acs.api.jersey")
private AcsPublicRestApiJerseyImpl 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, 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());
NodeBodyCreateMultipartJersey body = NodeBodyCreateMultipartJersey.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"));
}
}