aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOCommonBPMN
diff options
context:
space:
mode:
authorArthur Martella <am153x@att.com>2018-05-23 15:19:21 -0400
committerArthur Martella <am153x@att.com>2018-05-23 15:19:21 -0400
commitfbbf8e15653b42c27a16cd86ad74dbb286144aef (patch)
treee7bb2fdc69ffbc9b12735474904e1b2c9c9db762 /bpmn/MSOCommonBPMN
parent8a92d3980f67072d8d5152ffbc041577b8ba0749 (diff)
APPC client changes topic for controllerType
... again. Back to just changing topic.read and topic.write based on controllerType (but still setting controllerType too, just in case). Change-Id: I175d20b998c6d141ca7587504535bd7bb494563c Issue-ID: INT-475 Signed-off-by: Arthur Martella <am153x@att.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
index c9b296223d..4255df3e87 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
@@ -142,8 +142,13 @@ public class ApplicationControllerClient {
Properties properties = new Properties();
Map<String, String> globalProperties = PropertyConfiguration.getInstance()
.getProperties("mso.bpmn.urn.properties");
- properties.put("topic.read", globalProperties.get("appc.client.topic.read"));
- properties.put("topic.write", globalProperties.get("appc.client.topic.write"));
+ if (controllerType==null || controllerType.length()==0 || controllerType.equalsIgnoreCase("appc")) {
+ properties.put("topic.read", globalProperties.get("appc.client.topic.read"));
+ properties.put("topic.write", globalProperties.get("appc.client.topic.write"));
+ } else {
+ properties.put("topic.read", globalProperties.get("appc.client.topic." + controllerType + ".read"));
+ properties.put("topic.write", globalProperties.get("appc.client.topic." + controllerType + ".write"));
+ }
properties.put("topic.sdnc.read", globalProperties.get("appc.client.topic.sdnc.read"));
properties.put("topic.sdnc.write", globalProperties.get("appc.client.topic.sdnc.write"));
properties.put("sdnc-topic.read", globalProperties.get("appc.client.topic.sdnc.read"));