10 Commits

2 changed files with 36 additions and 5 deletions

17
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.2-jersey</version> <version>2.0.4-jersey</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 Jersey-based REST API clients</description> <description>An ACS Client library for building Jersey-based REST API clients</description>
@@ -48,18 +48,19 @@
<junit.version>5.7.2</junit.version> <junit.version>5.7.2</junit.version>
<spring.version>5.3.6</spring.version> <spring.version>5.3.6</spring.version>
<jersey.version>2.39.1</jersey.version> <jersey.version>2.39.1</jersey.version>
<jackson.version>2.15.1</jackson.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-jersey</version> <version>2.0.8-jersey</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>
@@ -92,13 +93,19 @@
<groupId>org.glassfish.jersey.inject</groupId> <groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId> <artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
<scope>test</scope> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.media</groupId> <groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
<scope>test</scope> </dependency>
<!-- Jersey library fallout -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

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;
}
} }