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

Merge branch 'develop-acs6' into stable-acs6

Browse Source
This commit is contained in:
Brian Long
2021-08-31 13:41:55 -04:00
parent 3aed4d2e4e 41379c3970
commit 29baa2a56a
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId> <artifactId>acs-public-rest-api</artifactId>
<version>1.0.6-v1-acs6</version> <version>1.1.0-v1-acs6</version>
<name>Alfresco Content Services ReST API Client for Java</name> <name>Alfresco Content Services ReST API Client for Java</name>
<properties> <properties>
@@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>com.inteligr8</groupId> <groupId>com.inteligr8</groupId>
<artifactId>common-rest-api</artifactId> <artifactId>common-rest-api</artifactId>
<version>1.0.2</version> <version>1.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>

19
src/main/java/com/inteligr8/alfresco/acs/AcsClientConfiguration.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.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.inteligr8.rs.ClientConfiguration; import com.inteligr8.rs.ClientCxfConfiguration;
import com.inteligr8.rs.ClientJerseyConfiguration;
@Configuration @Configuration
@ComponentScan @ComponentScan
public class AcsClientConfiguration extends ClientConfiguration { public class AcsClientConfiguration implements ClientCxfConfiguration, ClientJerseyConfiguration {
@Value("${content.service.baseUrl:http://localhost:8080/alfresco}") @Value("${content.service.baseUrl:http://localhost:8080/alfresco}")
private String baseUrl; private String baseUrl;
@@ -43,6 +44,12 @@ public class AcsClientConfiguration extends ClientConfiguration {
@Value("${content.service.security.oauth.grantPassword:#{null}}") @Value("${content.service.security.oauth.grantPassword:#{null}}")
private String oAuthPassword; private String oAuthPassword;
@Value("${content.service.cxf.defaultBusEnabled:true}")
private boolean defaultBusEnabled;
@Value("${content.service.jersey.putBodyRequired:true}")
private boolean putBodyRequired;
public String getBaseUrl() { public String getBaseUrl() {
return this.baseUrl; return this.baseUrl;
} }
@@ -86,5 +93,13 @@ public class AcsClientConfiguration extends ClientConfiguration {
public String getOAuthPassword() { public String getOAuthPassword() {
return this.oAuthPassword; return this.oAuthPassword;
} }
public boolean isDefaultBusEnabled() {
return this.defaultBusEnabled;
}
public boolean isPutBodyRequired() {
return this.putBodyRequired;
}
} }

4
src/main/java/com/inteligr8/alfresco/acs/AcsClientCxfImpl.java
View File

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

4
src/main/java/com/inteligr8/alfresco/acs/AcsClientJerseyImpl.java
View File

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