From cf1fb180941364f253de8aea9e1c811abe8b89db Mon Sep 17 00:00:00 2001 From: krishna Date: Mon, 13 May 2019 20:06:22 +0530 Subject: Ignore additional fields in FM and PM messages Change-Id: I5de3f6d6c5f0bbf0e7d4f250b84ab51e5482525b Issue-ID: DCAEGEN2-1497 Signed-off-by: krishna --- pom.xml | 2 +- .../java/org/onap/dcaegen2/services/sonhms/CommonEventHeader.java | 3 +++ src/main/java/org/onap/dcaegen2/services/sonhms/Event.java | 3 +++ src/main/java/org/onap/dcaegen2/services/sonhms/FaultFields.java | 3 +++ .../org/onap/dcaegen2/services/sonhms/dmaap/NotificationConsumer.java | 4 +--- .../onap/dcaegen2/services/sonhms/model/AdditionalMeasurements.java | 3 +++ src/main/java/org/onap/dcaegen2/services/sonhms/model/Event.java | 3 +++ .../org/onap/dcaegen2/services/sonhms/model/MeasurementFields.java | 3 +++ version.properties | 2 +- 9 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 40d550e..d53738c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.onap.dcaegen2.services.son-handler son-handler dcaegen2-services-son-handler - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/CommonEventHeader.java b/src/main/java/org/onap/dcaegen2/services/sonhms/CommonEventHeader.java index 013dc66..5863bd8 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/CommonEventHeader.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/CommonEventHeader.java @@ -21,6 +21,9 @@ package org.onap.dcaegen2.services.sonhms; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class CommonEventHeader { private String version; diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/Event.java b/src/main/java/org/onap/dcaegen2/services/sonhms/Event.java index 3a71f2b..7338911 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/Event.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/Event.java @@ -21,6 +21,9 @@ package org.onap.dcaegen2.services.sonhms; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class Event { private CommonEventHeader commonEventHeader; private FaultFields faultFields; diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/FaultFields.java b/src/main/java/org/onap/dcaegen2/services/sonhms/FaultFields.java index a2c877d..e95d38e 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/FaultFields.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/FaultFields.java @@ -21,6 +21,9 @@ package org.onap.dcaegen2.services.sonhms; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class FaultFields { @Override diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/dmaap/NotificationConsumer.java b/src/main/java/org/onap/dcaegen2/services/sonhms/dmaap/NotificationConsumer.java index 3860311..12113ce 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/dmaap/NotificationConsumer.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/dmaap/NotificationConsumer.java @@ -23,8 +23,6 @@ package org.onap.dcaegen2.services.sonhms.dmaap; import com.att.nsa.cambria.client.CambriaConsumer; -import java.io.IOException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +49,7 @@ public class NotificationConsumer implements Runnable { log.debug(msg); notificationCallback.activateCallBack(msg); } - } catch (IOException e) { + } catch (Exception e) { log.debug("exception when fetching msgs from dmaap", e); } diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/model/AdditionalMeasurements.java b/src/main/java/org/onap/dcaegen2/services/sonhms/model/AdditionalMeasurements.java index c55c6d6..f71df00 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/model/AdditionalMeasurements.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/model/AdditionalMeasurements.java @@ -21,8 +21,11 @@ package org.onap.dcaegen2.services.sonhms.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.Map; +@JsonIgnoreProperties(ignoreUnknown = true) public class AdditionalMeasurements { String name; diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/model/Event.java b/src/main/java/org/onap/dcaegen2/services/sonhms/model/Event.java index 73edc39..e6a1869 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/model/Event.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/model/Event.java @@ -21,8 +21,11 @@ package org.onap.dcaegen2.services.sonhms.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import org.onap.dcaegen2.services.sonhms.CommonEventHeader; +@JsonIgnoreProperties(ignoreUnknown = true) public class Event { CommonEventHeader commonEventHeader; MeasurementFields measurementFields; diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/model/MeasurementFields.java b/src/main/java/org/onap/dcaegen2/services/sonhms/model/MeasurementFields.java index 477a2d3..fea6271 100644 --- a/src/main/java/org/onap/dcaegen2/services/sonhms/model/MeasurementFields.java +++ b/src/main/java/org/onap/dcaegen2/services/sonhms/model/MeasurementFields.java @@ -21,8 +21,11 @@ package org.onap.dcaegen2.services.sonhms.model; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class MeasurementFields { String measurementInterval; diff --git a/version.properties b/version.properties index ad1d4b0..cbed160 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ # ############################################################################### major=1 -minor=0 +minor=1 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} -- cgit 1.2.3-korg