summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
diff options
context:
space:
mode:
authorVENKATESH KUMAR <vv770d@att.com>2017-12-07 15:30:01 +0000
committerVENKATESH KUMAR <vv770d@att.com>2017-12-07 10:53:26 -0500
commit9346cb2915128831b4f58854362775f33cbd7415 (patch)
tree56c1d1e56a19fa549cdcc54d16d343c75aa13811 /src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
parentc4098a3af4794da9a1516760baa2318fb91ae258 (diff)
code sync-up updates
Issue-ID: DCAEGEN2-212 Change-Id: Id72d2b1851ff4457295088609c355e19d19e3d73 Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Diffstat (limited to 'src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java')
-rw-r--r--src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
index b10f5882..6ff24abf 100644
--- a/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
+++ b/src/main/java/org/onap/dcae/commonFunction/DmaapPropertyReader.java
@@ -52,7 +52,8 @@ public class DmaapPropertyReader {
fr = new FileReader(CambriaConfigFile);
root = new JsonParser().parse(fr);
- //Check if dmaap config is handled by legacy controller/service manager
+ // Check if dmaap config is handled by legacy controller/service
+ // manager
if (root.getAsJsonObject().has("channels")) {
JsonArray jsonObject = (JsonArray) root.getAsJsonObject().get("channels");
@@ -88,13 +89,14 @@ public class DmaapPropertyReader {
}
} else {
- //Handing new format from controllergen2/config_binding_service
+ // Handing new format from controllergen2/config_binding_service
JsonObject jsonObject = root.getAsJsonObject();
Set<Map.Entry<String, JsonElement>> entries = jsonObject.entrySet();
for (Map.Entry<String, JsonElement> entry : entries) {
-
- JsonElement topicurl = entry.getValue().getAsJsonObject().get("dmaap_info").getAsJsonObject().get("topic_url");
+
+ JsonElement topicurl = entry.getValue().getAsJsonObject().get("dmaap_info").getAsJsonObject()
+ .get("topic_url");
String[] urlParts = dmaapUrlSplit(topicurl.toString().replace("\"", ""));
String mrTopic = null;