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

Merge branch 'develop' into stable

Browse Source
This commit is contained in:
Brian Long 2021-08-31 13:28:40 -04:00
commit a3ab8a5c08
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8.alfresco</groupId>
<artifactId>aps-public-rest-api</artifactId>
<version>1.0.3-v1</version>
<version>1.1.0-v1</version>
<name>Alfresco Process Services ReST API Client for Java</name>
<properties>
@ -26,7 +26,7 @@
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-api</artifactId>
<version>1.0.1</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
@ -275,4 +275,4 @@
<url>http://repos.inteligr8.com/nexus/repository/inteligr8-public</url>
</pluginRepository>
</pluginRepositories>
</project>
</project>

19
src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java
View File

@ -4,11 +4,12 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import com.inteligr8.rs.ClientConfiguration;
import com.inteligr8.rs.ClientCxfConfiguration;
import com.inteligr8.rs.ClientJerseyConfiguration;
@Configuration
@ComponentScan
public class ApsClientConfiguration extends ClientConfiguration {
public class ApsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration {
@Value("${process.service.baseUrl:http://localhost:8080/activiti-app}")
private String baseUrl;
@ -42,6 +43,12 @@ public class ApsClientConfiguration extends ClientConfiguration {
@Value("${process.service.security.oauth.grantPassword:#{null}}")
private String oAuthPassword;
@Value("${process.service.cxf.defaultBusEnabled:true}")
private boolean defaultBusEnabled;
@Value("${process.service.jersey.putBodyRequired:true}")
private boolean putBodyRequired;
public String getBaseUrl() {
return this.baseUrl;
@ -86,5 +93,13 @@ public class ApsClientConfiguration extends ClientConfiguration {
public String getOAuthPassword() {
return this.oAuthPassword;
}
public boolean isDefaultBusEnabled() {
return this.defaultBusEnabled;
}
public boolean isPutBodyRequired() {
return this.putBodyRequired;
}
}

4
src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java
View File

@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import com.inteligr8.rs.ClientConfiguration;
import com.inteligr8.rs.ClientCxfConfiguration;
import com.inteligr8.rs.ClientCxfImpl;
/**
@ -18,7 +18,7 @@ public class ApsClientCxfImpl extends ClientCxfImpl {
private ApsClientConfiguration config;
@Override
protected ClientConfiguration getConfig() {
protected ClientCxfConfiguration getConfig() {
return this.config;
}

4
src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java
View File

@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import com.inteligr8.rs.ClientConfiguration;
import com.inteligr8.rs.ClientJerseyConfiguration;
import com.inteligr8.rs.ClientJerseyImpl;
/**
@ -18,7 +18,7 @@ public class ApsClientJerseyImpl extends ClientJerseyImpl {
private ApsClientConfiguration config;
@Override
protected ClientConfiguration getConfig() {
protected ClientJerseyConfiguration getConfig() {
return this.config;
}