AT&T 1712 and 1802 release code

[so.git] / common / src / main / java / org / openecomp / mso / serviceinstancebeans / RequestInfo.java

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestInfo.java
similarity index 84%
rename from mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java
rename to common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestInfo.java
index 66d6ce5..d1e489a 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RequestInfo.java
@@ -18,25 +18,43 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.apihandlerinfra.serviceinstancebeans;
+package org.openecomp.mso.serviceinstancebeans;
 
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+import java.io.Serializable;
 
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class RequestInfo {
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize.Inclusion;
 
+@JsonRootName(value = "requestInfo")
+@JsonInclude(Include.NON_DEFAULT)
+public class RequestInfo implements Serializable {
+
+       private static final long serialVersionUID = -1370946827136030181L;
+       @JsonProperty("billingAccountNumber")
        protected String billingAccountNumber;
+       @JsonProperty("callbackUrl")
        protected String callbackUrl;
+       @JsonProperty("correlator")
     protected String correlator;
+       @JsonProperty("orderNumber")
     protected String orderNumber;
+       @JsonProperty("productFamilyId")
     protected String productFamilyId;
+       @JsonProperty("orderVersion")
     protected Integer orderVersion;
     @JsonSerialize(include=Inclusion.ALWAYS)
+       @JsonProperty("source")
     protected String source;
+       @JsonProperty("instanceName")
     protected String instanceName;
+       @JsonProperty("suppressRollback")
     @JsonSerialize(include=Inclusion.ALWAYS)
     protected boolean suppressRollback;
+       @JsonProperty("requestorId")
     protected String requestorId;
 
     /**