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

Fixed checking for optional properties when converting from json. (#2779)

Browse Source
This commit is contained in:
SalDiAngelus
2019-05-01 17:18:38 -04:00
committed by sunn
parent 1fddb69960
commit f9d04c9c23
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache vendored
View File

@@ -37,7 +37,7 @@ void to_json(nlohmann::json& j, const {{classname}}& o)
void from_json(const nlohmann::json& j, {{classname}}& o)
{
{{#vars}}
{{#required}}j.at("{{baseName}}").get_to(o.m_{{name}});{{/required}}{{^required}}if(!j.at("{{baseName}}").is_null())
{{#required}}j.at("{{baseName}}").get_to(o.m_{{name}});{{/required}}{{^required}}if(j.contains("{{baseName}}"))
{
j.at("{{baseName}}").get_to(o.m_{{name}});
o.m_{{name}}IsSet = true;

6
samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
View File

@@ -51,17 +51,17 @@ void to_json(nlohmann::json& j, const ApiResponse& o)
void from_json(const nlohmann::json& j, ApiResponse& o)
{
if(!j.at("code").is_null())
if(j.contains("code"))
{
j.at("code").get_to(o.m_Code);
o.m_CodeIsSet = true;
}
if(!j.at("type").is_null())
if(j.contains("type"))
{
j.at("type").get_to(o.m_Type);
o.m_TypeIsSet = true;
}
if(!j.at("message").is_null())
if(j.contains("message"))
{
j.at("message").get_to(o.m_Message);
o.m_MessageIsSet = true;

4
samples/server/petstore/cpp-pistache/model/Category.cpp
View File

@@ -47,12 +47,12 @@ void to_json(nlohmann::json& j, const Category& o)
void from_json(const nlohmann::json& j, Category& o)
{
if(!j.at("id").is_null())
if(j.contains("id"))
{
j.at("id").get_to(o.m_Id);
o.m_IdIsSet = true;
}
if(!j.at("name").is_null())
if(j.contains("name"))
{
j.at("name").get_to(o.m_Name);
o.m_NameIsSet = true;

12
samples/server/petstore/cpp-pistache/model/Order.cpp
View File

@@ -63,32 +63,32 @@ void to_json(nlohmann::json& j, const Order& o)
void from_json(const nlohmann::json& j, Order& o)
{
if(!j.at("id").is_null())
if(j.contains("id"))
{
j.at("id").get_to(o.m_Id);
o.m_IdIsSet = true;
}
if(!j.at("petId").is_null())
if(j.contains("petId"))
{
j.at("petId").get_to(o.m_PetId);
o.m_PetIdIsSet = true;
}
if(!j.at("quantity").is_null())
if(j.contains("quantity"))
{
j.at("quantity").get_to(o.m_Quantity);
o.m_QuantityIsSet = true;
}
if(!j.at("shipDate").is_null())
if(j.contains("shipDate"))
{
j.at("shipDate").get_to(o.m_ShipDate);
o.m_ShipDateIsSet = true;
}
if(!j.at("status").is_null())
if(j.contains("status"))
{
j.at("status").get_to(o.m_Status);
o.m_StatusIsSet = true;
}
if(!j.at("complete").is_null())
if(j.contains("complete"))
{
j.at("complete").get_to(o.m_Complete);
o.m_CompleteIsSet = true;

8
samples/server/petstore/cpp-pistache/model/Pet.cpp
View File

@@ -56,24 +56,24 @@ void to_json(nlohmann::json& j, const Pet& o)
void from_json(const nlohmann::json& j, Pet& o)
{
if(!j.at("id").is_null())
if(j.contains("id"))
{
j.at("id").get_to(o.m_Id);
o.m_IdIsSet = true;
}
if(!j.at("category").is_null())
if(j.contains("category"))
{
j.at("category").get_to(o.m_Category);
o.m_CategoryIsSet = true;
}
j.at("name").get_to(o.m_Name);
j.at("photoUrls").get_to(o.m_PhotoUrls);
if(!j.at("tags").is_null())
if(j.contains("tags"))
{
j.at("tags").get_to(o.m_Tags);
o.m_TagsIsSet = true;
}
if(!j.at("status").is_null())
if(j.contains("status"))
{
j.at("status").get_to(o.m_Status);
o.m_StatusIsSet = true;

4
samples/server/petstore/cpp-pistache/model/Tag.cpp
View File

@@ -47,12 +47,12 @@ void to_json(nlohmann::json& j, const Tag& o)
void from_json(const nlohmann::json& j, Tag& o)
{
if(!j.at("id").is_null())
if(j.contains("id"))
{
j.at("id").get_to(o.m_Id);
o.m_IdIsSet = true;
}
if(!j.at("name").is_null())
if(j.contains("name"))
{
j.at("name").get_to(o.m_Name);
o.m_NameIsSet = true;

16
samples/server/petstore/cpp-pistache/model/User.cpp
View File

@@ -71,42 +71,42 @@ void to_json(nlohmann::json& j, const User& o)
void from_json(const nlohmann::json& j, User& o)
{
if(!j.at("id").is_null())
if(j.contains("id"))
{
j.at("id").get_to(o.m_Id);
o.m_IdIsSet = true;
}
if(!j.at("username").is_null())
if(j.contains("username"))
{
j.at("username").get_to(o.m_Username);
o.m_UsernameIsSet = true;
}
if(!j.at("firstName").is_null())
if(j.contains("firstName"))
{
j.at("firstName").get_to(o.m_FirstName);
o.m_FirstNameIsSet = true;
}
if(!j.at("lastName").is_null())
if(j.contains("lastName"))
{
j.at("lastName").get_to(o.m_LastName);
o.m_LastNameIsSet = true;
}
if(!j.at("email").is_null())
if(j.contains("email"))
{
j.at("email").get_to(o.m_Email);
o.m_EmailIsSet = true;
}
if(!j.at("password").is_null())
if(j.contains("password"))
{
j.at("password").get_to(o.m_Password);
o.m_PasswordIsSet = true;
}
if(!j.at("phone").is_null())
if(j.contains("phone"))
{
j.at("phone").get_to(o.m_Phone);
o.m_PhoneIsSet = true;
}
if(!j.at("userStatus").is_null())
if(j.contains("userStatus"))
{
j.at("userStatus").get_to(o.m_UserStatus);
o.m_UserStatusIsSet = true;