Merge "Remove remaining Jackson"

4 files changed, 33 insertions, 44 deletions

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 b52f6f85..f886ee64 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 b9466c4f..2474da07 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<SdcResource> {
 
-    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<SdcArtifact>     artifacts;
+    private String resourceInstanceName;
+    private String resourceName;
+    private String resourceInvariantUUID;
+    private String resourceVersion;
+    private String resoucreType;
+    private String resourceUuid;
+    private List<SdcArtifact> 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 b75bf4d5..e853621b 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<SdcResourceBasicInfo> {
 
-    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 e981e264..e7265ff5 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<SdcResource> resources;
     private List<SdcArtifact> artifacts;