Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[cpprestsdk] Implement Enum inside Objects #19919

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[cpprestsdk] Implement Enum inside Objects #19919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
905454d
Fix #19566 implemented the missing definition of declared methods ins…
SaverioCode Sep 11, 2024
379a95c
Regenerated cpp-restsdk client samples
SaverioCode Sep 11, 2024
797ddb1
Fixed shared_ptr creation
SaverioCode Sep 20, 2024
99d05aa
Merge remote-tracking branch 'upstream/master'
SaverioCode Oct 15, 2024
54806ed
[cpprestsdk] Implement enum inside objects
SaverioCode Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 47 additions & 14 deletions modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
#ifndef {{modelHeaderGuardPrefix}}_{{classname}}_H_
#define {{modelHeaderGuardPrefix}}_{{classname}}_H_

{{#hasEnums}}
#include <stdexcept>
{{/hasEnums}}
{{#oneOf}}
{{#-first}}
#include <variant>
Expand Down Expand Up @@ -146,34 +149,64 @@ public:
void toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix) const override;
bool fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix) override;


/////////////////////////////////////////////
/// {{classname}} members

{{#vars}}
{{^isInherited}}
{{! ENUM DEFINITIONS }}
{{#vars}}{{^isInherited}}{{#isEnum}}
enum class {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}
{
{{#allowableValues}}{{#enumVars}}{{value}},
{{/enumVars}}{{/allowableValues}}
};
/// <summary>
/// {{description}}
/// </summary>
{{#isContainer}}{{{dataType}}}& {{getter}}();
{{/isContainer}}{{^isContainer}}{{{dataType}}} {{getter}}() const;
{{/isContainer}}bool {{nameInCamelCase}}IsSet() const;
{{/isEnum}}{{/isInherited}}{{/vars}}{{#vars}}{{^isInherited}}{{#isEnum}}{{#isContainer}}
{{! ENUM CONVERSIONS }}
{{{enumName}}} to{{{enumName}}}(const utility::string_t& value) const;
const utility::string_t from{{{enumName}}}(const {{{enumName}}} value) const;
{{#isArray}}
{{{datatypeWithEnum}}} to{{{enumName}}}(const {{{dataType}}}& value) const;
{{{dataType}}} from{{{enumName}}}(const {{{datatypeWithEnum}}}& value) const;
{{/isArray}}{{/isContainer}}{{^isContainer}}
{{{datatypeWithEnum}}} to{{{datatypeWithEnum}}}(const utility::string_t& value) const;
const utility::string_t from{{{datatypeWithEnum}}}(const {{{datatypeWithEnum}}} value) const;
{{/isContainer}}{{/isEnum}}{{/isInherited}}{{/vars}}

{{! SETTER AND GETTERS }}
{{#vars}}{{^isInherited}}
/// <summary>
/// {{description}}
/// </summary>
{{#isContainer}}{{^isEnum}}
{{{dataType}}} {{getter}}() const;
{{/isEnum}}{{/isContainer}}{{^isContainer}}{{^isEnum}}
{{{dataType}}} {{getter}}() const;
{{/isEnum}}{{/isContainer}}
{{#isEnum}}{{^isMap}}
{{{datatypeWithEnum}}} {{getter}}() const;
{{/isMap}}{{#isMap}}
{{{dataType}}} {{getter}}() const;
{{/isMap}}{{/isEnum}}
bool {{nameInCamelCase}}IsSet() const;
void unset{{name}}();

{{#isPrimitiveType}}
void {{setter}}({{{dataType}}} value);
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isEnum}}
void {{setter}}(const {{{dataType}}}& value);
{{/isPrimitiveType}}

{{/isInherited}}
{{/vars}}
{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
void {{setter}}(const {{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} value);
{{/isEnum}}{{/isInherited}}{{/vars}}

protected:
{{#vars}}
{{^isInherited}}
{{^isInherited}}{{^isEnum}}
{{{dataType}}} m_{{name}};
bool m_{{name}}IsSet;
{{/isEnum}}{{#isEnum}}
{{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} m_{{name}};
{{/isEnum}}bool m_{{name}}IsSet;
{{/isInherited}}
{{/vars}}
};
Expand Down
120 changes: 105 additions & 15 deletions modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,14 +175,14 @@ void {{classname}}::setValue({{classname}}::e{{classname}} const value)
}

{{/isEnum}}

{{^isEnum}}

{{classname}}::{{classname}}()
{
{{#vars}}
{{^isInherited}}
{{^isContainer}}
{{^isEnum}}
{{#isPrimitiveType}}
m_{{name}} = {{{defaultValue}}};
{{/isPrimitiveType}}
Expand All @@ -194,6 +194,7 @@ void {{classname}}::setValue({{classname}}::e{{classname}} const value)
m_{{name}} = {{{defaultValue}}};
{{/isDateTime}}
{{/isPrimitiveType}}
{{/isEnum}}
{{/isContainer}}
m_{{name}}IsSet = false;
{{/isInherited}}
Expand All @@ -212,15 +213,27 @@ void {{classname}}::validate()
web::json::value {{classname}}::toJson() const
{
{{#parent}}
web::json::value val = this->{{{.}}}::toJson();{{/parent}}
web::json::value val = this->{{{.}}}::toJson();
{{/parent}}
{{^parent}}
web::json::value val = web::json::value::object();
{{/parent}}
{{#vars}}{{^isInherited}}
if(m_{{name}}IsSet)
{
{
{{#isEnum}}{{#isContainer}}{{#isArray}}
{{{dataType}}} refVal = from{{{enumName}}}(m_{{name}});
{{/isArray}}{{#isMap}}
val[utility::conversions::to_string_t(U("{{baseName}}"))] = ModelBase::toJson(m_{{name}});
}{{/isInherited}}{{/vars}}
{{/isMap}}{{/isContainer}}{{^isContainer}}
utility::string_t refVal = from{{{datatypeWithEnum}}}(m_{{name}});
{{/isContainer}}{{^isMap}}val[utility::conversions::to_string_t(U("{{baseName}}"))] = ModelBase::toJson(refVal);
{{/isMap}}{{/isEnum}}
{{^isEnum}}
val[utility::conversions::to_string_t(U("{{baseName}}"))] = ModelBase::toJson(m_{{name}});
{{/isEnum}}
}
{{/isInherited}}{{/vars}}

return val;
}
Expand All @@ -239,7 +252,16 @@ bool {{classname}}::fromJson(const web::json::value& val)
{
{{{dataType}}} refVal_{{setter}};
ok &= ModelBase::fromJson(fieldValue, refVal_{{setter}});
{{^isEnum}}
{{setter}}(refVal_{{setter}});
{{/isEnum}}
{{#isEnum}}{{#isContainer}}{{#isArray}}
{{setter}}(to{{{enumName}}}(refVal_{{setter}}));
{{/isArray}}{{#isMap}}
{{setter}}(refVal_{{setter}});
{{/isMap}}{{/isContainer}}{{^isContainer}}
{{setter}}(to{{{datatypeWithEnum}}}(refVal_{{setter}}));
{{/isContainer}}{{/isEnum}}
}
}{{/isInherited}}{{/vars}}
return ok;
Expand All @@ -255,7 +277,16 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
{{#vars}}
if(m_{{name}}IsSet)
{
{{^isEnum}}
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), m_{{name}}));
{{/isEnum}}
{{#isEnum}}{{#isContainer}}{{#isArray}}
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), from{{{enumName}}}(m_{{name}})));
{{/isArray}}{{#isMap}}
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), m_{{name}}));
{{/isMap}}{{/isContainer}}{{^isContainer}}
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), from{{{datatypeWithEnum}}}(m_{{name}})));
{{/isContainer}}{{/isEnum}}
}
{{/vars}}
}
Expand All @@ -274,33 +305,93 @@ bool {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
{
{{{dataType}}} refVal_{{setter}};
ok &= ModelBase::fromHttpContent(multipart->getContent(utility::conversions::to_string_t(U("{{baseName}}"))), refVal_{{setter}} );
{{^isEnum}}
{{setter}}(refVal_{{setter}});
{{/isEnum}}
{{#isEnum}}{{#isContainer}}{{#isArray}}
{{setter}}(to{{{enumName}}}(refVal_{{setter}}));
{{/isArray}}{{#isMap}}
{{setter}}(refVal_{{setter}});
{{/isMap}}{{/isContainer}}{{^isContainer}}
{{setter}}(to{{{datatypeWithEnum}}}(refVal_{{setter}}));
{{/isContainer}}{{/isEnum}}
}
{{/vars}}
return ok;
}

{{#vars}}
{{^isInherited}}
{{#vars}}{{^isInherited}}{{#isEnum}}{{#isContainer}}
{{classname}}::{{{enumName}}} {{classname}}::to{{{enumName}}}(const utility::string_t& value) const
{{/isContainer}}{{^isContainer}}
{{classname}}::{{{datatypeWithEnum}}} {{classname}}::to{{{datatypeWithEnum}}}(const {{dataType}}& value) const
{{/isContainer}}
{
{{#allowableValues}}{{#enumVars}}
if (value == utility::conversions::to_string_t("{{value}}")) {
return {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}::{{value}};
}
{{/enumVars}}{{/allowableValues}}
throw std::invalid_argument("Invalid value for conversion to {{{datatypeWithEnum}}}");
}

{{#isContainer}}
{{{dataType}}}& {{classname}}::{{getter}}()
const utility::string_t {{classname}}::from{{{enumName}}}(const {{{enumName}}} value) const
{{/isContainer}}{{^isContainer}}
const {{dataType}} {{classname}}::from{{{datatypeWithEnum}}}(const {{{datatypeWithEnum}}} value) const
{{/isContainer}}
{
switch(value)
{
{{#allowableValues}}{{#enumVars}}
case {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}::{{value}}: return utility::conversions::to_string_t("{{value}}");
{{/enumVars}}{{/allowableValues}}
}
}

{{#isContainer}}{{#isArray}}
{{{dataType}}} {{{classname}}}::from{{{enumName}}}(const {{{datatypeWithEnum}}}& value) const
{
{{{dataType}}} ret;
for (auto it = value.begin(); it != value.end(); it++) {
ret.push_back(from{{{enumName}}}(*it));
}
return ret;
}

{{{baseType}}}<{{classname}}::{{{enumName}}}> {{{classname}}}::to{{{enumName}}}(const {{{dataType}}}& value) const
{
{{{datatypeWithEnum}}} ret;
for (auto it = value.begin(); it != value.end(); it++) {
ret.push_back(to{{{enumName}}}(*it));
}
return ret;
}
{{/isArray}}{{/isContainer}}{{/isEnum}}{{/isInherited}}{{/vars}}

{{#vars}}{{^isInherited}}{{#isContainer}}{{^isEnum}}
{{{dataType}}} {{classname}}::{{getter}}() const
{
return m_{{name}};
}
{{/isContainer}}
{{^isContainer}}
{{/isEnum}}{{/isContainer}}{{^isContainer}}{{^isEnum}}
{{{dataType}}} {{classname}}::{{getter}}() const
{
return m_{{name}};
}
{{/isContainer}}
{{/isEnum}}{{/isContainer}}{{#isEnum}}
{{^isMap}}{{#isArray}}{{{baseType}}}<{{/isArray}}{{{classname}}}::{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} {{classname}}::{{getter}}() const
{
return m_{{name}};
}
{{/isEnum}}

{{#isPrimitiveType}}
void {{classname}}::{{setter}}({{{dataType}}} value)
{{/isPrimitiveType}}
{{^isPrimitiveType}}
{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isEnum}}
void {{classname}}::{{setter}}(const {{{dataType}}}& value)
{{/isPrimitiveType}}
{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
void {{classname}}::{{setter}}(const {{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} value)
{{/isEnum}}
{
m_{{name}} = value;
m_{{name}}IsSet = true;
Expand All @@ -315,8 +406,7 @@ void {{classname}}::unset{{name}}()
{
m_{{name}}IsSet = false;
}
{{/isInherited}}
{{/vars}}
{{/isInherited}}{{/vars}}
{{/isEnum}}
{{/oneOf}}
{{#modelNamespaceDeclarations}}
Expand Down
23 changes: 19 additions & 4 deletions samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,42 +51,57 @@ class ApiResponse
void toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix) const override;
bool fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix) override;


/////////////////////////////////////////////
/// ApiResponse members




/// <summary>
///
/// </summary>

int32_t getCode() const;


bool codeIsSet() const;
void unsetCode();

void setCode(int32_t value);

/// <summary>
///
/// </summary>

utility::string_t getType() const;


bool typeIsSet() const;
void unsetType();

void setType(const utility::string_t& value);

/// <summary>
///
/// </summary>

utility::string_t getMessage() const;


bool messageIsSet() const;
void unsetMessage();

void setMessage(const utility::string_t& value);


protected:

int32_t m_Code;
bool m_CodeIsSet;

utility::string_t m_Type;
bool m_TypeIsSet;

utility::string_t m_Message;
bool m_MessageIsSet;
};
Expand Down
17 changes: 14 additions & 3 deletions samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,42 @@ class Category
void toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix) const override;
bool fromMultiPart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix) override;


/////////////////////////////////////////////
/// Category members




/// <summary>
///
/// </summary>

int64_t getId() const;


bool idIsSet() const;
void unsetId();

void setId(int64_t value);

/// <summary>
///
/// </summary>

utility::string_t getName() const;


bool nameIsSet() const;
void unsetName();

void setName(const utility::string_t& value);


protected:

int64_t m_Id;
bool m_IdIsSet;

utility::string_t m_Name;
bool m_NameIsSet;
};
Expand Down
Loading
Loading