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 f23e50b..9f574eb 100644 --- a/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/acs/AcsPublicRestApi.java @@ -24,6 +24,7 @@ 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.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -33,7 +34,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() {