[MSO-8] Update the maven dependency

[so.git] / bpmn / MSOCommonBPMN / src / main / java / org / openecomp / mso / bpmn / common / adapter / vnf / VnfRollback.java

diff --git a/bpmn/MSOGammaBPMN/src/main/java/com/att/domain2/workflow/vnf/async/adapter/callback/wsdl/v1/VnfRollback.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollback.java
similarity index 89%
rename from bpmn/MSOGammaBPMN/src/main/java/com/att/domain2/workflow/vnf/async/adapter/callback/wsdl/v1/VnfRollback.java
rename to bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollback.java
index 4863023..b37866c 100644 (file)
--- a/bpmn/MSOGammaBPMN/src/main/java/com/att/domain2/workflow/vnf/async/adapter/callback/wsdl/v1/VnfRollback.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/adapter/vnf/VnfRollback.java
@@ -18,7 +18,7 @@
  * ============LICENSE_END=========================================================
  */
 
-package com.att.domain2.workflow.vnf.async.adapter.callback.wsdl.v1;
+package org.openecomp.mso.bpmn.common.adapter.vnf;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="cloudSiteId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         <element name="msoRequest" type="{http://com.att.mso/vnfNotify}msoRequest" minOccurs="0"/>
+ *         <element name="msoRequest" type="{http://org.openecomp.mso/vnfNotify}msoRequest" minOccurs="0"/>
  *         <element name="tenantCreated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="tenantId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="vnfCreated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
@@ -196,17 +196,15 @@ public class VnfRollback {
     }
     
     public String toString() {
-       String rollback = "";
-               rollback =
-       "<cloudSiteId>"+cloudSiteId+"</cloudSiteId>" + '\n' +
-       "<msoRequest>"+msoRequest.toString()+"</msoRequest>" + '\n' +
-       "<tenantCreated>"+tenantCreated+"</tenantCreated>" + '\n' +
-       "<tenantId>"+tenantId+"</tenantId>" + '\n' +
-       "<vnfCreated>"+vnfCreated+"</vnfCreated>" + '\n' +
-       "<vnfId>"+vnfId+"</vnfId>";
-       return rollback; 
+       String msoRequestElement = msoRequest == null ? ""
+                       : "<msoRequest>"+msoRequest+"</msoRequest>" + '\n';
+
+               return
+                       "<cloudSiteId>"+cloudSiteId+"</cloudSiteId>" + '\n' +
+                       msoRequestElement +
+                       "<tenantCreated>"+tenantCreated+"</tenantCreated>" + '\n' +
+                       "<tenantId>"+tenantId+"</tenantId>" + '\n' +
+                       "<vnfCreated>"+vnfCreated+"</vnfCreated>" + '\n' +
+                       "<vnfId>"+vnfId+"</vnfId>";
     }
-       
- 
-
 }