10 Commits

2 changed files with 33 additions and 9 deletions

18
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-client</artifactId> <artifactId>acs-public-rest-client</artifactId>
<version>2.0.1</version> <version>2.0.4</version>
<name>Alfresco Content Services ReST API Client for Java</name> <name>Alfresco Content Services ReST API Client for Java</name>
<description>An ACS Client library for building REST API clients that support either the CXF and Jersey frameworks</description> <description>An ACS Client library for building REST API clients that support either the CXF and Jersey frameworks</description>
@@ -43,22 +43,22 @@
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel> <maven.compiler.debuglevel>lines,vars,source</maven.compiler.debuglevel>
<acs.platform.tag>acs62</acs.platform.tag> <acs.platform.tag>acs7</acs.platform.tag>
<junit.version>5.7.2</junit.version> <junit.version>5.7.2</junit.version>
<spring.version>5.2.14.RELEASE</spring.version> <spring.version>5.3.6</spring.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.inteligr8</groupId> <groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId> <artifactId>common-rest-client</artifactId>
<version>2.0.1</version> <version>2.0.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.inteligr8.alfresco</groupId> <groupId>com.inteligr8.alfresco</groupId>
<artifactId>acs-public-rest-api</artifactId> <artifactId>acs-public-rest-api</artifactId>
<version>2.0.1-${acs.platform.tag}</version> <version>2.1-SNAPSHOT-${acs.platform.tag}</version>
<scope>provided</scope> <!-- explicitly, bring your own version --> <scope>provided</scope> <!-- explicitly, bring your own version -->
</dependency> </dependency>
<dependency> <dependency>
@@ -76,13 +76,13 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.5.9</version> <version>4.5.14</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version> <version>2.19.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -91,7 +91,7 @@
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version> <version>3.1.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
@@ -102,7 +102,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M5</version> <version>3.1.0</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>

View File

@@ -61,6 +61,12 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
@Value("${content.service.security.oauth.grantPassword:#{null}}") @Value("${content.service.security.oauth.grantPassword:#{null}}")
private String oAuthPassword; private String oAuthPassword;
@Value("${content.service.http.connectTimeout:#{null}}")
private Integer connectTimeoutInMillis;
@Value("${content.service.http.responseTimeout:#{null}}")
private Integer responseTimeoutInMillis;
public String getBaseUrl() { public String getBaseUrl() {
return this.baseUrl; return this.baseUrl;
} }
@@ -148,5 +154,23 @@ public abstract class AcsClientConfiguration implements ClientConfiguration {
public void setOAuthPassword(String oAuthPassword) { public void setOAuthPassword(String oAuthPassword) {
this.oAuthPassword = oAuthPassword; this.oAuthPassword = oAuthPassword;
} }
@Override
public Integer getConnectTimeoutInMillis() {
return this.connectTimeoutInMillis;
}
public void setConnectTimeoutInMillis(Integer connectTimeoutInMillis) {
this.connectTimeoutInMillis = connectTimeoutInMillis;
}
@Override
public Integer getResponseTimeoutInMillis() {
return this.responseTimeoutInMillis;
}
public void setResponseTimeoutInMillis(Integer responseTimeoutInMillis) {
this.responseTimeoutInMillis = responseTimeoutInMillis;
}
} }