ClientLib Support For Multiple Controllers

-APPC client library should support multiple controllers
-To support MSO added string controllerType

Issue-ID: APPC-683
Change-Id: Ief8416cb0912acc26015cb8271432de92a0af7dd
Signed-off-by: vidhyasree <sn141y@att.com>

2 files changed, 14 insertions, 7 deletions

diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBMessagingService.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBMessagingService.java
index 5c92a008f..0a9e1a630 100644
--- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBMessagingService.java
+++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBMessagingService.java
@@ -9,15 +9,15 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
@@ -49,11 +49,17 @@ class UEBMessagingService implements MessagingService {
     @Override
     @SuppressWarnings("Since15")
     public void init(Properties props)
-        throws IOException, GeneralSecurityException, NoSuchFieldException, IllegalAccessException {
+            throws IOException, GeneralSecurityException, NoSuchFieldException, IllegalAccessException {
 
         if (props != null) {
             String readTopic = props.getProperty(UEBPropertiesKeys.TOPIC_READ);
             String writeTopic = props.getProperty(UEBPropertiesKeys.TOPIC_WRITE);
+            String cType = props.getProperty(UEBPropertiesKeys.CONTROLLER_TYPE);
+            if (cType != null && cType.length()!= 0 && (!cType.equals("APPC")))
+            {
+                readTopic = cType + "-" + readTopic;
+                writeTopic = cType + "-" + writeTopic;
+            }
             String apiKey = props.getProperty(UEBPropertiesKeys.AUTH_USER);
             String apiSecret = props.getProperty(UEBPropertiesKeys.AUTH_SECRET);
             String readTimeoutString = props.getProperty(UEBPropertiesKeys.TOPIC_READ_TIMEOUT, DEFAULT_READ_TIMEOUT_MS);
diff --git a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBPropertiesKeys.java b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBPropertiesKeys.java
index 5c1916f2b..81f109a44 100644
--- a/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBPropertiesKeys.java
+++ b/appc-client/client-lib/src/main/java/org/onap/appc/client/impl/protocol/UEBPropertiesKeys.java
@@ -9,15 +9,15 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
@@ -33,4 +33,5 @@ class UEBPropertiesKeys {
     static final String AUTH_USER = "client.key";
     static final String AUTH_SECRET = "client.secret";
     static final String HOSTS = "poolMembers";
+    static final String CONTROLLER_TYPE = "controllerType";
 }