Bug fix in DMAAP message parsing for CMNotify

Minor bug fix in the DMAAP message for CMNotify

Issue-ID: CCSDK-2383
Signed-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: Ia080adafecf6d6b3a12682aaab3f244a33a16de5
Signed-off-by: Dan Timoney <dtimoney@att.com>

30 files changed, 30 insertions, 34 deletions

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 4eac5974..622bc55b 100755
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>sli-northbound-artifacts</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: sli-northbound-artifacts</name>
diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index b425e13a..57d9139e 100755
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
 	<artifactId>asdcApi-installer</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
diff --git a/asdcApi/model/pom.xml b/asdcApi/model/pom.xml
index bb751370..f90bf50b 100755
--- a/asdcApi/model/pom.xml
+++ b/asdcApi/model/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-model</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml
index 6351b4bd..0432f8fc 100755
--- a/asdcApi/pom.xml
+++ b/asdcApi/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi</name>
diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml
index 97b67a32..8b39015d 100755
--- a/asdcApi/provider/pom.xml
+++ b/asdcApi/provider/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>asdcApi-provider</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
diff --git a/daexim-offsite-backup/installer/pom.xml b/daexim-offsite-backup/installer/pom.xml
index e4768dcf..b416680c 100755
--- a/daexim-offsite-backup/installer/pom.xml
+++ b/daexim-offsite-backup/installer/pom.xml
@@ -11,7 +11,7 @@
     <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>daexim-offsite-backup-installer</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
         <application.name>ccsdk-daexim-offsite-backup</application.name>
diff --git a/daexim-offsite-backup/model/pom.xml b/daexim-offsite-backup/model/pom.xml
index b5efbe1c..80befbab 100755
--- a/daexim-offsite-backup/model/pom.xml
+++ b/daexim-offsite-backup/model/pom.xml
@@ -11,7 +11,7 @@
     <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>daexim-offsite-backup-model</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencies>
diff --git a/daexim-offsite-backup/pom.xml b/daexim-offsite-backup/pom.xml
index 05625dea..7d9317c3 100755
--- a/daexim-offsite-backup/pom.xml
+++ b/daexim-offsite-backup/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>daexim-offsite-backup</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: daexim-offsite-backup</name>
diff --git a/daexim-offsite-backup/provider/pom.xml b/daexim-offsite-backup/provider/pom.xml
index c85d1f71..15b2741c 100755
--- a/daexim-offsite-backup/provider/pom.xml
+++ b/daexim-offsite-backup/provider/pom.xml
@@ -11,7 +11,7 @@
     <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>daexim-offsite-backup-provider</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <build>
diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index 4fd2a818..4a812333 100755
--- a/dataChange/installer/pom.xml
+++ b/dataChange/installer/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-installer</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
diff --git a/dataChange/model/pom.xml b/dataChange/model/pom.xml
index 2c67a5ae..963de33d 100755
--- a/dataChange/model/pom.xml
+++ b/dataChange/model/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-model</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
diff --git a/dataChange/pom.xml b/dataChange/pom.xml
index b02ecba2..d40f35d4 100755
--- a/dataChange/pom.xml
+++ b/dataChange/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange</name>
diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml
index 20ee9e70..4012a82f 100755
--- a/dataChange/provider/pom.xml
+++ b/dataChange/provider/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dataChange-provider</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml
index 6beea455..0317e3e2 100755
--- a/dmaap-listener/pom.xml
+++ b/dmaap-listener/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>dmaap-listener</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-sli-northbound :: dmaap-listener</name>
diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/CMNotifyDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/CMNotifyDmaapConsumer.java
index e49e77ea..fa14fbb2 100644
--- a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/CMNotifyDmaapConsumer.java
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/CMNotifyDmaapConsumer.java
@@ -71,14 +71,10 @@ public class CMNotifyDmaapConsumer extends SdncDmaapConsumerImpl {
             return;
         }
 
-        JSONObject rpcMsgBodyNode = new JSONObject();
-
-        rpcMsgBodyNode.put(INPUT,payloadNode);
-
         String rpcMsgbody;
         try {
             	ObjectMapper mapper = new ObjectMapper();
-                rpcMsgbody = mapper.writeValueAsString(rpcMsgBodyNode);
+                rpcMsgbody = "{\"input\":" + mapper.writeValueAsString(payloadNode) + "}";
 
         } catch (Exception e) {
             LOG.error("Unable to parse payload in CMNotify-DMAAP message", e);
diff --git a/features/ccsdk-asdcApi/pom.xml b/features/ccsdk-asdcApi/pom.xml
index c99d4498..6990a614 100644
--- a/features/ccsdk-asdcApi/pom.xml
+++ b/features/ccsdk-asdcApi/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-asdcApi</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
diff --git a/features/ccsdk-daexim-offsite-backup/pom.xml b/features/ccsdk-daexim-offsite-backup/pom.xml
index 210c9838..29b2a664 100644
--- a/features/ccsdk-daexim-offsite-backup/pom.xml
+++ b/features/ccsdk-daexim-offsite-backup/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-daexim-offsite-backup</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
diff --git a/features/ccsdk-dataChange/pom.xml b/features/ccsdk-dataChange/pom.xml
index f3b31cc3..d32e5106 100644
--- a/features/ccsdk-dataChange/pom.xml
+++ b/features/ccsdk-dataChange/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-dataChange</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
diff --git a/features/ccsdk-lcm/pom.xml b/features/ccsdk-lcm/pom.xml
index 5b759608..129a8dfc 100644
--- a/features/ccsdk-lcm/pom.xml
+++ b/features/ccsdk-lcm/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-lcm</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/features/ccsdk-sli-northbound-all/pom.xml b/features/ccsdk-sli-northbound-all/pom.xml
index a32bb431..d509c311 100644
--- a/features/ccsdk-sli-northbound-all/pom.xml
+++ b/features/ccsdk-sli-northbound-all/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ccsdk-sli-northbound-all</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
diff --git a/features/features-sli-northbound/pom.xml b/features/features-sli-northbound/pom.xml
index 442f04ca..02471df0 100644
--- a/features/features-sli-northbound/pom.xml
+++ b/features/features-sli-northbound/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>features-sli-northbound</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index fb53d1be..f6bdc410 100755
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>slinorthbound-features-installer</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name>
diff --git a/features/pom.xml b/features/pom.xml
index c438a076..7a859150 100755
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>slinorthbound-feature-aggregator</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: features</name>
diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml
index 53a64df5..e6f6472d 100755
--- a/lcm/installer/pom.xml
+++ b/lcm/installer/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-installer</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/model/pom.xml b/lcm/model/pom.xml
index ceaba9a9..ec2c1be7 100755
--- a/lcm/model/pom.xml
+++ b/lcm/model/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-model</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/lcm/pom.xml b/lcm/pom.xml
index 32dfb198..2e3480bb 100755
--- a/lcm/pom.xml
+++ b/lcm/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-northbound :: lcm</name>
diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml
index 9c5f0e9f..f3a5458d 100755
--- a/lcm/provider/pom.xml
+++ b/lcm/provider/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>lcm-provider</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
diff --git a/pom.xml b/pom.xml
index 4e279752..6bc09a61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
     <organization>
         <name>ONAP</name>
     </organization>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
 
 
 </project>
diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index e641d37a..664f0844 100755
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.onap.ccsdk.sli.northbound</groupId>
     <artifactId>ueb-listener</artifactId>
-    <version>0.7.3-SNAPSHOT</version>
+    <version>0.7.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ccsdk-sli-northbound :: ueb-listener</name>
diff --git a/version.properties b/version.properties
index dd7857da..9be53b55 100644
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 release_name=0
 sprint_number=7
-feature_revision=3
+feature_revision=4
 
 base_version=${release_name}.${sprint_number}.${feature_revision}