From 5b38b56d8b6a7fca299e0243a7dc91d460f4735c Mon Sep 17 00:00:00 2001 From: wasala Date: Wed, 13 Jun 2018 11:39:14 +0200 Subject: Added simply logs from tasks. *Logging responsed object from DmaaP *Logging parsed oject from DmaaP *Logging sended object to AAI *Logging sended object and topic To DmaaP Change-Id: I33de0cd751762ac004f9d8a09beee921f4026af6 Issue-ID: DCAEGEN2-545 Signed-off-by: wasala --- .../onap/dcaegen2/services/prh/model/CommonFunctions.java | 13 ++++++++----- .../dcaegen2/services/prh/model/ConsumerDmaapModel.java | 8 ++++---- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'prh-commons/src/main') 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 c78146f7..9e5a73da 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 @@ -20,17 +20,20 @@ package org.onap.dcaegen2.services.prh.model; -import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.TypeAdapterFactory; +import java.util.ServiceLoader; public class CommonFunctions { - private static Gson gson = new GsonBuilder().create(); - - private CommonFunctions() {} + private CommonFunctions() { + } public static String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { - return gson.toJson(consumerDmaapModel); + GsonBuilder gsonBuilder = new GsonBuilder(); + ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory); + return gsonBuilder.create().toJson(ImmutableConsumerDmaapModel.builder().ipv4(consumerDmaapModel.getIpv4()) + .ipv6(consumerDmaapModel.getIpv6()).pnfName(consumerDmaapModel.getPnfName()).build()); } } 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 dae0e59e..7dba211f 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 @@ -28,15 +28,15 @@ import org.immutables.value.Value; */ @Value.Immutable -@Gson.TypeAdapters +@Gson.TypeAdapters(fieldNamingStrategy = true) public interface ConsumerDmaapModel { - @SerializedName("pnf-name") + @SerializedName(value = "pnf-name", alternate = "pnf-name") String getPnfName(); - @SerializedName("ipaddress-v4-oam") + @SerializedName(value = "ipaddress-v4-oam", alternate = "ipaddress-v4-oam") String getIpv4(); - @SerializedName("ipaddress-v6-oam") + @SerializedName(value = "ipaddress-v6-oam", alternate = "ipaddress-v6-oam") String getIpv6(); } -- cgit 1.2.3-korg