From 4626b185fe0aacd3a5cac3a83135484073bf6e7b Mon Sep 17 00:00:00 2001 From: shayan-eftekhari <86353115+shayan-eftekhari@users.noreply.github.com> Date: Thu, 9 Sep 2021 05:57:45 +0200 Subject: [PATCH] [cpp-restsdk] Fix ModelBase::fromJson(const web::json::value&, int64_t&) bug which incorrectly returns zero (#10300) * BUG FIX: A missing semicolon in cpp-pistache-server generated code. * BUG FIX: Provide default values of schema in cpp-pistache-server generated code. * BUG FIX: Provide default values of schema in cpp-pistache-server generated code. * Fix a bug in cpprest-sdk generator (Issue #8450) * Fix a bug in cpprest-sdk generator (Issue #8450) * Fix a bug in cpprest-sdk generator (Issue #8450) * Revert "Fix a bug in cpprest-sdk generator (Issue #8450)" This reverts commit 7d8f842860f94deb78fb519716f9984e1efad878. * Fix a bug in cpprest-sdk generator (Issue #8450) --- .../resources/cpp-rest-sdk-client/modelbase-source.mustache | 2 +- samples/client/petstore/cpp-restsdk/client/ModelBase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache index faa2333603a..160f6ce89de 100644 --- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache +++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/modelbase-source.mustache @@ -264,7 +264,7 @@ bool ModelBase::fromJson( const web::json::value& val, int32_t & outVal ) } bool ModelBase::fromJson( const web::json::value& val, int64_t & outVal ) { - outVal = !val.is_null() ? std::numeric_limits::quiet_NaN() : val.as_number().to_int64(); + outVal = !val.is_number() ? std::numeric_limits::quiet_NaN() : val.as_number().to_int64(); return val.is_number(); } bool ModelBase::fromJson( const web::json::value& val, utility::string_t & outVal ) diff --git a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp index 7807662a936..97f2120f35d 100644 --- a/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp +++ b/samples/client/petstore/cpp-restsdk/client/ModelBase.cpp @@ -275,7 +275,7 @@ bool ModelBase::fromJson( const web::json::value& val, int32_t & outVal ) } bool ModelBase::fromJson( const web::json::value& val, int64_t & outVal ) { - outVal = !val.is_null() ? std::numeric_limits::quiet_NaN() : val.as_number().to_int64(); + outVal = !val.is_number() ? std::numeric_limits::quiet_NaN() : val.as_number().to_int64(); return val.is_number(); } bool ModelBase::fromJson( const web::json::value& val, utility::string_t & outVal )