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

split client to acs-public-rest-client

Browse Source
This commit is contained in:
Brian Long
2022-05-03 13:09:22 -04:00
parent 938ac213b7
commit b8d23408c8
19 changed files with 99 additions and 1069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

237
pom.xml
View File

@@ -4,35 +4,28 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId> <artifactId>acs-public-rest-api</artifactId>
<version>1.1-SNAPSHOT</version> <version>2.0-SNAPSHOT</version>
<name>Alfresco Content Services ReST API Client for Java</name> <name>Alfresco Content Services ReST API for Java</name>
<properties> <properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding> <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <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 <!-- If you want to build for your specific version, point to your own
installation --> installation -->
<acs.baseUrl>https://api-explorer.alfresco.com/api-explorer</acs.baseUrl> <acs.baseUrl>http://localhost:8080/alfresco</acs.baseUrl>
<acs.platform.tag>acs7</acs.platform.tag> <acs.platform.tag>acs7</acs.platform.tag>
<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage> <swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>
<it.directory>src/test/none</it.directory>
<junit.version>5.7.2</junit.version> <jersey.version>2.35</jersey.version>
<spring.version>5.2.14.RELEASE</spring.version> <cxf.version>3.4.7</cxf.version>
<jersey.version>2.34</jersey.version>
<cxf.version>3.3.2</cxf.version>
<api.model.disabled>false</api.model.disabled> <api.model.disabled>false</api.model.disabled>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-api</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId> <artifactId>swagger-jaxrs</artifactId>
@@ -45,64 +38,26 @@
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.ext</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jersey-proxy-client</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<version>${jersey.version}</version> <version>2.1.6</version>
<scope>provided</scope> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.12.2</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId> <artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
<scope>provided</scope> <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.16.0</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -125,21 +80,6 @@
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>add-services</id>
<phase>process-test-resources</phase>
<goals>
<goal>add-test-resource</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${it.directory}</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
@@ -148,42 +88,9 @@
<classifier>${acs.platform.tag}</classifier> <classifier>${acs.platform.tag}</classifier>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
<configuration>
<excludes>
<exclude>**/*Jersey*</exclude>
<exclude>**/*Cxf*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
<configuration>
<excludes>
<exclude>**/*Jersey*</exclude>
<exclude>**/*Cxf*</exclude>
</excludes>
</configuration>
</plugin>
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<executions> <executions>
<execution> <execution>
<id>javadoc</id> <id>javadoc</id>
@@ -199,96 +106,6 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>it-jersey</id>
<properties>
<it.directory>src/test/jersey</it.directory>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
<configuration>
<includes>
<include>**/*Jersey*</include>
</includes>
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
<configuration>
<includes>
<include>**/*Jersey*IT.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>it-cxf</id>
<properties>
<it.directory>src/test/cxf</it.directory>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
<configuration>
<includes>
<include>**/*Cxf*</include>
</includes>
<excludes>
<exclude>**/*IT.java</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
<configuration>
<includes>
<include>**/*Cxf*IT.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- Implement when descriptor is available --> <!-- Implement when descriptor is available -->
<profile> <profile>
<id>swagger-codegen</id> <id>swagger-codegen</id>
@@ -541,8 +358,16 @@
<repositories> <repositories>
<repository> <repository>
<id>inteligr8-public</id> <id>inteligr8-releases</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url> <url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
<releases><enabled>true</enabled></releases>
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>inteligr8-snapshots</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository> </repository>
</repositories> </repositories>

165
src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java
View File

@@ -1,165 +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;
import com.inteligr8.rs.ClientJerseyConfiguration;
/**
* This class provides a POJO &amp; Spring-based implementation of the
* ClientConfiguration 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 AcsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration {
@Value("${content.service.baseUrl:http://localhost:8080/alfresco}")
private String baseUrl;
@Value("${content.service.security.basicAuth.username:admin}")
private String basicAuthUsername;
@Value("${content.service.security.basicAuth.password:admin}")
private String basicAuthPassword;
@Value("${content.service.security.bearerToken:#{null}}")
private String bearerToken;
@Value("${content.service.security.oauth.tokenUrl:#{null}}")
private String oAuthTokenUrl;
@Value("${content.service.security.oauth.clientId:#{null}}")
private String oAuthClientId;
@Value("${content.service.security.oauth.clientSecret:#{null}}")
private String oAuthClientSecret;
@Value("${content.service.security.oauth.authCode:#{null}}")
private String oAuthAuthCode;
@Value("${content.service.security.oauth.authRedirectUri:#{null}}")
private String oAuthAuthRedirectUri;
@Value("${content.service.security.oauth.grantUsername:#{null}}")
private String oAuthUsername;
@Value("${content.service.security.oauth.grantPassword:#{null}}")
private String oAuthPassword;
@Value("${content.service.cxf.defaultBusEnabled:true}")
private boolean defaultBusEnabled;
@Value("${content.service.jersey.putBodyRequired:true}")
private boolean putBodyRequired;
public String getBaseUrl() {
return this.baseUrl;
}
public void setBaseUrl(String baseUrl) {
this.baseUrl = baseUrl;
}
public String getBasicAuthUsername() {
return this.basicAuthUsername;
}
public void setBasicAuthUsername(String basicAuthUsername) {
this.basicAuthUsername = basicAuthUsername;
}
public String getBasicAuthPassword() {
return this.basicAuthPassword;
}
public void setBasicAuthPassword(String basicAuthPassword) {
this.basicAuthPassword = basicAuthPassword;
}
public String getBearerToken() {
return this.bearerToken;
}
public void setBearerToken(String bearerToken) {
this.bearerToken = bearerToken;
}
public String getOAuthTokenUrl() {
return this.oAuthTokenUrl;
}
public void setOAuthTokenUrl(String oAuthTokenUrl) {
this.oAuthTokenUrl = oAuthTokenUrl;
}
public String getOAuthClientId() {
return this.oAuthClientId;
}
public void setOAuthClientId(String oAuthClientId) {
this.oAuthClientId = oAuthClientId;
}
public String getOAuthClientSecret() {
return this.oAuthClientSecret;
}
public void setOAuthClientSecret(String oAuthClientSecret) {
this.oAuthClientSecret = oAuthClientSecret;
}
public String getOAuthAuthCode() {
return this.oAuthAuthCode;
}
public void setOAuthAuthCode(String oAuthAuthCode) {
this.oAuthAuthCode = oAuthAuthCode;
}
public String getOAuthAuthRedirectUri() {
return this.oAuthAuthRedirectUri;
}
public void setOAuthAuthRedirectUri(String oAuthAuthRedirectUri) {
this.oAuthAuthRedirectUri = oAuthAuthRedirectUri;
}
public String getOAuthUsername() {
return this.oAuthUsername;
}
public void setOAuthUsername(String oAuthUsername) {
this.oAuthUsername = oAuthUsername;
}
public String getOAuthPassword() {
return this.oAuthPassword;
}
public void setOAuthPassword(String oAuthPassword) {
this.oAuthPassword = oAuthPassword;
}
public boolean isDefaultBusEnabled() {
return this.defaultBusEnabled;
}
public void setDefaultBusEnabled(boolean defaultBusEnabled) {
this.defaultBusEnabled = defaultBusEnabled;
}
public boolean isPutBodyRequired() {
return this.putBodyRequired;
}
public void setPutBodyRequired(boolean putBodyRequired) {
this.putBodyRequired = putBodyRequired;
}
}

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

@@ -1,44 +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.ClientCxfConfiguration;
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 {
@Autowired
private AcsClientConfiguration config;
/**
* This constructor is for Spring use.
*/
protected AcsClientCxfImpl() {
}
/**
* This constructor is for POJO use.
* @param config
*/
public AcsClientCxfImpl(AcsClientConfiguration config) {
this.config = config;
}
@Override
protected ClientCxfConfiguration getConfig() {
return this.config;
}
}

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

@@ -1,44 +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.ClientJerseyConfiguration;
import com.inteligr8.rs.ClientJerseyImpl;
/**
* 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.jersey")
@Lazy
public class AcsClientJerseyImpl extends ClientJerseyImpl {
@Autowired
private AcsClientConfiguration config;
/**
* This constructor is for Spring use.
*/
protected AcsClientJerseyImpl() {
}
/**
* This constructor is for POJO use.
* @param config
*/
public AcsClientJerseyImpl(AcsClientConfiguration config) {
this.config = config;
}
@Override
protected ClientJerseyConfiguration getConfig() {
return this.config;
}
}

177
src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java
View File

@@ -26,236 +26,123 @@ import com.inteligr8.alfresco.acs.api.TrashcanApi;
import com.inteligr8.alfresco.acs.api.TypesApi; import com.inteligr8.alfresco.acs.api.TypesApi;
import com.inteligr8.alfresco.acs.api.V0Api; import com.inteligr8.alfresco.acs.api.V0Api;
import com.inteligr8.alfresco.acs.api.VersionsApi; import com.inteligr8.alfresco.acs.api.VersionsApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/** /**
* This class serves as the base implementation for the JAX-RS API for the ACS * This interface consolidates the JAX-RS APIs available in the ACS Public
* Public ReST API. * ReST API.
* *
* @author brian@inteligr8.com * @author brian@inteligr8.com
*/ */
public abstract class AcsPublicRestApi { public interface AcsPublicRestApi {
abstract ClientConfiguration getConfig(); <T> T getApi(Class<T> apiClass);
abstract Client getClient(); default ActionsApi getActionsApi() {
protected final <T> T getApi(Class<T> apiClass) {
return this.getApi(null, apiClass);
}
protected <T> T getApi(AuthorizationFilter authFilter, Class<T> apiClass) {
return this.getClient().getApi(authFilter, apiClass);
}
public ActionsApi getActionsApi() {
return this.getApi(ActionsApi.class); return this.getApi(ActionsApi.class);
} }
public ActionsApi getActionsApi(AuthorizationFilter authFilter) { default ActivitiesApi getActivitiesApi() {
return this.getApi(authFilter, ActionsApi.class);
}
public ActivitiesApi getActivitiesApi() {
return this.getApi(ActivitiesApi.class); return this.getApi(ActivitiesApi.class);
} }
public ActivitiesApi getActivitiesApi(AuthorizationFilter authFilter) { default AspectsApi getAspectsApi() {
return this.getApi(authFilter, ActivitiesApi.class);
}
public AspectsApi getAspectsApi() {
return this.getApi(AspectsApi.class); return this.getApi(AspectsApi.class);
} }
public AspectsApi getAspectsApi(AuthorizationFilter authFilter) { default AuditApi getAuditApi() {
return this.getApi(authFilter, AspectsApi.class);
}
public AuditApi getAuditApi() {
return this.getApi(AuditApi.class); return this.getApi(AuditApi.class);
} }
public AuditApi getAuditApi(AuthorizationFilter authFilter) { default AuthenticationApi getAuthenticationApi() {
return this.getApi(authFilter, AuditApi.class);
}
public AuthenticationApi getAuthenticationApi() {
return this.getApi(AuthenticationApi.class); return this.getApi(AuthenticationApi.class);
} }
public AuthenticationApi getAuthenticationApi(AuthorizationFilter authFilter) { default CommentsApi getCommentsApi() {
return this.getApi(authFilter, AuthenticationApi.class);
}
public CommentsApi getCommentsApi() {
return this.getApi(CommentsApi.class); return this.getApi(CommentsApi.class);
} }
public CommentsApi getCommentsApi(AuthorizationFilter authFilter) { default DiscoveryApi getDiscoveryApi() {
return this.getApi(authFilter, CommentsApi.class);
}
public DiscoveryApi getDiscoveryApi() {
return this.getApi(DiscoveryApi.class); return this.getApi(DiscoveryApi.class);
} }
public DiscoveryApi getDiscoveryApi(AuthorizationFilter authFilter) { default DownloadsApi getDownloadsApi() {
return this.getApi(authFilter, DiscoveryApi.class);
}
public DownloadsApi getDownloadsApi() {
return this.getApi(DownloadsApi.class); return this.getApi(DownloadsApi.class);
} }
public DownloadsApi getDownloadsApi(AuthorizationFilter authFilter) { default FavoritesApi getFavoritesApi() {
return this.getApi(authFilter, DownloadsApi.class);
}
public FavoritesApi getFavoritesApi() {
return this.getApi(FavoritesApi.class); return this.getApi(FavoritesApi.class);
} }
public FavoritesApi getFavoritesApi(AuthorizationFilter authFilter) { default GroupsApi getGroupsApi() {
return this.getApi(authFilter, FavoritesApi.class);
}
public GroupsApi getGroupsApi() {
return this.getApi(GroupsApi.class); return this.getApi(GroupsApi.class);
} }
public GroupsApi getGroupsApi(AuthorizationFilter authFilter) { default NetworksApi getNetworksApi() {
return this.getApi(authFilter, GroupsApi.class);
}
public NetworksApi getNetworksApi() {
return this.getApi(NetworksApi.class); return this.getApi(NetworksApi.class);
} }
public NetworksApi getNetworksApi(AuthorizationFilter authFilter) { default NodesApi getNodesApi() {
return this.getApi(authFilter, NetworksApi.class);
}
public NodesApi getNodesApi() {
return this.getApi(NodesApi.class); return this.getApi(NodesApi.class);
} }
public NodesApi getNodesApi(AuthorizationFilter authFilter) { default PeopleApi getPeopleApi() {
return this.getApi(authFilter, NodesApi.class);
}
public PeopleApi getPeopleApi() {
return this.getApi(PeopleApi.class); return this.getApi(PeopleApi.class);
} }
public PeopleApi getPeopleApi(AuthorizationFilter authFilter) { default PreferencesApi getPreferencesApi() {
return this.getApi(authFilter, PeopleApi.class);
}
public PreferencesApi getPreferencesApi() {
return this.getApi(PreferencesApi.class); return this.getApi(PreferencesApi.class);
} }
public PreferencesApi getPreferencesApi(AuthorizationFilter authFilter) { default ProbesApi getProbesApi() {
return this.getApi(authFilter, PreferencesApi.class);
}
public ProbesApi getProbesApi() {
return this.getApi(ProbesApi.class); return this.getApi(ProbesApi.class);
} }
public ProbesApi getProbesApi(AuthorizationFilter authFilter) { default QueriesApi getQueriesApi() {
return this.getApi(authFilter, ProbesApi.class);
}
public QueriesApi getQueriesApi() {
return this.getApi(QueriesApi.class); return this.getApi(QueriesApi.class);
} }
public QueriesApi getQueriesApi(AuthorizationFilter authFilter) { default RatingsApi getRatingsApi() {
return this.getApi(authFilter, QueriesApi.class);
}
public RatingsApi getRatingsApi() {
return this.getApi(RatingsApi.class); return this.getApi(RatingsApi.class);
} }
public RatingsApi getRatingsApi(AuthorizationFilter authFilter) { default RenditionsApi getRenditionsApi() {
return this.getApi(authFilter, RatingsApi.class);
}
public RenditionsApi getRenditionsApi() {
return this.getApi(RenditionsApi.class); return this.getApi(RenditionsApi.class);
} }
public RenditionsApi getRenditionsApi(AuthorizationFilter authFilter) { default SearchApi getSearchApi() {
return this.getApi(authFilter, RenditionsApi.class);
}
public SearchApi getSearchApi() {
return this.getApi(SearchApi.class); return this.getApi(SearchApi.class);
} }
public SearchApi getSearchApi(AuthorizationFilter authFilter) { default SharedLinksApi getSharedLinksApi() {
return this.getApi(authFilter, SearchApi.class);
}
public SharedLinksApi getSharedLinksApi() {
return this.getApi(SharedLinksApi.class); return this.getApi(SharedLinksApi.class);
} }
public SharedLinksApi getSharedLinksApi(AuthorizationFilter authFilter) { default SitesApi getSitesApi() {
return this.getApi(authFilter, SharedLinksApi.class);
}
public SitesApi getSitesApi() {
return this.getApi(SitesApi.class); return this.getApi(SitesApi.class);
} }
public SitesApi getSitesApi(AuthorizationFilter authFilter) { default TagsApi getTagsApi() {
return this.getApi(authFilter, SitesApi.class);
}
public TagsApi getTagsApi() {
return this.getApi(TagsApi.class); return this.getApi(TagsApi.class);
} }
public TagsApi getTagsApi(AuthorizationFilter authFilter) { default TrashcanApi getTrashcanApi() {
return this.getApi(authFilter, TagsApi.class);
}
public TrashcanApi getTrashcanApi() {
return this.getApi(TrashcanApi.class); return this.getApi(TrashcanApi.class);
} }
public TrashcanApi getTrashcanApi(AuthorizationFilter authFilter) { default TypesApi getTypesApi() {
return this.getApi(authFilter, TrashcanApi.class);
}
public TypesApi getTypesApi() {
return this.getApi(TypesApi.class); return this.getApi(TypesApi.class);
} }
public TypesApi getTypesApi(AuthorizationFilter authFilter) { default VersionsApi getVersionsApi() {
return this.getApi(authFilter, TypesApi.class);
}
public VersionsApi getVersionsApi() {
return this.getApi(VersionsApi.class); return this.getApi(VersionsApi.class);
} }
public VersionsApi getVersionsApi(AuthorizationFilter authFilter) { default V0Api getV0Api() {
return this.getApi(authFilter, VersionsApi.class);
}
public V0Api getV0Api() {
return this.getApi(V0Api.class); return this.getApi(V0Api.class);
} }
public V0Api getV0Api(AuthorizationFilter authFilter) { default V0Api getLegacyApi() {
return this.getApi(authFilter, V0Api.class); return this.getV0Api();
} }
} }

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

@@ -1,56 +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.alfresco.acs.api.NodesCxfApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/**
* This class provides the Apache CXF client to the JAX-RS API for the ACS
* Public ReST API. It also provides extension API helpers.
*
* @author brian@inteligr8.com
*/
@Component("acs.api.cxf")
@Lazy
public class AcsPublicRestApiCxfImpl extends AcsPublicRestApi {
@Autowired
private AcsClientCxfImpl client;
/**
* This constructor is for Spring use.
*/
protected AcsPublicRestApiCxfImpl() {
}
/**
* This constructor is for POJO use.
*/
public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) {
this.client = client;
}
@Override
ClientConfiguration getConfig() {
return this.client.getConfig();
}
@Override
Client getClient() {
return this.client;
}
public NodesCxfApi getNodesExtApi() {
return this.client.getApi(NodesCxfApi.class);
}
public NodesCxfApi getNodesExtApi(AuthorizationFilter authFilter) {
return this.client.getApi(authFilter, NodesCxfApi.class);
}
}

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

@@ -1,56 +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.alfresco.acs.api.NodesJerseyApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/**
* This class provides the Jersey client to the JAX-RS API for the ACS Public
* ReST API. It also provides extension API helpers.
*
* @author brian@inteligr8.com
*/
@Component("acs.api.jersey")
@Lazy
public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApi {
@Autowired
private AcsClientJerseyImpl client;
/**
* This constructor is for Spring use.
*/
protected AcsPublicRestApiJerseyImpl() {
}
/**
* This constructor is for POJO use.
*/
public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) {
this.client = client;
}
@Override
ClientConfiguration getConfig() {
return this.client.getConfig();
}
@Override
Client getClient() {
return this.client;
}
public NodesJerseyApi getNodesExtApi() {
return this.client.getApi(NodesJerseyApi.class);
}
public NodesJerseyApi getNodesExtApi(AuthorizationFilter authFilter) {
return this.client.getApi(authFilter, NodesJerseyApi.class);
}
}

18
src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestCxfApi.java Normal file
View File

@@ -0,0 +1,18 @@
package com.inteligr8.alfresco.acs;
import com.inteligr8.alfresco.acs.api.NodesCxfApi;
/**
* This interface appends Apache CXF implementation specific methods to the
* JAX-RS API of the ACS Public ReST API. This is due to a lack of multi-part
* in the JAX-RS specification.
*
* @author brian@inteligr8.com
*/
public interface AcsPublicRestCxfApi extends AcsPublicRestApi {
default NodesCxfApi getNodesExtApi() {
return this.getApi(NodesCxfApi.class);
}
}

18
src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestJerseyApi.java Normal file
View File

@@ -0,0 +1,18 @@
package com.inteligr8.alfresco.acs;
import com.inteligr8.alfresco.acs.api.NodesJerseyApi;
/**
* This interface appends Jersey implementation specific methods to the
* JAX-RS API of the ACS Public ReST API. This is due to a lack of multi-part
* in the JAX-RS specification.
*
* @author brian@inteligr8.com
*/
public interface AcsPublicRestJerseyApi extends AcsPublicRestApi {
default NodesJerseyApi getNodesExtApi() {
return this.getApi(NodesJerseyApi.class);
}
}

35
src/test/java/com/inteligr8/alfresco/acs/ConditionalIT.java
View File

@@ -1,35 +0,0 @@
package com.inteligr8.alfresco.acs;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.methods.RequestBuilder;
import org.apache.http.impl.client.DefaultRedirectStrategy;
import org.apache.http.impl.client.HttpClientBuilder;
import com.inteligr8.rs.ClientConfiguration;
public abstract class ConditionalIT {
public abstract ClientConfiguration getConfiguration();
public boolean hostExists() {
String uri = this.getConfiguration().getBaseUrl();
HttpUriRequest request = RequestBuilder.get()
.setUri(uri)
.build();
HttpClient client = HttpClientBuilder.create()
.setRedirectStrategy(DefaultRedirectStrategy.INSTANCE)
.build();
try {
HttpResponse response = client.execute(request);
return response.getStatusLine().getStatusCode() < 300;
} catch (Exception e) {
return false;
}
}
}

94
src/test/java/com/inteligr8/alfresco/acs/ConnectionClientIT.java
View File

@@ -1,94 +0,0 @@
package com.inteligr8.alfresco.acs;
import java.util.List;
import java.util.UUID;
import javax.ws.rs.NotFoundException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIf;
import com.inteligr8.alfresco.acs.api.DiscoveryApi;
import com.inteligr8.alfresco.acs.api.NodesApi;
import com.inteligr8.alfresco.acs.api.V0Api;
import com.inteligr8.alfresco.acs.model.RepositoryInfo;
import com.inteligr8.alfresco.acs.model.v0.ClassInfo;
import com.inteligr8.alfresco.acs.model.v0.MimeTypesData;
import com.inteligr8.alfresco.acs.model.v0.PropertyInfo;
import com.inteligr8.alfresco.acs.model.v0.ServerData;
public abstract class ConnectionClientIT extends ConditionalIT {
public abstract AcsPublicRestApi getClient();
@Test
@EnabledIf("hostExists")
public void testDiscovery() {
DiscoveryApi api = this.getClient().getDiscoveryApi();
RepositoryInfo repoInfo = api.getRepositoryInformation().getEntry().getRepository();
Assertions.assertNotNull(repoInfo);
Assertions.assertFalse(repoInfo.getStatus().isIsReadOnly());
Assertions.assertEquals("6", repoInfo.getVersion().getMajor());
}
@Test
@EnabledIf("hostExists")
public void testMissingNode() {
NodesApi api = this.getClient().getNodesApi();
Assertions.assertThrows(NotFoundException.class, () -> {
api.getNode(UUID.randomUUID().toString(), null, null, null);
});
}
@Test
@EnabledIf("hostExists")
public void testV0ServerInfo() {
V0Api api = this.getClient().getV0Api();
ServerData server = api.getServer();
Assertions.assertNotNull(server);
Assertions.assertNotNull(server.getData());
Assertions.assertNotNull(server.getData().getEdition());
Assertions.assertTrue(server.getData().getEdition().length() > 5);
Assertions.assertTrue(server.getData().getVersion().length() > 5);
Assertions.assertTrue(server.getData().getSchema().length() > 3);
}
@Test
@EnabledIf("hostExists")
public void testV0MimeTypes() {
V0Api api = this.getClient().getV0Api();
MimeTypesData mimeTypes = api.getMimeTypes();
Assertions.assertNotNull(mimeTypes);
Assertions.assertNotNull(mimeTypes.getData());
Assertions.assertTrue(mimeTypes.getData().getMimeTypes().size() > 50);
Assertions.assertNotNull(mimeTypes.getData().getMimeTypeInfo("application/pdf"));
Assertions.assertEquals("pdf", mimeTypes.getData().getMimeTypeInfo("application/pdf").getExtensions().getDefault());
}
@Test
@EnabledIf("hostExists")
public void testV0Classes() {
V0Api api = this.getClient().getV0Api();
List<ClassInfo> classes = api.getClasses(null, null, null);
Assertions.assertNotNull(classes);
Assertions.assertTrue(classes.size() > 50);
}
@Test
@EnabledIf("hostExists")
public void testV0Property() {
V0Api api = this.getClient().getV0Api();
List<PropertyInfo> props = api.getProperties(null, "cm:content", null);
Assertions.assertNotNull(props);
Assertions.assertEquals(1, props.size());
Assertions.assertEquals("d:content", props.iterator().next().getDataType());
}
}

28
src/test/java/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 = {AcsClientConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
public class ConnectionCxfClientIT extends ConnectionClientIT {
@Autowired
@Qualifier("acs.api.cxf")
private AcsPublicRestApiCxfImpl client;
@Override
public AcsPublicRestApi getClient() {
return this.client;
}
@Override
public ClientConfiguration getConfiguration() {
return this.client.getConfig();
}
}

28
src/test/java/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 = {AcsClientConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
public class ConnectionJerseyClientIT extends ConnectionClientIT {
@Autowired
@Qualifier("acs.api.jersey")
private AcsPublicRestApi client;
@Override
public AcsPublicRestApi getClient() {
return this.client;
}
@Override
public ClientConfiguration getConfiguration() {
return this.client.getConfig();
}
}

57
src/test/java/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 = {AcsClientConfiguration.class, AcsPublicRestApiCxfImpl.class, AcsClientCxfImpl.class})
public class CxfUploadIT extends UploadIT {
@Autowired
@Qualifier("acs.api.cxf")
private AcsPublicRestApiCxfImpl client;
@Override
public AcsPublicRestApi getClient() {
return this.client;
}
@Override
public ClientConfiguration getConfiguration() {
return this.client.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.client.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"));
}
}

58
src/test/java/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 = {AcsClientConfiguration.class, AcsPublicRestApiJerseyImpl.class, AcsClientJerseyImpl.class})
public class JerseyUploadIT extends UploadIT {
@Autowired
@Qualifier("acs.api.jersey")
private AcsPublicRestApiJerseyImpl client;
@Override
public AcsPublicRestApi getClient() {
return this.client;
}
@Override
public ClientConfiguration getConfiguration() {
return this.client.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.client.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"));
}
}

26
src/test/java/com/inteligr8/alfresco/acs/UploadIT.java
View File

@@ -1,26 +0,0 @@
package com.inteligr8.alfresco.acs;
import com.inteligr8.alfresco.acs.model.RequestQuery;
import com.inteligr8.alfresco.acs.model.RequestQuery.LanguageEnum;
import com.inteligr8.alfresco.acs.model.ResultNode;
import com.inteligr8.alfresco.acs.model.ResultSetPaging;
import com.inteligr8.alfresco.acs.model.SearchRequest;
public abstract class UploadIT extends ConditionalIT {
public abstract AcsPublicRestApi getClient();
public String getSharedFolder() {
RequestQuery query = new RequestQuery();
query.setLanguage(LanguageEnum.AFTS);
query.setQuery("=@cm:name:'Shared'");
SearchRequest searchRequest = new SearchRequest();
searchRequest.setQuery(query);
ResultSetPaging paging = this.getClient().getSearchApi().search(searchRequest);
ResultNode folderNode = paging.getList().getEntries().iterator().next().getEntry();
return folderNode.getId();
}
}

5
src/test/resources/local-oauth.properties
View File

@@ -1,5 +0,0 @@
content.service.baseUrl=http://localhost:8080/alfresco
content.service.security.oauth.tokenUrl=http://auth.example.org:8080/auth/realms/alfresco/protocol/openid-connect/token
content.service.security.oauth.clientId=alfresco
content.service.security.oauth.grantUsername=admin
content.service.security.oauth.grantPassword=admin

3
src/test/resources/local.properties
View File

@@ -1,3 +0,0 @@
content.service.baseUrl=http://localhost:8080/alfresco
content.service.security.basicAuth.username=admin
content.service.security.basicAuth.password=admin

19
src/test/resources/log4j2.properties
View File

@@ -1,19 +0,0 @@
rootLogger.level=trace
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.this.name=com.inteligr8.alfresco.acs
logger.this.level=trace
logger.jaxrslog.name=jaxrs.request
logger.jaxrslog.level=trace
appender.stdout.type=Console
appender.stdout.name=STDOUT
appender.stdout.layout.type=PatternLayout
appender.stdout.layout.pattern=%C [%t] %m%n