From fbbf8e15653b42c27a16cd86ad74dbb286144aef Mon Sep 17 00:00:00 2001 From: Arthur Martella Date: Wed, 23 May 2018 15:19:21 -0400 Subject: 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 --- .../openecomp/mso/client/appc/ApplicationControllerClient.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'bpmn/MSOCommonBPMN/src/main/java/org/openecomp') 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 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")); -- cgit 1.2.3-korg