originalName stored and sent to frontend in a template

[vid.git] / vid-app-common / src / main / java / org / onap / vid / model / serviceInstantiation / BaseResource.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
index 1079fbe..7617d77 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
@@ -20,20 +20,22 @@
 
 package org.onap.vid.model.serviceInstantiation;
 
+import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.vid.job.JobAdapter;
 import org.onap.vid.job.JobType;
 import org.onap.vid.model.Action;
 import org.onap.vid.mso.model.ModelInfo;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
 
        protected String instanceId;
@@ -60,6 +62,9 @@ public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
 
        protected Integer position;
 
+       @JsonInclude(NON_NULL)
+       protected String originalName; //not used at backend, but stored for fronted
+
 
        private static final Map<String, Action> actionStingToEnumMap = ImmutableMap.<String, Action>builder()
                        .put("Delete", Action.Delete)
@@ -85,7 +90,8 @@ public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
                @JsonProperty("trackById") String trackById,
                @JsonProperty("isFailed") Boolean isFailed,
                @JsonProperty("statusMessage") String statusMessage,
-               @JsonProperty("position") Integer position) {
+               @JsonProperty("position") Integer position,
+               @JsonProperty("originalName") String originalName) {
                this.modelInfo = modelInfo;
                this.modelInfo.setModelType(getModelType());
                this.rollbackOnFailure = rollbackOnFailure;
@@ -99,6 +105,7 @@ public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
                this.isFailed = isFailed!= null ? isFailed: false;
                this.statusMessage = statusMessage;
                this.position = position;
+               this.originalName = originalName;
        }
 
        private Action actionStringToEnum(String actionAsString) {
@@ -177,6 +184,10 @@ public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
                this.position = position;
        }
 
+       public String getOriginalName() {
+               return originalName;
+       }
+
        @JsonIgnore
        public abstract Collection<? extends BaseResource> getChildren();