loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add all required parameters as default constructor parameters #1294

Browse Source
This commit is contained in:
Johannes Fiala 2015-12-06 10:37:06 +01:00
parent 1a8a03ee52
commit 8fd6b604d3
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenModel.java
View File

@ -13,6 +13,13 @@ public class CodegenModel {
public String unescapedDescription;
public String defaultValue;
public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
// list of all required parameters
public Set<String> mandatory = new HashSet<String>();
// TODO: temporary solution to get a delimited list of default constructor parameters, should be replaced if there is a better way of injecting the mandatory parameters into the mustache templates
public String mandatoryParams;
public Set<String> imports = new HashSet<String>();
public Boolean hasVars, emptyVars, hasMoreModels, hasEnums;
public ExternalDocs externalDocs;

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -1881,6 +1881,10 @@ public class DefaultCodegen {
m.vars.add(cp);
}
}
m.mandatory = mandatory;
m.mandatoryParams = StringUtils.join(mandatory, ", ");
} else {
m.emptyVars = true;
m.hasVars = false;

16
modules/swagger-codegen/src/main/resources/Javascript/api.mustache
View File

@ -25,7 +25,13 @@ function {{classname}}() {
}
{{/required}}{{/allParams}}
// create path and map variables
var {{localVariablePrefix}}path = '{{basePath}}' + replaceAll(replaceAll("{{{path}}}", "\\{format\\}","json"){{#pathParams}}
var basePath = '{{basePath}}';
// if basePath ends with a /, remove it as path starts with a leading /
if (basePath.substring(basePath.length-1, basePath.length)=='/') {
basePath = basePath.substring(0, basePath.length-1);
}
var {{localVariablePrefix}}path = basePath + replaceAll(replaceAll("{{{path}}}", "\\{format\\}","json"){{#pathParams}}
, "\\{" + "{{baseName}}" + "\\}", {{localVariablePrefix}}apiClient.escapeString({{{paramName}}}.toString()){{/pathParams}});
var queryParams = {};
@ -44,10 +50,10 @@ function {{classname}}() {
path += createQueryString(queryParams);
if (console) {
console.log('path: ' + path);
console.log('queryParams: ' + queryParams);
}
//if (console) {
//console.log('path: ' + path);
//console.log('queryParams: ' + queryParams);
//}
{{#isResponseBinary}}
byte[] {{localVariablePrefix}}response = null;

10
modules/swagger-codegen/src/main/resources/Javascript/model.mustache
View File

@ -4,16 +4,17 @@
{{#description}}/**
* {{description}}
**/{{/description}}
function {{classname}}() { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
function {{classname}}({{mandatoryParams}}) { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
var self = this;
{{#vars}}
/**{{#description}}
* {{{description}}}{{/description}}
* datatype: {{{datatypeWithEnum}}}{{#minimum}}
* datatype: {{{datatypeWithEnum}}}{{#required}}
* required{{/required}}{{#minimum}}
* minimum: {{minimum}}{{/minimum}}{{#maximum}}
* maximum: {{maximum}}{{/maximum}}
**/
self.{{name}} = {{{defaultValue}}};
self.{{name}} = {{#required}}{{name}}{{/required}}{{^required}}{{{defaultValue}}}{{/required}};
{{/vars}}
self.constructFromObject = function(data) {
@ -42,6 +43,9 @@ function {{classname}}() { {{#parent}}/* extends {{{parent}}}*/{{/parent}}
}
{{/vars}}
self.toJson = function () {
return JSON.stringify(self);
}
}
{{/model}}
{{/models}}