Merge "Blueprint exception handler and REST responses"

[ccsdk/apps.git] / ms / controllerblueprints / modules / service / src / main / java / org / onap / ccsdk / apps / controllerblueprints / service / common / ErrorMessage.java

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ErrorMessage.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ErrorMessage.java
index 4316412..5486262 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ErrorMessage.java
+++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/common/ErrorMessage.java
@@ -19,11 +19,15 @@ package org.onap.ccsdk.apps.controllerblueprints.service.common;
 import com.fasterxml.jackson.annotation.JsonFormat;\r
 import com.fasterxml.jackson.annotation.JsonInclude;\r
 import com.fasterxml.jackson.annotation.JsonInclude.Include;\r
+import com.fasterxml.jackson.annotation.JsonTypeInfo;\r
+import com.fasterxml.jackson.annotation.JsonTypeName;\r
 \r
 import java.io.Serializable;\r
 import java.util.Date;\r
 \r
 @JsonInclude(Include.NON_NULL)\r
+@JsonTypeName("errorMessage")\r
+@JsonTypeInfo(include= JsonTypeInfo.As.WRAPPER_OBJECT, use=JsonTypeInfo.Id.NAME)\r
 public class ErrorMessage implements Serializable {\r
     private String message;\r
     private Integer code;\r