Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / changeManagement / ModelInfo.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/changeManagement/ModelInfo.java b/vid-app-common/src/main/java/org/onap/vid/changeManagement/ModelInfo.java
index 8f44a4b..ebb0ba3 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/changeManagement/ModelInfo.java
+++ b/vid-app-common/src/main/java/org/onap/vid/changeManagement/ModelInfo.java
@@ -1,12 +1,9 @@
 package org.onap.vid.changeManagement;
+
+import com.fasterxml.jackson.annotation.*;
+
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-import com.fasterxml.jackson.annotation.JsonAnySetter;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
@@ -24,7 +21,7 @@ public class ModelInfo {
 
        }
 
-       public ModelInfo(org.onap.vid.domain.mso.ModelInfo modelInfo){
+       public ModelInfo(org.onap.vid.mso.model.ModelInfo modelInfo){
                this.setModelType(modelInfo.getModelType().toString());
                this.setModelInvariantId(modelInfo.getModelInvariantId());
                this.setModelVersionId(modelInfo.getModelNameVersionId());
@@ -50,7 +47,7 @@ public class ModelInfo {
        @JsonProperty("modelCustomizationId")
        private String modelCustomizationId;
        @JsonIgnore
-       private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+       private Map<String, Object> additionalProperties = new HashMap<>();
 
        @JsonProperty("modelType")
        public String getModelType() {