diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java index 986d536..274463e 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java @@ -49,57 +49,109 @@ public class ApsClientConfiguration implements ClientCxfConfiguration, ClientJer @Value("${process.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; + } + } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java index aee055f..803190e 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java @@ -17,6 +17,19 @@ public class ApsClientCxfImpl extends ClientCxfImpl { @Autowired private ApsClientConfiguration config; + /** + * This constructor is for Spring use + */ + ApsClientCxfImpl() { + } + + /** + * This constructor is for POJO use + */ + public ApsClientCxfImpl(ApsClientConfiguration config) { + this.config = config; + } + @Override protected ClientCxfConfiguration getConfig() { return this.config; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java index 8eca94f..0dd2a96 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java @@ -17,6 +17,19 @@ public class ApsClientJerseyImpl extends ClientJerseyImpl { @Autowired private ApsClientConfiguration config; + /** + * This constructor is for Spring use + */ + ApsClientJerseyImpl() { + } + + /** + * This constructor is for POJO use + */ + public ApsClientJerseyImpl(ApsClientConfiguration config) { + this.config = config; + } + @Override protected ClientJerseyConfiguration getConfig() { return this.config; diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java index fea480b..1ffac97 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApi.java @@ -5,6 +5,7 @@ import com.inteligr8.alfresco.activiti.api.AppVersionApi; import com.inteligr8.alfresco.activiti.api.ProcessInstancesApi; import com.inteligr8.alfresco.activiti.api.ProfileApi; import com.inteligr8.alfresco.activiti.api.TasksApi; +import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -14,7 +15,11 @@ public abstract class ApsPublicRestApi { protected abstract ClientConfiguration getConfig(); - protected abstract T getApi(Class apiClass); + protected abstract Client getClient(); + + protected T getApi(Class apiClass) { + return this.getClient().getApi(apiClass); + } public AdminApi getAdminApi() { return this.getApi(AdminApi.class); diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java index c261ae2..1efa048 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiCxfImpl.java @@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -16,14 +17,27 @@ public class ApsPublicRestApiCxfImpl extends ApsPublicRestApi { @Autowired private ApsClientCxfImpl client; + /** + * This constructor is for Spring use + */ + ApsPublicRestApiCxfImpl() { + } + + /** + * This constructor is for POJO use + */ + public ApsPublicRestApiCxfImpl(ApsClientCxfImpl client) { + this.client = client; + } + @Override protected ClientConfiguration getConfig() { return this.client.getConfig(); } - + @Override - protected T getApi(Class apiClass) { - return this.client.getApi(apiClass); + protected Client getClient() { + return this.client; } } diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java index aa80486..35cc0e0 100644 --- a/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java +++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsPublicRestApiJerseyImpl.java @@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Component; +import com.inteligr8.rs.Client; import com.inteligr8.rs.ClientConfiguration; /** @@ -16,14 +17,27 @@ public class ApsPublicRestApiJerseyImpl extends ApsPublicRestApi { @Autowired private ApsClientJerseyImpl client; + /** + * This constructor is for Spring use + */ + ApsPublicRestApiJerseyImpl() { + } + + /** + * This constructor is for POJO use + */ + public ApsPublicRestApiJerseyImpl(ApsClientJerseyImpl client) { + this.client = client; + } + @Override protected ClientConfiguration getConfig() { return this.client.getConfig(); } @Override - protected T getApi(Class apiClass) { - return this.client.getApi(apiClass); + protected Client getClient() { + return this.client; } }