From dc6dfca6c22fce3ad0c10cffd3dc2698a101b40f Mon Sep 17 00:00:00 2001
From: "Benjamin, Max (mb388a)" <mb388a@us.att.com>
Date: Tue, 16 Apr 2019 17:21:23 -0400
Subject: always convert values toString for xml marshalling

always convert values toString for xml marshalling
added in null check and object mapper call

Change-Id: Ie91c313dce110d53586e6773e2223d63be799a54
Issue-ID: SO-1786
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../VfRequest-marshalled-with-complex-object.xml          | 15 +++++++++++++++
 .../test/resources/createVfModuleRequest-with-params.xml  |  7 +++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 adapters/mso-adapters-rest-interface/src/test/resources/VfRequest-marshalled-with-complex-object.xml

(limited to 'adapters/mso-adapters-rest-interface/src/test/resources')

diff --git a/adapters/mso-adapters-rest-interface/src/test/resources/VfRequest-marshalled-with-complex-object.xml b/adapters/mso-adapters-rest-interface/src/test/resources/VfRequest-marshalled-with-complex-object.xml
new file mode 100644
index 0000000000..ce175127df
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/resources/VfRequest-marshalled-with-complex-object.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<createVfModuleRequest>
+    <failIfExists>false</failIfExists>
+    <backout>true</backout>
+    <vfModuleParams>
+        <entry>
+            <key>test array</key>
+            <value xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">["a","b","c"]</value>
+        </entry>
+        <entry>
+            <key>test-null</key>
+        </entry>
+    </vfModuleParams>
+    <msoRequest/>
+</createVfModuleRequest>
diff --git a/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml b/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
index 1ff24a50f6..2718f1df61 100644
--- a/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
+++ b/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
@@ -1,4 +1,4 @@
-<createVfModuleRequest>
+  <createVfModuleRequest>
 	<cloudSiteId>RegionOne</cloudSiteId>
 	<cloudOwner>CloudOwner</cloudOwner>
 	<tenantId>09d8566ea45e43aa974cf447ed591d77</tenantId>
@@ -196,7 +196,10 @@
 			<key>vf_module_index</key>
 			<value>0</value>
 		</entry>
-
+        <entry>
+            <key>raw-json-param</key>
+            <value xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">["a","b","c"]</value>
+        </entry>
 	</vfModuleParams>
 	<msoRequest>
 		<requestId>11c8ec20-a1f8-4aa2-926f-e55d67a30f8b</requestId>
-- 
cgit 1.2.3-korg