kyy/swagger-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#1248 createXMLSample refactoring

Browse Source
This commit is contained in:
Anna Bodnia
2016-01-18 13:25:02 +02:00
parent 454917a2ba
commit add91792fb
3 changed files with 131 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
dist/swagger-ui.js vendored
View File

@@ -26914,7 +26914,10 @@ SwaggerUi.partials.signature = (function () {
};
};
var createArrayXML = function (name, definition, models) {
var createArrayXML = function (descriptor) {
var name = descriptor.name;
var definition = descriptor.definition;
var models = descriptor.models;
var value;
var items = definition.items;
var xml = definition.xml || {};
@@ -26933,17 +26936,9 @@ SwaggerUi.partials.signature = (function () {
return value;
};
var getModelXML = function (modelType, models) {
var type = simpleRef(modelType);
var model = models[type] || {};
var name = model.name || modelType;
if (!model.definition) { return getErrorMessage(); }
return createSchemaXML(name, model.definition, models);
};
var createPrimitiveXML = function (name, definition) {
var createPrimitiveXML = function (descriptor) {
var name = descriptor.name;
var definition = descriptor.definition;
var primitivesMap = {
'string': {
'date': new Date(1).toISOString().split('T')[0],
@@ -26981,7 +26976,10 @@ SwaggerUi.partials.signature = (function () {
return wrapTag(name, value, attributes);
};
function createObjectXML (name, definition, models) {
function createObjectXML (descriptor) {
var name = descriptor.name;
var definition = descriptor.definition;
var models = descriptor.models;
var serializedProperties;
var attrs = [];
var properties = definition.properties;
@@ -27008,32 +27006,64 @@ SwaggerUi.partials.signature = (function () {
return wrapTag(name, serializedProperties, attrs);
}
function getErrorMessage () {
return '<!-- invalid XML -->';
}
function createSchemaXML (name, definition, models) {
var type, xml, $ref;
var $ref = definition.$ref;
var descriptor = _.isString($ref) ? getDescriptorByRef($ref, models)
: getDescriptor(name, definition, models);
type = definition.type || 'object';
xml = definition.xml || {};
$ref = definition.$ref;
if (!descriptor) {
return getErrorMessage();
}
if (!_.isObject(definition)) { return getErrorMessage(); }
switch (descriptor.type) {
case 'array':
return createArrayXML(descriptor);
case 'object':
return createObjectXML(descriptor);
default:
return createPrimitiveXML(descriptor);
}
}
if (_.isString($ref)) {
return getModelXML($ref, models);
function Descriptor (name, type, definition, models) {
if (arguments.length < 4) {
throw new Error();
}
this.name = name;
this.definition = definition;
this.models = models;
this.type = type;
}
function getDescriptorByRef($ref, models) {
var modelType = simpleRef($ref);
var model = models[modelType] || {};
var name = model.name || modelType;
var type = model.type || 'object';
if (!model.definition) {
return null;
}
return new Descriptor (name, type, model.definition, models);
}
function getDescriptor (name, definition, models){
var type = definition.type || 'object';
var xml = definition.xml || {};
if (!definition) {
return null;
}
name = getName(name, xml);
if (type === 'array') {
return createArrayXML(name, definition, models);
} else if (type === 'object') {
return createObjectXML(name, definition, models);
} else {
return createPrimitiveXML(name, definition);
}
}
function getErrorMessage () {
return '<!-- invalid XML -->';
return new Descriptor(name, type, definition, models);
}
function createXMLSample (definition, models) {

18
dist/swagger-ui.min.js vendored
View File

File diff suppressed because one or more lines are too long

92
src/main/javascript/view/partials/signature.js
View File

@@ -710,7 +710,10 @@ SwaggerUi.partials.signature = (function () {
};
};
var createArrayXML = function (name, definition, models) {
var createArrayXML = function (descriptor) {
var name = descriptor.name;
var definition = descriptor.definition;
var models = descriptor.models;
var value;
var items = definition.items;
var xml = definition.xml || {};
@@ -729,17 +732,9 @@ SwaggerUi.partials.signature = (function () {
return value;
};
var getModelXML = function (modelType, models) {
var type = simpleRef(modelType);
var model = models[type] || {};
var name = model.name || modelType;
if (!model.definition) { return getErrorMessage(); }
return createSchemaXML(name, model.definition, models);
};
var createPrimitiveXML = function (name, definition) {
var createPrimitiveXML = function (descriptor) {
var name = descriptor.name;
var definition = descriptor.definition;
var primitivesMap = {
'string': {
'date': new Date(1).toISOString().split('T')[0],
@@ -777,7 +772,10 @@ SwaggerUi.partials.signature = (function () {
return wrapTag(name, value, attributes);
};
function createObjectXML (name, definition, models) {
function createObjectXML (descriptor) {
var name = descriptor.name;
var definition = descriptor.definition;
var models = descriptor.models;
var serializedProperties;
var attrs = [];
var properties = definition.properties;
@@ -804,32 +802,64 @@ SwaggerUi.partials.signature = (function () {
return wrapTag(name, serializedProperties, attrs);
}
function getErrorMessage () {
return '<!-- invalid XML -->';
}
function createSchemaXML (name, definition, models) {
var type, xml, $ref;
var $ref = definition.$ref;
var descriptor = _.isString($ref) ? getDescriptorByRef($ref, models)
: getDescriptor(name, definition, models);
type = definition.type || 'object';
xml = definition.xml || {};
$ref = definition.$ref;
if (!descriptor) {
return getErrorMessage();
}
if (!_.isObject(definition)) { return getErrorMessage(); }
switch (descriptor.type) {
case 'array':
return createArrayXML(descriptor);
case 'object':
return createObjectXML(descriptor);
default:
return createPrimitiveXML(descriptor);
}
}
if (_.isString($ref)) {
return getModelXML($ref, models);
function Descriptor (name, type, definition, models) {
if (arguments.length < 4) {
throw new Error();
}
this.name = name;
this.definition = definition;
this.models = models;
this.type = type;
}
function getDescriptorByRef($ref, models) {
var modelType = simpleRef($ref);
var model = models[modelType] || {};
var name = model.name || modelType;
var type = model.type || 'object';
if (!model.definition) {
return null;
}
return new Descriptor (name, type, model.definition, models);
}
function getDescriptor (name, definition, models){
var type = definition.type || 'object';
var xml = definition.xml || {};
if (!definition) {
return null;
}
name = getName(name, xml);
if (type === 'array') {
return createArrayXML(name, definition, models);
} else if (type === 'object') {
return createObjectXML(name, definition, models);
} else {
return createPrimitiveXML(name, definition);
}
}
function getErrorMessage () {
return '<!-- invalid XML -->';
return new Descriptor(name, type, definition, models);
}
function createXMLSample (definition, models) {