From 5359ffe263f9e0a4356acef7a8671bc64eb3f590 Mon Sep 17 00:00:00 2001 From: sebdet Date: Fri, 15 Feb 2019 15:27:23 +0100 Subject: Remove remaining Jackson Remove jackson import as jackson shoul dbe removed Issue-ID: CLAMP-292 Change-Id: I86f46b97b990f03abc6999fc4e54e37e51db9ae5 Signed-off-by: sebdet --- .../org/onap/clamp/clds/model/sdc/SdcArtifact.java | 5 +--- .../org/onap/clamp/clds/model/sdc/SdcResource.java | 20 ++++++++-------- .../clamp/clds/model/sdc/SdcResourceBasicInfo.java | 27 ++++++++++------------ .../clamp/clds/model/sdc/SdcServiceDetail.java | 25 +++++++++----------- 4 files changed, 33 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java index b52f6f854..f886ee644 100644 --- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java +++ b/src/main/java/org/onap/clamp/clds/model/sdc/SdcArtifact.java @@ -18,14 +18,11 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * + * */ package org.onap.clamp.clds.model.sdc; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) public class SdcArtifact { private String artifactName; diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java index b9466c4f9..2474da073 100644 --- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java +++ b/src/main/java/org/onap/clamp/clds/model/sdc/SdcResource.java @@ -18,31 +18,29 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * + * */ package org.onap.clamp.clds.model.sdc; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.math.BigDecimal; import java.util.List; -@JsonIgnoreProperties(ignoreUnknown = true) public class SdcResource implements Comparable { - protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcResource.class); + protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcResource.class); protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - private String resourceInstanceName; - private String resourceName; - private String resourceInvariantUUID; - private String resourceVersion; - private String resoucreType; - private String resourceUuid; - private List artifacts; + private String resourceInstanceName; + private String resourceName; + private String resourceInvariantUUID; + private String resourceVersion; + private String resoucreType; + private String resourceUuid; + private List artifacts; public String getResourceInstanceName() { return resourceInstanceName; diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java index b75bf4d51..e853621b4 100644 --- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java +++ b/src/main/java/org/onap/clamp/clds/model/sdc/SdcResourceBasicInfo.java @@ -18,34 +18,31 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * + * */ package org.onap.clamp.clds.model.sdc; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.math.BigDecimal; -@JsonIgnoreProperties(ignoreUnknown = true) public class SdcResourceBasicInfo implements Comparable { - protected static final EELFLogger logger = EELFManager.getInstance() - .getLogger(SdcResourceBasicInfo.class); + protected static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcResourceBasicInfo.class); protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - private String uuid; - private String invariantUUID; - private String name; - private String version; - private String toscaModelURL; - private String category; - private String subCategory; - private String resourceType; - private String lifecycleState; - private String lastUpdaterUserId; + private String uuid; + private String invariantUUID; + private String name; + private String version; + private String toscaModelURL; + private String category; + private String subCategory; + private String resourceType; + private String lifecycleState; + private String lastUpdaterUserId; @Override public int compareTo(SdcResourceBasicInfo in) { diff --git a/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java b/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java index e981e2643..e7265ff5d 100644 --- a/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java +++ b/src/main/java/org/onap/clamp/clds/model/sdc/SdcServiceDetail.java @@ -18,28 +18,25 @@ * limitations under the License. * ============LICENSE_END============================================ * =================================================================== - * + * */ package org.onap.clamp.clds.model.sdc; import java.util.List; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) public class SdcServiceDetail { - private String uuid; - private String invariantUUID; - private String name; - private String version; - private String toscaModelURL; - private String category; - private String lifecycleState; - private String lastUpdaterUserId; - private String distributionStatus; - private String lastUpdaterFullName; + private String uuid; + private String invariantUUID; + private String name; + private String version; + private String toscaModelURL; + private String category; + private String lifecycleState; + private String lastUpdaterUserId; + private String distributionStatus; + private String lastUpdaterFullName; private List resources; private List artifacts; -- cgit 1.2.3-korg