From c85d30c68054fe76eb0ffc9e9264336a37476451 Mon Sep 17 00:00:00 2001 From: Joanna Jeremicz Date: Thu, 21 Mar 2019 14:15:10 +0100 Subject: Remove IP requirement Remove the requirement of at least one IP present in VES event. Update IP information in AAI only if it is present and is not empty. Change-Id: I83ae8990d45d71de4c839e43b5065db89b6c6a3a Issue-ID: DCAEGEN2-1312 Signed-off-by: Joanna Jeremicz --- .../onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'prh-app-server/src') diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java index a69b7c54..b628d961 100644 --- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java +++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java @@ -120,7 +120,7 @@ public class DmaapConsumerJsonParser { this.pnfSwVersionOptionalField = getValueFromJson(pnfRegistrationFields, SW_VERSION); this.pnfAdditionalFields = pnfRegistrationFields.getAsJsonObject(ADDITIONAL_FIELDS); - return (StringUtils.isEmpty(pnfSourceName) || !ipPropertiesNotEmpty(pnfOamIpv4Address, pnfOamIpv6Address)) + return (StringUtils.isEmpty(pnfSourceName)) ? logErrorAndReturnMonoEmpty("Incorrect json, consumerDmaapModel can not be created: " + printMessage()) : Mono.just(ImmutableConsumerDmaapModel.builder() @@ -140,10 +140,6 @@ public class DmaapConsumerJsonParser { return jsonObject.has(jsonKey) ? jsonObject.get(jsonKey).getAsString() : ""; } - private boolean ipPropertiesNotEmpty(String ipv4, String ipv6) { - return (!StringUtils.isEmpty(ipv4)) || !(StringUtils.isEmpty(ipv6)); - } - private boolean containsHeader(JsonObject jsonObject) { return jsonObject.has(EVENT) && jsonObject.getAsJsonObject(EVENT).has(PNF_REGISTRATION_FIELDS); } -- cgit 1.2.3-korg