#1248 createXMLSample made separate function for tagname

dist/swagger-ui.js

@@ -26820,6 +26820,22 @@ SwaggerUi.partials.signature = (function () {
     return str.join('');
   };
 
+  var getName = function (name, xml) {
+    var result = name || '';
+
+    xml = xml || {};
+
+    if (xml.name) {
+      result = xml.name;
+    }
+
+    if (xml.prefix) {
+      result = xml.prefix + ':' + result;
+    }
+
+    return result;
+  };
+
   var createXMLSample = function (name, definition) {
     var primitivesMap = {
       'string': {
@@ -26827,29 +26843,26 @@ SwaggerUi.partials.signature = (function () {
         'date-time' : new Date(1).toISOString(),
         'default': 'string'
       },
-      'integer': 1,
+      'integer': {
-      'number': 1.1,
+        'default': 1
-      'boolean': true
+      },
+      'number': {
+        'default': 1.1
+      },
+      'boolean': {
+        'default': true
+      }
     };
     var type = definition.type;
     var format = definition.format;
     var xml = definition.xml || {};
     var value;
 
-    if (xml.name) {
+    name = getName(name, xml);
-      name = xml.name;
-    }
-
-    if (xml.prefix) {
-      name = xml.prefix + ':' + name;
-    }
 
+    // Here are going to be else statements for Array and Object types
     if (_.keys(primitivesMap).indexOf(type) !== -1) {
-      if (type === 'string') {
+      value = format ? primitivesMap[type][format] : primitivesMap[type].default;
-        value = format ? primitivesMap.string[format] : primitivesMap.string.default;
-      } else {
-        value = primitivesMap[type];
-      }
 
       return wrapTag(name, value);
     }

src/main/javascript/view/partials/signature.js

@@ -2,20 +2,6 @@
 
 /* jshint -W122 */
 SwaggerUi.partials.signature = (function () {
-  var sampleDate = new Date();
-
-  var getSampleDate = function (type) {
-    var date;
-
-    switch(type) {
-      case 'date-time': date = sampleDate.toISOString(); break;
-      case 'date': date = sampleDate.toISOString().split('T')[0]; break;
-      default: date = sampleDate.toISOString().split('T')[0];
-    }
-
-    return date;
-  };
-
   var resolveSchema = function (schema) {
     if (_.isPlainObject(schema.schema)) {
       schema = resolveSchema(schema.schema);
@@ -667,36 +653,49 @@ SwaggerUi.partials.signature = (function () {
     return str.join('');
   };
 
+  var getName = function (name, xml) {
+    var result = name || '';
+
+    xml = xml || {};
+
+    if (xml.name) {
+      result = xml.name;
+    }
+
+    if (xml.prefix) {
+      result = xml.prefix + ':' + result;
+    }
+
+    return result;
+  };
+
   var createXMLSample = function (name, definition) {
     var primitivesMap = {
       'string': {
-        'date': getSampleDate('date'),
+        'date': new Date(1).toISOString().split('T')[0],
-        'date-time' : getSampleDate('date-time'),
+        'date-time' : new Date(1).toISOString(),
         'default': 'string'
       },
-      'integer': 1,
+      'integer': {
-      'number': 1.1,
+        'default': 1
-      'boolean': true
+      },
+      'number': {
+        'default': 1.1
+      },
+      'boolean': {
+        'default': true
+      }
     };
     var type = definition.type;
     var format = definition.format;
     var xml = definition.xml || {};
     var value;
 
-    if (xml.name) {
+    name = getName(name, xml);
-      name = xml.name;
-    }
-
-    if (xml.prefix) {
-      name = xml.prefix + ':' + name;
-    }
 
+    // Here are going to be else statements for Array and Object types
     if (_.keys(primitivesMap).indexOf(type) !== -1) {
-      if (type === 'string') {
+      value = format ? primitivesMap[type][format] : primitivesMap[type].default;
-        value = format ? primitivesMap.string[format] : primitivesMap.string.default;
-      } else {
-        value = primitivesMap[type];
-      }
 
       return wrapTag(name, value);
     }
@@ -709,8 +708,7 @@ SwaggerUi.partials.signature = (function () {
       createJSONSample: createJSONSample,
       getParameterModelSignature: getParameterModelSignature,
       createParameterJSONSample: createParameterJSONSample,
-      createXMLSample: createXMLSample,
+      createXMLSample: createXMLSample
-      getSampleDate: getSampleDate
   };
 
 })();

test/unit/view/partials/signatureSpec.js

@@ -4,8 +4,8 @@ describe('SwaggerUi.partials.signature tests', function () {
     var sut = SwaggerUi.partials.signature;
 
     describe('method createXMLSample', function () {
-        var date = sut.getSampleDate('date');
+        var date = new Date(1).toISOString().split('T')[0];
-        var dateTime = sut.getSampleDate('date-time');
+        var dateTime = new Date(1).toISOString();
 
         describe('simple types with no xml property', function () {
             it('returns tag <tagname>string</tagname> when passing type string', function () {