diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java index 88d8ef0e550..f6545d57aa1 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java @@ -431,7 +431,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo public void setUseES6(boolean useES6) { this.useES6 = useES6; if (useES6) { - embeddedTemplateDir = templateDir = "Javascript-es6"; + embeddedTemplateDir = templateDir = "Javascript/es6"; } else { embeddedTemplateDir = templateDir = "Javascript"; } diff --git a/modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache b/modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache index 38388fa4fa5..e90e2a5371c 100644 --- a/modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache +++ b/modules/swagger-codegen/src/main/resources/cpprest/model-source.mustache @@ -90,8 +90,8 @@ web::json::value {{classname}}::toJson() const for( auto& item : m_{{name}} ) { web::json::value tmp = web::json::value::object(); - tmp[U("key")] = ModelBase::toJson(item.first()); - tmp[U("value")] = ModelBase::toJson(item.second()); + tmp[U("key")] = ModelBase::toJson(item.first); + tmp[U("value")] = ModelBase::toJson(item.second); jsonArray.push_back(tmp); } {{#required}} @@ -200,32 +200,32 @@ void {{classname}}::fromJson(web::json::value& val) {{/required}} for( auto& item : val[U("{{baseName}}")].as_array() ) { - utility::string_t key = ""; + utility::string_t key; if(item.has_field(U("key"))) { key = ModelBase::stringFromJson(item[U("key")]); } {{#items.isPrimitiveType}} - m_{{name}}.insert(std::pair( key, ModelBase::{{items.baseType}}FromJson(item[U("value")]))); + m_{{name}}.insert(std::pair( key, ModelBase::{{items.baseType}}FromJson(item[U("value")]))); {{/items.isPrimitiveType}} {{^items.isPrimitiveType}} {{#items.isString}} - m_{{name}}.insert(std::pair( key, ModelBase::stringFromJson(item[U("value")]))); + m_{{name}}.insert(std::pair( key, ModelBase::stringFromJson(item[U("value")]))); {{/items.isString}} {{^items.isString}} {{#items.isDateTime}} - m_{{name}}.insert(std::pair( key, ModelBase::dateFromJson(item[U("value")]))); + m_{{name}}.insert(std::pair( key, ModelBase::dateFromJson(item[U("value")]))); {{/items.isDateTime}} {{^items.isDateTime}} if(item.is_null()) { - m_{{name}}.insert(std::pair( key, {{{items.datatype}}}(nullptr) )); + m_{{name}}.insert(std::pair( key, {{{items.datatype}}}(nullptr) )); } else { {{{items.datatype}}} newItem({{{items.defaultValue}}}); newItem->fromJson(item[U("value")]); - m_{{name}}.insert(std::pair( key, newItem )); + m_{{name}}.insert(std::pair( key, newItem )); } {{/items.isDateTime}} {{/items.isString}} @@ -334,8 +334,8 @@ void {{classname}}::toMultipart(std::shared_ptr multipart, co for( auto& item : m_{{name}} ) { web::json::value tmp = web::json::value::object(); - tmp[U("key")] = ModelBase::toJson(item.first()); - tmp[U("value")] = ModelBase::toJson(item.second()); + tmp[U("key")] = ModelBase::toJson(item.first); + tmp[U("value")] = ModelBase::toJson(item.second); jsonArray.push_back(tmp); } {{#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 multipart, web::json::value jsonArray = web::json::value::parse(ModelBase::stringFromHttpContent(multipart->getContent(U("{{baseName}}")))); for( auto& item : jsonArray.as_array() ) { - utility::string_t key = ""; + utility::string_t key; if(item.has_field(U("key"))) { key = ModelBase::stringFromJson(item[U("key")]); } {{#items.isPrimitiveType}} - m_{{name}}.insert(std::pair( key, ModelBase::{{items.baseType}}FromJson(item[U("value")]))); + m_{{name}}.insert(std::pair( key, ModelBase::{{items.baseType}}FromJson(item[U("value")]))); {{/items.isPrimitiveType}} {{^items.isPrimitiveType}} {{#items.isString}} - m_{{name}}.insert(std::pair( key, ModelBase::stringFromJson(item[U("value")]))); + m_{{name}}.insert(std::pair( key, ModelBase::stringFromJson(item[U("value")]))); {{/items.isString}} {{^items.isString}} {{#items.isDateTime}} - m_{{name}}.insert(std::pair( key, ModelBase::dateFromJson(item[U("value")]))); + m_{{name}}.insert(std::pair( key, ModelBase::dateFromJson(item[U("value")]))); {{/items.isDateTime}} {{^items.isDateTime}} if(item.is_null()) { - m_{{name}}.insert(std::pair( key, {{{items.datatype}}}(nullptr) )); + m_{{name}}.insert(std::pair( key, {{{items.datatype}}}(nullptr) )); } else { {{{items.datatype}}} newItem({{{items.defaultValue}}}); newItem->fromJson(item[U("value")]); - m_{{name}}.insert(std::pair( key, newItem )); + m_{{name}}.insert(std::pair( key, newItem )); } {{/items.isDateTime}} {{/items.isString}} diff --git a/modules/swagger-codegen/src/main/resources/python/rest.mustache b/modules/swagger-codegen/src/main/resources/python/rest.mustache index 4bbc16a2123..b421c80c841 100644 --- a/modules/swagger-codegen/src/main/resources/python/rest.mustache +++ b/modules/swagger-codegen/src/main/resources/python/rest.mustache @@ -194,7 +194,7 @@ class RESTClientObject(object): # log response body 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) return r diff --git a/samples/client/petstore/python/petstore_api/rest.py b/samples/client/petstore/python/petstore_api/rest.py index 6618e2516ee..cc3c36c05ba 100644 --- a/samples/client/petstore/python/petstore_api/rest.py +++ b/samples/client/petstore/python/petstore_api/rest.py @@ -203,7 +203,7 @@ class RESTClientObject(object): # log response body 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) return r