Compare commits

...

17 Commits

11 changed files with 321 additions and 40 deletions

47
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId>
<version>1.1.1-v1-acs6</version>
<version>1.1.6</version>
<name>Alfresco Content Services ReST API Client for Java</name>
<properties>
@@ -15,6 +15,7 @@
<!-- If you want to build for your specific version, point to your own
installation -->
<acs.baseUrl>http://localhost:8080/api-explorer</acs.baseUrl>
<acs.platform.tag>acs6</acs.platform.tag>
<swagger.basePackage>com.inteligr8.alfresco.acs</swagger.basePackage>
<junit.version>5.7.2</junit.version>
@@ -29,7 +30,7 @@
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-api</artifactId>
<version>1.1.0</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@@ -119,6 +120,12 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<classifier>${acs.platform.tag}</classifier>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
@@ -142,16 +149,17 @@
</dependencies>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.21</version>
<extensions>true</extensions>
<configuration>
<filtering>true</filtering>
<tiles>
<tile>com.inteligr8:maven-public-deploy-tile:[1.0.0,2.0.0)</tile>
</tiles>
</configuration>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>javadoc</id>
<phase>package</phase>
<goals><goal>jar</goal></goals>
<configuration>
<show>public</show>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
@@ -409,7 +417,7 @@
<repositories>
<repository>
<id>inteligr8-releases</id>
<id>inteligr8-public</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
</repository>
</repositories>
@@ -420,8 +428,19 @@
<url>https://repository.mulesoft.org/releases</url>
</pluginRepository>
<pluginRepository>
<id>inteligr8-releases</id>
<id>inteligr8-public</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
</pluginRepository>
</pluginRepositories>
<distributionManagement>
<repository>
<id>inteligr8-releases</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
</repository>
<snapshotRepository>
<id>inteligr8-snapshots</id>
<url>https://repos.inteligr8.com/nexus/repository/inteligr8-snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>

View File

@@ -7,6 +7,14 @@ 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 {
@@ -20,8 +28,8 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer
@Value("${content.service.security.basicAuth.password:admin}")
private String basicAuthPassword;
@Value("${content.service.security.accessToken:#{null}}")
private String accessToken;
@Value("${content.service.security.bearerToken:#{null}}")
private String bearerToken;
@Value("${content.service.security.oauth.tokenUrl:#{null}}")
private String oAuthTokenUrl;
@@ -49,57 +57,109 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer
@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 getAccessToken() {
return this.accessToken;
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;
}
}

View File

@@ -8,7 +8,12 @@ import com.inteligr8.rs.ClientCxfConfiguration;
import com.inteligr8.rs.ClientCxfImpl;
/**
* Configured JAX-RS Client & WebTarget for ACS & CXF
* 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
@@ -17,6 +22,20 @@ 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;

View File

@@ -8,7 +8,12 @@ import com.inteligr8.rs.ClientJerseyConfiguration;
import com.inteligr8.rs.ClientJerseyImpl;
/**
* Configured JAX-RS Client & WebTarget for ACS & Jersey
* 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
@@ -17,6 +22,20 @@ 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;

View File

@@ -24,111 +24,220 @@ import com.inteligr8.alfresco.acs.api.TagsApi;
import com.inteligr8.alfresco.acs.api.TrashcanApi;
import com.inteligr8.alfresco.acs.api.V0Api;
import com.inteligr8.alfresco.acs.api.VersionsApi;
import com.inteligr8.rs.AuthorizationFilter;
import com.inteligr8.rs.Client;
import com.inteligr8.rs.ClientConfiguration;
/**
* Alfresco Content Services Spring-ready API
* This class serves as the base implementation for the JAX-RS API for the ACS
* Public ReST API.
*
* @author brian@inteligr8.com
*/
public abstract class AcsPublicRestApi {
abstract ClientConfiguration getConfig();
protected abstract <T> T getApi(Class<T> apiClass);
abstract Client getClient();
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);
}
public ActionsApi getActionsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, ActionsApi.class);
}
public ActivitiesApi getActivitiesApi() {
return this.getApi(ActivitiesApi.class);
}
public ActivitiesApi getActivitiesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, ActivitiesApi.class);
}
public AuditApi getAuditApi() {
return this.getApi(AuditApi.class);
}
public AuditApi getAuditApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, AuditApi.class);
}
public AuthenticationApi getAuthenticationApi() {
return this.getApi(AuthenticationApi.class);
}
public AuthenticationApi getAuthenticationApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, AuthenticationApi.class);
}
public CommentsApi getCommentsApi() {
return this.getApi(CommentsApi.class);
}
public CommentsApi getCommentsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, CommentsApi.class);
}
public DiscoveryApi getDiscoveryApi() {
return this.getApi(DiscoveryApi.class);
}
public DiscoveryApi getDiscoveryApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, DiscoveryApi.class);
}
public DownloadsApi getDownloadsApi() {
return this.getApi(DownloadsApi.class);
}
public DownloadsApi getDownloadsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, DownloadsApi.class);
}
public FavoritesApi getFavoritesApi() {
return this.getApi(FavoritesApi.class);
}
public FavoritesApi getFavoritesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, FavoritesApi.class);
}
public GroupsApi getGroupsApi() {
return this.getApi(GroupsApi.class);
}
public GroupsApi getGroupsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, GroupsApi.class);
}
public NetworksApi getNetworksApi() {
return this.getApi(NetworksApi.class);
}
public NetworksApi getNetworksApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, NetworksApi.class);
}
public NodesApi getNodesApi() {
return this.getApi(NodesApi.class);
}
public NodesApi getNodesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, NodesApi.class);
}
public PeopleApi getPeopleApi() {
return this.getApi(PeopleApi.class);
}
public PeopleApi getPeopleApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, PeopleApi.class);
}
public PreferencesApi getPreferencesApi() {
return this.getApi(PreferencesApi.class);
}
public PreferencesApi getPreferencesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, PreferencesApi.class);
}
public ProbesApi getProbesApi() {
return this.getApi(ProbesApi.class);
}
public ProbesApi getProbesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, ProbesApi.class);
}
public QueriesApi getQueriesApi() {
return this.getApi(QueriesApi.class);
}
public QueriesApi getQueriesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, QueriesApi.class);
}
public RatingsApi getRatingsApi() {
return this.getApi(RatingsApi.class);
}
public RatingsApi getRatingsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, RatingsApi.class);
}
public RenditionsApi getRenditionsApi() {
return this.getApi(RenditionsApi.class);
}
public RenditionsApi getRenditionsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, RenditionsApi.class);
}
public SearchApi getSearchApi() {
return this.getApi(SearchApi.class);
}
public SearchApi getSearchApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, SearchApi.class);
}
public SharedLinksApi getSharedLinksApi() {
return this.getApi(SharedLinksApi.class);
}
public SharedLinksApi getSharedLinksApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, SharedLinksApi.class);
}
public SitesApi getSitesApi() {
return this.getApi(SitesApi.class);
}
public SitesApi getSitesApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, SitesApi.class);
}
public TagsApi getTagsApi() {
return this.getApi(TagsApi.class);
}
public TagsApi getTagsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, TagsApi.class);
}
public TrashcanApi getTrashcanApi() {
return this.getApi(TrashcanApi.class);
}
public TrashcanApi getTrashcanApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, TrashcanApi.class);
}
public VersionsApi getVersionsApi() {
return this.getApi(VersionsApi.class);
}
public VersionsApi getVersionsApi(AuthorizationFilter authFilter) {
return this.getApi(authFilter, VersionsApi.class);
}
public V0Api getV0Api() {
return this.getApi(V0Api.class);
}
public V0Api getV0Api(AuthorizationFilter authFilter) {
return this.getApi(authFilter, V0Api.class);
}
}

View File

@@ -5,10 +5,15 @@ 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;
/**
* Alfresco Content Services Spring-ready API for CXF
* 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
@@ -17,18 +22,35 @@ 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
protected <T> T getApi(Class<T> apiClass) {
return this.client.getApi(apiClass);
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);
}
}

View File

@@ -5,10 +5,15 @@ 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;
/**
* Alfresco Content Services Spring-ready API for Jersey
* 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
@@ -17,18 +22,35 @@ 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
protected <T> T getApi(Class<T> apiClass) {
return this.client.getApi(apiClass);
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);
}
}

View File

@@ -8,8 +8,10 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import com.inteligr8.alfresco.acs.model.Error;
import com.inteligr8.alfresco.acs.model.NodeBodyCreate;
@@ -26,8 +28,8 @@ public interface NodesCxfApi {
@POST
@Path("/nodes/{nodeId}/children")
@Consumes({ "application/json", "multipart/form-data" })
@Produces({ "application/json" })
@Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON })
@ApiOperation(value = "Create a node", tags={ })
@ApiResponses(value = {
@ApiResponse(code = 201, message = "Successful response", response = NodeEntry.class),
@@ -43,12 +45,12 @@ public interface NodesCxfApi {
@ApiResponse(code = 200, message = "Unexpected error", response = Error.class) })
public NodeEntry createNode(
@PathParam("nodeId") String nodeId,
NodeBodyCreate nodeBodyCreate,
@Multipart NodeBodyCreate nodeBodyCreate,
@QueryParam("autoRename") Boolean autoRename,
@QueryParam("majorVersion") Boolean majorVersion,
@QueryParam("versioningEnabled") Boolean versioningEnabled,
@QueryParam("include") List<String> include,
@QueryParam("fields") List<String> fields,
List<Attachment> attachments);
@Multipart(value = "filedata", required = false) Attachment attachment);
}

View File

@@ -9,6 +9,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataParam;
@@ -28,8 +29,8 @@ public interface NodesJerseyApi {
@POST
@Path("/nodes/{nodeId}/children")
@Consumes({ "application/json", "multipart/form-data" })
@Produces({ "application/json" })
@Consumes({ MediaType.MULTIPART_FORM_DATA })
@Produces({ MediaType.APPLICATION_JSON })
@ApiOperation(value = "Create a node", tags={ })
@ApiResponses(value = {
@ApiResponse(code = 201, message = "Successful response", response = NodeEntry.class),

View File

@@ -13,7 +13,7 @@ public class ConstraintInfo {
private String type;
@JsonProperty
private List<Map<String, String>> parameters;
private List<Map<String, Object>> parameters;
public String getType() {
return type;
@@ -23,11 +23,11 @@ public class ConstraintInfo {
this.type = type;
}
public List<Map<String, String>> getParameters() {
public List<Map<String, Object>> getParameters() {
return parameters;
}
public void setParameters(List<Map<String, String>> parameters) {
public void setParameters(List<Map<String, Object>> parameters) {
this.parameters = parameters;
}

View File

@@ -33,7 +33,7 @@ public class PropertyInfo extends NamedObject {
private boolean indexed;
@JsonProperty
private List<ConstraintInfo> contraints;
private List<ConstraintInfo> constraints;
@@ -100,5 +100,13 @@ public class PropertyInfo extends NamedObject {
public void setIndexed(boolean indexed) {
this.indexed = indexed;
}
public List<ConstraintInfo> getConstraints() {
return constraints;
}
public void setConstraints(List<ConstraintInfo> constraints) {
this.constraints = constraints;
}
}