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

Merge remote-tracking branch 'origin/master' into 2.3.0

Browse Source
This commit is contained in:
wing328 2017-06-23 15:24:04 +08:00
commit f32dd6f7bc
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java
View File

@ -431,7 +431,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
public void setUseES6(boolean useES6) { public void setUseES6(boolean useES6) {
this.useES6 = useES6; this.useES6 = useES6;
if (useES6) { if (useES6) {
embeddedTemplateDir = templateDir = "Javascript-es6"; embeddedTemplateDir = templateDir = "Javascript/es6";
} else { } else {
embeddedTemplateDir = templateDir = "Javascript"; embeddedTemplateDir = templateDir = "Javascript";
} }

32
modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache
View File

@ -90,8 +90,8 @@ web::json::value {{classname}}::toJson() const
for( auto& item : m_{{name}} ) for( auto& item : m_{{name}} )
{ {
web::json::value tmp = web::json::value::object(); web::json::value tmp = web::json::value::object();
tmp[U("key")] = ModelBase::toJson(item.first()); tmp[U("key")] = ModelBase::toJson(item.first);
tmp[U("value")] = ModelBase::toJson(item.second()); tmp[U("value")] = ModelBase::toJson(item.second);
jsonArray.push_back(tmp); jsonArray.push_back(tmp);
} }
{{#required}} {{#required}}
@ -200,32 +200,32 @@ void {{classname}}::fromJson(web::json::value& val)
{{/required}} {{/required}}
for( auto& item : val[U("{{baseName}}")].as_array() ) for( auto& item : val[U("{{baseName}}")].as_array() )
{ {
utility::string_t key = ""; utility::string_t key;
if(item.has_field(U("key"))) if(item.has_field(U("key")))
{ {
key = ModelBase::stringFromJson(item[U("key")]); key = ModelBase::stringFromJson(item[U("key")]);
} }
{{#items.isPrimitiveType}} {{#items.isPrimitiveType}}
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, ModelBase::{{items.baseType}}FromJson(item[U("value")]))); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, ModelBase::{{items.baseType}}FromJson(item[U("value")])));
{{/items.isPrimitiveType}} {{/items.isPrimitiveType}}
{{^items.isPrimitiveType}} {{^items.isPrimitiveType}}
{{#items.isString}} {{#items.isString}}
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, ModelBase::stringFromJson(item[U("value")]))); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, ModelBase::stringFromJson(item[U("value")])));
{{/items.isString}} {{/items.isString}}
{{^items.isString}} {{^items.isString}}
{{#items.isDateTime}} {{#items.isDateTime}}
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, ModelBase::dateFromJson(item[U("value")]))); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, ModelBase::dateFromJson(item[U("value")])));
{{/items.isDateTime}} {{/items.isDateTime}}
{{^items.isDateTime}} {{^items.isDateTime}}
if(item.is_null()) if(item.is_null())
{ {
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, {{{items.datatype}}}(nullptr) )); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, {{{items.datatype}}}(nullptr) ));
} }
else else
{ {
{{{items.datatype}}} newItem({{{items.defaultValue}}}); {{{items.datatype}}} newItem({{{items.defaultValue}}});
newItem->fromJson(item[U("value")]); newItem->fromJson(item[U("value")]);
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, newItem )); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, newItem ));
} }
{{/items.isDateTime}} {{/items.isDateTime}}
{{/items.isString}} {{/items.isString}}
@ -334,8 +334,8 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
for( auto& item : m_{{name}} ) for( auto& item : m_{{name}} )
{ {
web::json::value tmp = web::json::value::object(); web::json::value tmp = web::json::value::object();
tmp[U("key")] = ModelBase::toJson(item.first()); tmp[U("key")] = ModelBase::toJson(item.first);
tmp[U("value")] = ModelBase::toJson(item.second()); tmp[U("value")] = ModelBase::toJson(item.second);
jsonArray.push_back(tmp); jsonArray.push_back(tmp);
} }
{{#required}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), web::json::value::array(jsonArray), U("application/json"))); {{#required}}multipart->add(ModelBase::toHttpContent(namePrefix + U("{{baseName}}"), web::json::value::array(jsonArray), U("application/json")));
@ -463,32 +463,32 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}")))); web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}"))));
for( auto& item : jsonArray.as_array() ) for( auto& item : jsonArray.as_array() )
{ {
utility::string_t key = ""; utility::string_t key;
if(item.has_field(U("key"))) if(item.has_field(U("key")))
{ {
key = ModelBase::stringFromJson(item[U("key")]); key = ModelBase::stringFromJson(item[U("key")]);
} }
{{#items.isPrimitiveType}} {{#items.isPrimitiveType}}
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, ModelBase::{{items.baseType}}FromJson(item[U("value")]))); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, ModelBase::{{items.baseType}}FromJson(item[U("value")])));
{{/items.isPrimitiveType}} {{/items.isPrimitiveType}}
{{^items.isPrimitiveType}} {{^items.isPrimitiveType}}
{{#items.isString}} {{#items.isString}}
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, ModelBase::stringFromJson(item[U("value")]))); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, ModelBase::stringFromJson(item[U("value")])));
{{/items.isString}} {{/items.isString}}
{{^items.isString}} {{^items.isString}}
{{#items.isDateTime}} {{#items.isDateTime}}
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, ModelBase::dateFromJson(item[U("value")]))); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, ModelBase::dateFromJson(item[U("value")])));
{{/items.isDateTime}} {{/items.isDateTime}}
{{^items.isDateTime}} {{^items.isDateTime}}
if(item.is_null()) if(item.is_null())
{ {
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, {{{items.datatype}}}(nullptr) )); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, {{{items.datatype}}}(nullptr) ));
} }
else else
{ {
{{{items.datatype}}} newItem({{{items.defaultValue}}}); {{{items.datatype}}} newItem({{{items.defaultValue}}});
newItem->fromJson(item[U("value")]); newItem->fromJson(item[U("value")]);
m_{{name}}.insert(std::pair<utility::string_t,{{items.datatype}}>( key, newItem )); m_{{name}}.insert(std::pair<utility::string_t,{{{items.datatype}}}>( key, newItem ));
} }
{{/items.isDateTime}} {{/items.isDateTime}}
{{/items.isString}} {{/items.isString}}

2
modules/swagger-codegen/src/main/resources/python/rest.mustache
View File

@ -194,7 +194,7 @@ class RESTClientObject(object):
# log response body # log response body
logger.debug("response body: %s", r.data) logger.debug("response body: %s", r.data)
if r.status not in range(200, 206): if not 200 <= r.status <= 299:
raise ApiException(http_resp=r) raise ApiException(http_resp=r)
return r return r

2
samples/client/petstore/python/petstore_api/rest.py
View File

@ -203,7 +203,7 @@ class RESTClientObject(object):
# log response body # log response body
logger.debug("response body: %s", r.data) logger.debug("response body: %s", r.data)
if r.status not in range(200, 206): if not 200 <= r.status <= 299:
raise ApiException(http_resp=r) raise ApiException(http_resp=r)
return r return r