From 45d055c7435d1bf56d66a134f1429f91437f5d26 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 3 Sep 2021 13:00:04 -0400 Subject: [PATCH 1/5] fixed model property constraints --- .../inteligr8/alfresco/acs/model/v0/PropertyInfo.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/inteligr8/alfresco/acs/model/v0/PropertyInfo.java b/src/main/java/com/inteligr8/alfresco/acs/model/v0/PropertyInfo.java index 0a6a6dd..6c32b06 100755 --- a/src/main/java/com/inteligr8/alfresco/acs/model/v0/PropertyInfo.java +++ b/src/main/java/com/inteligr8/alfresco/acs/model/v0/PropertyInfo.java @@ -33,7 +33,7 @@ public class PropertyInfo extends NamedObject { private boolean indexed; @JsonProperty - private List contraints; + private List constraints; @@ -100,5 +100,13 @@ public class PropertyInfo extends NamedObject { public void setIndexed(boolean indexed) { this.indexed = indexed; } + + public List getConstraints() { + return constraints; + } + + public void setConstraints(List constraints) { + this.constraints = constraints; + } } From 12a14754473c9df62aff8e100b880379e6310d17 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 3 Sep 2021 12:51:46 -0400 Subject: [PATCH 2/5] changed access token to bearer token --- .../inteligr8/alfresco/acs/AcsClientConfiguration.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java index db447e8..353c209 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java @@ -20,8 +20,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; @@ -62,8 +62,8 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer return this.basicAuthPassword; } - public String getAccessToken() { - return this.accessToken; + public String getBearerToken() { + return this.bearerToken; } public String getOAuthTokenUrl() { From 6051c27790796e471fa832068c304fc521941526 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 3 Sep 2021 12:54:21 -0400 Subject: [PATCH 3/5] enabled pojo support --- .../alfresco/acs/AcsClientConfiguration.java | 52 +++++++++++++++++++ .../alfresco/acs/AcsClientCxfImpl.java | 14 +++++ .../alfresco/acs/AcsClientJerseyImpl.java | 14 +++++ .../alfresco/acs/AcsPublicRestApi.java | 11 +++- .../alfresco/acs/AcsPublicRestApiCxfImpl.java | 18 ++++++- .../acs/AcsPublicRestApiJerseyImpl.java | 18 ++++++- 6 files changed, 122 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java index 353c209..777e81c 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java @@ -54,52 +54,104 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer 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; + } + } diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java index 8d997a8..8c5c44c 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java @@ -17,6 +17,20 @@ public class AcsClientCxfImpl extends ClientCxfImpl { @Autowired private AcsClientConfiguration config; + /** + * This constructor is for Spring use. + */ + AcsClientCxfImpl() { + } + + /** + * This constructor is for POJO use. + * @param config + */ + public AcsClientCxfImpl(AcsClientConfiguration config) { + this.config = config; + } + @Override protected ClientCxfConfiguration getConfig() { return this.config; diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java index 9fed41e..09a03a8 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java @@ -17,6 +17,20 @@ public class AcsClientJerseyImpl extends ClientJerseyImpl { @Autowired private AcsClientConfiguration config; + /** + * This constructor is for Spring use. + */ + AcsClientJerseyImpl() { + } + + /** + * This constructor is for POJO use. + * @param config + */ + public AcsClientJerseyImpl(AcsClientConfiguration config) { + this.config = config; + } + @Override protected ClientJerseyConfiguration getConfig() { return this.config; diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java index 8b0d48a..878d9f1 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java @@ -26,6 +26,7 @@ import com.inteligr8.alfresco.acs.api.TrashcanApi; import com.inteligr8.alfresco.acs.api.TypesApi; import com.inteligr8.alfresco.acs.api.V0Api; import com.inteligr8.alfresco.acs.api.VersionsApi; +import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -35,7 +36,15 @@ public abstract class AcsPublicRestApi { abstract ClientConfiguration getConfig(); - protected abstract T getApi(Class apiClass); + abstract Client getClient(); + + protected final T getApi(Class apiClass) { + return this.getApi(null, apiClass); + } + + protected T getApi(AuthorizationFilter authFilter, Class apiClass) { + return this.getClient().getApi(authFilter, apiClass); + } public ActionsApi getActionsApi() { return this.getApi(ActionsApi.class); diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java index 6934da5..37e1fd9 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java @@ -5,6 +5,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import com.inteligr8.alfresco.acs.api.NodesCxfApi; +import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -17,14 +18,27 @@ public class AcsPublicRestApiCxfImpl extends AcsPublicRestApi { @Autowired private AcsClientCxfImpl client; + /** + * This constructor is for Spring use. + */ + AcsPublicRestApiCxfImpl() { + } + + /** + * This constructor is for POJO use. + */ + public AcsPublicRestApiCxfImpl(AcsClientCxfImpl client) { + this.client = client; + } + @Override ClientConfiguration getConfig() { return this.client.getConfig(); } @Override - protected T getApi(Class apiClass) { - return this.client.getApi(apiClass); + Client getClient() { + return this.client; } public NodesCxfApi getNodesExtApi() { diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java index 8548a11..816d913 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java @@ -5,6 +5,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; import com.inteligr8.alfresco.acs.api.NodesJerseyApi; +import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -17,14 +18,27 @@ public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApi { @Autowired private AcsClientJerseyImpl client; + /** + * This constructor is for Spring use. + */ + AcsPublicRestApiJerseyImpl() { + } + + /** + * This constructor is for POJO use. + */ + public AcsPublicRestApiJerseyImpl(AcsClientJerseyImpl client) { + this.client = client; + } + @Override ClientConfiguration getConfig() { return this.client.getConfig(); } @Override - protected T getApi(Class apiClass) { - return this.client.getApi(apiClass); + Client getClient() { + return this.client; } public NodesJerseyApi getNodesExtApi() { From e2bde23f6453ecd5ffc2f7b9ba8797ea5c874189 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 3 Sep 2021 12:55:27 -0400 Subject: [PATCH 4/5] added post-config auth support --- .../alfresco/acs/AcsPublicRestApi.java | 105 ++++++++++++++++++ .../alfresco/acs/AcsPublicRestApiCxfImpl.java | 5 + .../acs/AcsPublicRestApiJerseyImpl.java | 5 + 3 files changed, 115 insertions(+) diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java index 878d9f1..fa70e6f 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java @@ -26,6 +26,7 @@ import com.inteligr8.alfresco.acs.api.TrashcanApi; import com.inteligr8.alfresco.acs.api.TypesApi; 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; @@ -50,104 +51,208 @@ public abstract class AcsPublicRestApi { 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 AspectsApi getAspectsApi() { return this.getApi(AspectsApi.class); } + public AspectsApi getAspectsApi(AuthorizationFilter authFilter) { + return this.getApi(authFilter, AspectsApi.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 TypesApi getTypesApi() { return this.getApi(TypesApi.class); } + public TypesApi getTypesApi(AuthorizationFilter authFilter) { + return this.getApi(authFilter, TypesApi.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); + } } diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java index 37e1fd9..530b6ae 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java @@ -5,6 +5,7 @@ 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; @@ -44,5 +45,9 @@ public class AcsPublicRestApiCxfImpl extends AcsPublicRestApi { public NodesCxfApi getNodesExtApi() { return this.client.getApi(NodesCxfApi.class); } + + public NodesCxfApi getNodesExtApi(AuthorizationFilter authFilter) { + return this.client.getApi(authFilter, NodesCxfApi.class); + } } diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java index 816d913..e01001f 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java @@ -5,6 +5,7 @@ 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; @@ -44,5 +45,9 @@ public class AcsPublicRestApiJerseyImpl extends AcsPublicRestApi { public NodesJerseyApi getNodesExtApi() { return this.client.getApi(NodesJerseyApi.class); } + + public NodesJerseyApi getNodesExtApi(AuthorizationFilter authFilter) { + return this.client.getApi(authFilter, NodesJerseyApi.class); + } } From 96bdcda33a468be5f28dc0f301491ba1933afaa1 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Fri, 3 Sep 2021 12:56:35 -0400 Subject: [PATCH 5/5] added javadoc --- pom.xml | 13 ++++++++++++ .../alfresco/acs/AcsClientConfiguration.java | 20 +++++++++++++------ .../alfresco/acs/AcsClientCxfImpl.java | 7 ++++++- .../alfresco/acs/AcsClientJerseyImpl.java | 7 ++++++- .../alfresco/acs/AcsPublicRestApi.java | 7 +++++-- .../alfresco/acs/AcsPublicRestApiCxfImpl.java | 7 +++++-- .../acs/AcsPublicRestApiJerseyImpl.java | 5 ++++- 7 files changed, 53 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 1c2c174..3e28155 100644 --- a/pom.xml +++ b/pom.xml @@ -148,6 +148,19 @@ + + maven-javadoc-plugin + + + javadoc + package + jar + + public + + + + diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java index 777e81c..b436423 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.java @@ -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 & 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 { @@ -49,7 +57,7 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer @Value("${content.service.jersey.putBodyRequired:true}") private boolean putBodyRequired; - + public String getBaseUrl() { return this.baseUrl; } @@ -77,7 +85,7 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer public String getBearerToken() { return this.bearerToken; } - + public void setBearerToken(String bearerToken) { this.bearerToken = bearerToken; } @@ -85,7 +93,7 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer public String getOAuthTokenUrl() { return this.oAuthTokenUrl; } - + public void setOAuthTokenUrl(String oAuthTokenUrl) { this.oAuthTokenUrl = oAuthTokenUrl; } @@ -109,7 +117,7 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer public String getOAuthAuthCode() { return this.oAuthAuthCode; } - + public void setOAuthAuthCode(String oAuthAuthCode) { this.oAuthAuthCode = oAuthAuthCode; } @@ -117,7 +125,7 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer public String getOAuthAuthRedirectUri() { return this.oAuthAuthRedirectUri; } - + public void setOAuthAuthRedirectUri(String oAuthAuthRedirectUri) { this.oAuthAuthRedirectUri = oAuthAuthRedirectUri; } @@ -141,7 +149,7 @@ public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJer public boolean isDefaultBusEnabled() { return this.defaultBusEnabled; } - + public void setDefaultBusEnabled(boolean defaultBusEnabled) { this.defaultBusEnabled = defaultBusEnabled; } diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java index 8c5c44c..7c78d77 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java @@ -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 & 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 diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java index 09a03a8..68fc263 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java @@ -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 & 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 diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java index fa70e6f..4c38b15 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java @@ -31,7 +31,10 @@ 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 { @@ -74,7 +77,7 @@ public abstract class AcsPublicRestApi { public AuditApi getAuditApi() { return this.getApi(AuditApi.class); } - + public AuditApi getAuditApi(AuthorizationFilter authFilter) { return this.getApi(authFilter, AuditApi.class); } diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java index 530b6ae..b31bd5f 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiCxfImpl.java @@ -10,7 +10,10 @@ 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 @@ -36,7 +39,7 @@ public class AcsPublicRestApiCxfImpl extends AcsPublicRestApi { ClientConfiguration getConfig() { return this.client.getConfig(); } - + @Override Client getClient() { return this.client; diff --git a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java index e01001f..69e0708 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApiJerseyImpl.java @@ -10,7 +10,10 @@ 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