swagger-api#1248 createXMLSample moved creating primitive xml into separate function

Author: bodnia

swagger-ui.js

@@ -26897,21 +26897,7 @@ SwaggerUi.partials.signature = (function () {
     return createXMLSample(name, model.definition, models);
   };
 
-  function createObjectXML (name, properties, xml, models) {
-    var props;
-
-    if (!properties) { return ''; }
-
-    properties = properties || {};
-
-    props = _.map(properties, function (prop, key) {
-      return createXMLSample(key, prop, models);
-    }).join('');
-
-    return wrapTag(name, props);
-  }
-
-  function createXMLSample (name, definition, models) {
+  var createPrimitiveXML = function (name, definition) {
     var primitivesMap = {
       'string': {
         'date': new Date(1).toISOString().split('T')[0],
@@ -26928,40 +26914,73 @@ SwaggerUi.partials.signature = (function () {
         'default': true
       }
     };
-    var type = definition.type || 'object';
+    var type = definition.type;
     var format = definition.format;
-    var xml = definition.xml || {};
+    var namespace = getNamespace(definition.xml);
     var attributes = [];
-    var namespace = getNamespace(xml);
-    var $ref = definition.$ref;
     var value;
 
-    if (_.isString($ref)) {
-      return getModelXML($ref, models);
+    if (_.keys(primitivesMap).indexOf(type) < 0) { return ''; }
+
+    if (namespace) {
+      attributes.push(namespace);
     }
 
-    name = getName(name, xml);
+    if (_.isArray(definition.enum)){
+      value = definition.enum[0];
+    } else {
+      value = definition.example || primitivesMap[type][format] || primitivesMap[type].default;
+    }
+
+    return wrapTag(name, value, attributes);
+  };
+
+  function createObjectXML (name, properties, xml, models) {
+    var props;
+    var attrs = [];
+    var namespace = getNamespace(xml);
 
     if (namespace) {
-      attributes.push(namespace);
+      attrs.push(namespace);
     }
 
+    if (!properties) { return ''; }
 
-    // Here are going to be else statements for Array and Object types
-    if (_.keys(primitivesMap).indexOf(type) !== -1) {
-      if (_.isArray(definition.enum)){
-        value = definition.enum[0];
-      } else {
-        value = definition.example || primitivesMap[type][format] || primitivesMap[type].default;
-      }
-      return wrapTag(name, value, attributes);
-    } else if (type === 'array') {
+    properties = properties || {};
+
+    props = _.map(properties, function (prop, key) {
+      return createXMLSample(key, prop, models);
+    }).join('');
+
+    return wrapTag(name, props);
+  }
+
+  function createXMLSample (name, definition, models) {
+    var type, xml, $ref;
+
+    if (arguments.length === 2) {
+      models = arguments[1];
+      definition = arguments[0];
+      name = '';
+    }
+
+    type = definition.type || 'object';
+    xml = definition.xml || {};
+    $ref = definition.$ref;
+
+    if (_.isString($ref)) {
+      return getModelXML($ref, models);
+    }
+
+    name = getName(name, xml);
+
+    if (type === 'array') {
       return createArrayXML(name, definition.items, xml, models);
     } else if (type === 'object') {
       return createObjectXML(name, definition.properties, xml, models);
+    } else {
+      return createPrimitiveXML(name, definition);
     }
-
-    return '';
   }
 
   return {