From da01e853388b3715a4da488a73a10522e90bf0ed Mon Sep 17 00:00:00 2001 From: Joanna Jeremicz Date: Thu, 14 Mar 2019 08:52:17 +0100 Subject: Revert IP information removal Change-Id: I43cdc2f2086f884df1f74dfbf999addae2019b5e Issue-ID: DCAEGEN2-1312 Signed-off-by: Joanna Jeremicz --- .../org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java') diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java index f04168c2..d031b1b5 100644 --- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java +++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java @@ -42,7 +42,9 @@ public class JsonBodyBuilderImpl implements JsonBodyBuilder public String createJsonBody(ConsumerDmaapModel consumerDmaapModel) { GsonBuilder gsonBuilder = new GsonBuilder(); ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory); - return filterOutAdditionalFieldsIfEmpty(gsonBuilder.create().toJson(ImmutableConsumerDmaapModel.builder() + return filterOutRedundantFields(gsonBuilder.create().toJson(ImmutableConsumerDmaapModel.builder() + .ipv4(consumerDmaapModel.getIpv4()) + .ipv6(consumerDmaapModel.getIpv6()) .correlationId(consumerDmaapModel.getCorrelationId()) .serialNumber(consumerDmaapModel.getSerialNumber()) .equipVendor(consumerDmaapModel.getEquipVendor()) @@ -54,11 +56,13 @@ public class JsonBodyBuilderImpl implements JsonBodyBuilder .build())); } - private String filterOutAdditionalFieldsIfEmpty(String json) { + private String filterOutRedundantFields(String json) { JsonObject jsonObject = new JsonParser().parse(json).getAsJsonObject(); if(jsonObject.get(ADDITIONAL_FIELDS).equals(new JsonObject())) { jsonObject.remove(ADDITIONAL_FIELDS); } + jsonObject.remove("ipaddress-v4-oam"); + jsonObject.remove("ipaddress-v6-oam"); return jsonObject.toString(); } } \ No newline at end of file -- cgit 1.2.3-korg