From 5399a77993d83b699bae9cdc357298dd317b506d Mon Sep 17 00:00:00 2001
From: "Brian M. Long" <brian@inteligr8.com>
Date: Tue, 31 Aug 2021 13:27:33 -0400
Subject: [PATCH] updated for commons-rest-api v1.1.x
---
pom.xml | 2 +-
.../activiti/ApsClientConfiguration.java | 19 +++++++++++++++++--
.../alfresco/activiti/ApsClientCxfImpl.java | 4 ++--
.../activiti/ApsClientJerseyImpl.java | 4 ++--
4 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7dc738d..6cedd2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<dependency>
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java
index f66136b..dd98971 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientConfiguration.java
@@ -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;
+ }
}
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java
index 36a613b..aee055f 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientCxfImpl.java
@@ -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;
}
diff --git a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java
index 874d70c..8eca94f 100644
--- a/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java
+++ b/src/main/java/com/inteligr8/alfresco/activiti/ApsClientJerseyImpl.java
@@ -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;
}