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>

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 c9b2962..4255df3 100644 (file)
--- 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"));