Bug fix 'sourceName' -> 'correlationId'

In case of PNF_REGISTRATION event components
like SO and Dmaap are expecting to get
'correlationId' parameter rather than
'sourceName'.

This change simply maps 'sourceName' to 'correlationId'

Change-Id: Ic99ffc6cd61a76f1a8c46c50da7c16660b1b7acf
Issue-ID: DCAEGEN2-744
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java
index 83a078df..20820fce 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/CommonFunctions.java
@@ -40,6 +40,6 @@ public class CommonFunctions {
         GsonBuilder gsonBuilder = new GsonBuilder();
         ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory);
         return gsonBuilder.create().toJson(ImmutableConsumerDmaapModel.builder().ipv4(consumerDmaapModel.getIpv4())
-            .ipv6(consumerDmaapModel.getIpv6()).sourceName(consumerDmaapModel.getSourceName()).build());
+            .ipv6(consumerDmaapModel.getIpv6()).correlationId(consumerDmaapModel.getCorrelationId()).build());
     }
 }
\ No newline at end of file
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java
index f34256c5..6d488c85 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java
@@ -32,8 +32,8 @@ import org.immutables.value.Value;
 @Gson.TypeAdapters(fieldNamingStrategy = true)
 public interface ConsumerDmaapModel {
 
-    @SerializedName(value = "sourceName", alternate = "sourceName")
-    String getSourceName();
+    @SerializedName(value = "correlationId", alternate = "correlationId")
+    String getCorrelationId();
 
     @SerializedName(value = "ipaddress-v4-oam", alternate = "ipaddress-v4-oam")
     String getIpv4();
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java
index 339ddb6d..8a0699c7 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java
@@ -22,7 +22,7 @@ package org.onap.dcaegen2.services.prh.model;
 
 public class ConsumerDmaapModelForUnitTest implements ConsumerDmaapModel {
 
-    private final String sourceName;
+    private final String correlationId;
     private final String ipv4;
     private final String ipv6;
 
@@ -30,14 +30,14 @@ public class ConsumerDmaapModelForUnitTest implements ConsumerDmaapModel {
      * Class for testing serialization of ConsumerDmaapModel.
      */
     public ConsumerDmaapModelForUnitTest() {
-        this.sourceName = "NOKnhfsadhff";
+        this.correlationId = "NOKnhfsadhff";
         this.ipv4 = "256.22.33.155";
         this.ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
 
     }
 
-    public String getSourceName() {
-        return sourceName;
+    public String getCorrelationId() {
+        return correlationId;
     }
 
     public String getIpv4() {