merge with master -- conflicts resolved

TIBCOSoftware · May 17, 2018 · dd77d0f · dd77d0f
2 parents 08b33ac + 7b2f6f1
commit dd77d0f
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 90 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -111,4 +111,4 @@
 
 [[constraint]]
   name = "github.com/imdario/mergo"
-  version = "0.3.4"
+  version = "0.3.4"
diff --git a/lib/util/util_test.go b/lib/util/util_test.go
@@ -11,96 +11,93 @@ import (
 )
 
 const XML = `<?xml version="1.0"?>
-
-<soap:Envelope
-xmlns:soap="http://www.w3.org/2003/05/soap-envelope/"
-soap:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
-
-<soap:Body>
-  <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
-    <m:Item>Apples</m:Item>
-  </m:GetPrice>
-</soap:Body>
-
-</soap:Envelope>
-`
+ <soap:Envelope
+ xmlns:soap="http://www.w3.org/2003/05/soap-envelope/"
+ soap:encodingStyle="http://www.w3.org/2003/05/soap-encoding">
+ <soap:Body>
+   <m:GetPrice xmlns:m="https://www.w3schools.com/prices">
+     <m:Item>Apples</m:Item>
+   </m:GetPrice>
+ </soap:Body>
+ </soap:Envelope>
+ `
 
 const JSON = `{
- "_body": [
-  {
-   "_inst": "version=\"1.0\"",
-   "_target": "xml",
-   "_type": "ProcInst"
-  },
-  {
-   "_body": "\n\n",
-   "_type": "CharData"
-  },
-  {
-   "_body": [
-    {
-     "_body": "\n\n",
-     "_type": "CharData"
-    },
-    {
-     "_body": [
-      {
-       "_body": "\n  ",
-       "_type": "CharData"
-      },
-      {
-       "_body": [
-        {
-         "_body": "\n    ",
-         "_type": "CharData"
-        },
-        {
-         "_body": [
-          {
-           "_body": "Apples",
-           "_type": "CharData"
-          }
-         ],
-         "_name": "Item",
-         "_space": "m",
-         "_type": "Element"
-        },
-        {
-         "_body": "\n  ",
-         "_type": "CharData"
-        }
-       ],
-       "_name": "GetPrice",
-       "_space": "m",
-       "_type": "Element",
-       "xmlns___m": "https://www.w3schools.com/prices"
-      },
-      {
-       "_body": "\n",
-       "_type": "CharData"
-      }
-     ],
-     "_name": "Body",
-     "_space": "soap",
-     "_type": "Element"
-    },
-    {
-     "_body": "\n\n",
-     "_type": "CharData"
-    }
-   ],
-   "_name": "Envelope",
-   "_space": "soap",
-   "_type": "Element",
-   "soap___encodingStyle": "http://www.w3.org/2003/05/soap-encoding",
-   "xmlns___soap": "http://www.w3.org/2003/05/soap-envelope/"
-  },
-  {
-   "_body": "\n",
-   "_type": "CharData"
-  }
- ]
-}`
+  "_body": [
+   {
+    "_inst": "version=\"1.0\"",
+    "_target": "xml",
+    "_type": "ProcInst"
+   },
+   {
+    "_body": "\n\n",
+    "_type": "CharData"
+   },
+   {
+    "_body": [
+     {
+      "_body": "\n\n",
+      "_type": "CharData"
+     },
+     {
+      "_body": [
+       {
+        "_body": "\n  ",
+        "_type": "CharData"
+       },
+       {
+        "_body": [
+         {
+          "_body": "\n    ",
+          "_type": "CharData"
+         },
+         {
+          "_body": [
+           {
+            "_body": "Apples",
+            "_type": "CharData"
+           }
+          ],
+          "_name": "Item",
+          "_space": "m",
+          "_type": "Element"
+         },
+         {
+          "_body": "\n  ",
+          "_type": "CharData"
+         }
+        ],
+        "_name": "GetPrice",
+        "_space": "m",
+        "_type": "Element",
+        "xmlns___m": "https://www.w3schools.com/prices"
+       },
+       {
+        "_body": "\n",
+        "_type": "CharData"
+       }
+      ],
+      "_name": "Body",
+      "_space": "soap",
+      "_type": "Element"
+     },
+     {
+      "_body": "\n\n",
+      "_type": "CharData"
+     }
+    ],
+    "_name": "Envelope",
+    "_space": "soap",
+    "_type": "Element",
+    "soap___encodingStyle": "http://www.w3.org/2003/05/soap-encoding",
+    "xmlns___soap": "http://www.w3.org/2003/05/soap-envelope/"
+   },
+   {
+    "_body": "\n",
+    "_type": "CharData"
+   }
+  ]
+ }`
 
 const JSONCONTENT = `{"category":{"id":16,"name":"Animals"},"id":16,"name":"SPARROW","photoUrls":["string"],"status":"sold","tags":[{"id":0,"name":"string"}]}`