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

added back CXF

Browse Source
This commit is contained in:
Brian Long 2022-10-03 09:06:17 -04:00
parent 8531839075
commit 24f7f54577
7 changed files with 269 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pom.xml
View File

@ -43,10 +43,11 @@
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
<acs.platform.tag>acs62</acs.platform.tag>
<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>
</properties>
<dependencies>
@ -89,6 +90,31 @@
<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.0.0-M5</version>

46
src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfConfiguration.java Normal file
View File

@ -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;
}
}

43
src/main/cxf/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java Normal file
View File

@ -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);
}
}

39
src/main/cxf/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java Normal file
View File

@ -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);
}
}

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

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

42
src/test/cxf/com/inteligr8/alfresco/acs/ConnectionCxfClientIT.java Normal file
View File

@ -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();
}
}

71
src/test/cxf/com/inteligr8/alfresco/acs/CxfUploadIT.java Normal file
View File

@ -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"));
}
}