1 files changed, 60 insertions, 0 deletions
diff --git a/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapper2.java b/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapper2.java
new file mode 100644
index 000000000..40bf86b26
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapper2.java
@@ -0,0 +1,60 @@
+package org.onap.vid.model.mso;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+@JsonPropertyOrder({
+	    "status",
+	    "entity"
+})
+
+/*
+This is a brother of MsoResponseWrapper. I (Ittay) think it's better.
+It is generic, immutable, and has some knowledge about RestObject.
+The serialized "entity" field may be either String or nested object.
+ */
+public class MsoResponseWrapper2<T> implements MsoResponseWrapperInterface {
+
+    final static ObjectMapper objectMapper = new ObjectMapper();
+
+	private final int status;
+	private final T entity;
+    private final String raw;
+
+    public MsoResponseWrapper2(RestObject<T> msoResponse) {
+        this.status = msoResponse.getStatusCode();
+        this.entity = msoResponse.get();
+        this.raw = msoResponse.getRaw();
+    }
+
+    public MsoResponseWrapper2(
+            @JsonProperty(value = "status", required = true) int status,
+            @JsonProperty(value = "entity", required = true) T entity) {
+        this.status = status;
+        this.entity = entity;
+        this.raw = null;
+    }
+
+    public int getStatus() {
+		return status;
+	}
+
+    @Override
+    @JsonIgnore
+    public String getResponse() {
+        try {
+            return objectMapper.writeValueAsString(this);
+        } catch (JsonProcessingException e) {
+            return getEntity() != null ? getEntity().toString() : null;
+        }
+    }
+
+    @JsonProperty
+	public Object getEntity() {
+		return entity != null ? entity : raw;
+	}
+
+}