Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / aai / model / ServiceProperties.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceProperties.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceProperties.java
index a76bcf8..a1962cc 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceProperties.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ServiceProperties.java
@@ -1,8 +1,6 @@
 package org.onap.vid.aai.model;
 
 import com.fasterxml.jackson.annotation.*;
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -35,70 +33,49 @@ import java.util.Map;
 public class ServiceProperties {
 
     @JsonProperty("service-instance-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("service-instance-id")
     public String serviceInstanceId;
     @JsonProperty("service-instance-name")
-    @com.fasterxml.jackson.annotation.JsonProperty("service-instance-name")
     public String serviceInstanceName;
     @JsonProperty("model-invariant-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("model-invariant-id")
     public String modelInvariantId;
     @JsonProperty("model-version-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("model-version-id")
     public String modelVersionId;
     @JsonProperty("resource-version")
-    @com.fasterxml.jackson.annotation.JsonProperty("resource-version")
     public String resourceVersion;
     @JsonProperty("orchestration-status")
-    @com.fasterxml.jackson.annotation.JsonProperty("orchestration-status")
     public String orchestrationStatus;
     @JsonProperty("global-customer-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("global-customer-id")
     public String globalCustomerId;
     @JsonProperty("subscriber-name")
-    @com.fasterxml.jackson.annotation.JsonProperty("subscriber-name")
     public String subscriberName;
     @JsonProperty("subscriber-type")
-    @com.fasterxml.jackson.annotation.JsonProperty("subscriber-type")
     public String subscriberType;
     @JsonProperty("vnf-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("vnf-id")
     public String vnfId;
     @JsonProperty("vnf-name")
-    @com.fasterxml.jackson.annotation.JsonProperty("vnf-name")
     public String vnfName;
     @JsonProperty("vnf-type")
-    @com.fasterxml.jackson.annotation.JsonProperty("vnf-type")
     public String vnfType;
     @JsonProperty("service-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("service-id")
     public String serviceId;
     @JsonProperty("prov-status")
-    @com.fasterxml.jackson.annotation.JsonProperty("prov-status")
     public String provStatus;
     @JsonProperty("in-maint")
-    @com.fasterxml.jackson.annotation.JsonProperty("in-maint")
     public Boolean inMaint;
     @JsonProperty("is-closed-loop-disabled")
-    @com.fasterxml.jackson.annotation.JsonProperty("is-closed-loop-disabled")
     public Boolean isClosedLoopDisabled;
     @JsonProperty("model-customization-id")
-    @com.fasterxml.jackson.annotation.JsonProperty("model-customization-id")
     public String modelCustomizationId;
     @JsonProperty("nf-type")
-    @com.fasterxml.jackson.annotation.JsonProperty("nf-type")
     public String nfType;
     @JsonProperty("nf-function")
-    @com.fasterxml.jackson.annotation.JsonProperty("nf-function")
     public String nfFunction;
     @JsonProperty("nf-role")
-    @com.fasterxml.jackson.annotation.JsonProperty("nf-role")
     public String nfRole;
     @JsonProperty("nf-naming-code")
-    @com.fasterxml.jackson.annotation.JsonProperty("nf-naming-code")
     public String nfNamingCode;
     @JsonIgnore
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private Map<String, Object> additionalProperties = new HashMap<>();
 
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {