Skip to content

[cpp-rest-sdk] fix enum values being used instead of names #21223

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

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

[cpp-rest-sdk] fix enum values being used instead of names #21223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93e6906
[cpp-rest-sdk] fix enum values being used instead of names
aminya May 5, 2025
305f6f9
[cpp-rest-sdk] remove unnecessary prefix for enum classes
aminya May 5, 2025
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
13 changes: 8 additions & 5 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 @@ -123,7 +123,7 @@ public:
/// {{.}}
/// </summary>
{{/enumDescription}}
{{classname}}_{{{name}}}{{^last}},{{/last}}
{{{name}}}{{^last}},{{/last}}
{{/enumVars}}
{{/allowableValues}}
};
Expand All @@ -136,14 +136,14 @@ public:
std::map<e{{classname}},utility::string_t> enumToStrMap = {
{{#allowableValues}}
{{#enumVars}}
{ e{{classname}}::{{classname}}_{{{name}}}, "{{{name}}}" }{{^-last}},{{/-last}}
{ e{{classname}}::{{{name}}}, "{{{name}}}" }{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
};
std::map<utility::string_t,e{{classname}}> strToEnumMap = {
{{#allowableValues}}
{{#enumVars}}
{ "{{{name}}}", e{{classname}}::{{classname}}_{{{name}}} }{{^-last}},{{/-last}}
{ "{{{name}}}", e{{classname}}::{{{name}}} }{{^-last}},{{/-last}}
{{/enumVars}}
{{/allowableValues}}
};
Expand Down Expand Up @@ -185,8 +185,11 @@ public:
{{#isEnum}}
enum class {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}
{
{{#allowableValues}}{{#enumVars}}{{value}},
{{/enumVars}}{{/allowableValues}}
{{#allowableValues}}
{{#enumVars}}
{{{name}}}{{^last}},{{/last}}
{{/enumVars}}
{{/allowableValues}}
};
{{#description}}
/// <summary>
Expand Down
10 changes: 5 additions & 5 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 @@ -72,7 +72,7 @@ using EnumUnderlyingType = {{#isNumeric}}int64_t{{/isNumeric}}{{^isNumeric}}util
{
{{#enumVars}}
case {{value}}:
return {{classname}}::e{{classname}}::{{classname}}_{{name}};
return {{classname}}::e{{classname}}::{{name}};
{{#-last}}
default:
break;
Expand All @@ -83,7 +83,7 @@ using EnumUnderlyingType = {{#isNumeric}}int64_t{{/isNumeric}}{{^isNumeric}}util
{{^isNumeric}}
{{#enumVars}}
if (val == utility::conversions::to_string_t(_XPLATSTR("{{{value}}}")))
return {{classname}}::e{{classname}}::{{classname}}_{{name}};
return {{classname}}::e{{classname}}::{{name}};
{{/enumVars}}
{{/isNumeric}}
{{/allowableValues}}
Expand All @@ -96,7 +96,7 @@ EnumUnderlyingType fromEnum({{classname}}::e{{classname}} e)
switch (e)
{
{{#enumVars}}
case {{classname}}::e{{classname}}::{{classname}}_{{name}}:
case {{classname}}::e{{classname}}::{{name}}:
return {{#isNumeric}}{{value}}{{/isNumeric}}{{^isNumeric}}_XPLATSTR("{{value}}"){{/isNumeric}};
{{#-last}}
default:
Expand Down Expand Up @@ -354,7 +354,7 @@ bool {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
{
{{#allowableValues}}{{#enumVars}}
if (value == utility::conversions::to_string_t("{{value}}")) {
return {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}::{{value}};
return {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}::{{name}};
}
{{/enumVars}}{{/allowableValues}}
throw std::invalid_argument("Invalid value for conversion to {{{datatypeWithEnum}}}");
Expand All @@ -369,7 +369,7 @@ const {{dataType}} {{classname}}::from{{{datatypeWithEnum}}}(const {{{datatypeWi
switch(value)
{
{{#allowableValues}}{{#enumVars}}
case {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}::{{value}}: return utility::conversions::to_string_t("{{value}}");
case {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}::{{name}}: return utility::conversions::to_string_t("{{value}}");
{{/enumVars}}{{/allowableValues}}
}
}
Expand Down
30 changes: 15 additions & 15 deletions samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ class Color

enum class eColor
{
Color_BLACK,
Color_WHITE,
Color_BROWN,
Color_GOLDEN,
Color_MIXED,
BLACK,
WHITE,
BROWN,
GOLDEN,
MIXED,
};

eColor getValue() const;
Expand All @@ -67,18 +67,18 @@ class Color
protected:
eColor m_value;
std::map<eColor,utility::string_t> enumToStrMap = {
{ eColor::Color_BLACK, "BLACK" },
{ eColor::Color_WHITE, "WHITE" },
{ eColor::Color_BROWN, "BROWN" },
{ eColor::Color_GOLDEN, "GOLDEN" },
{ eColor::Color_MIXED, "MIXED" }
{ eColor::BLACK, "BLACK" },
{ eColor::WHITE, "WHITE" },
{ eColor::BROWN, "BROWN" },
{ eColor::GOLDEN, "GOLDEN" },
{ eColor::MIXED, "MIXED" }
};
std::map<utility::string_t,eColor> strToEnumMap = {
{ "BLACK", eColor::Color_BLACK },
{ "WHITE", eColor::Color_WHITE },
{ "BROWN", eColor::Color_BROWN },
{ "GOLDEN", eColor::Color_GOLDEN },
{ "MIXED", eColor::Color_MIXED }
{ "BLACK", eColor::BLACK },
{ "WHITE", eColor::WHITE },
{ "BROWN", eColor::BROWN },
{ "GOLDEN", eColor::GOLDEN },
{ "MIXED", eColor::MIXED }
};

};
Expand Down
7 changes: 3 additions & 4 deletions samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ class Order

enum class StatusEnum
{
placed,
approved,
delivered,

PLACED,
APPROVED,
DELIVERED,
};
/// <summary>
/// Order Status
Expand Down
7 changes: 3 additions & 4 deletions samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,9 @@ class Pet

enum class StatusEnum
{
available,
pending,
sold,

AVAILABLE,
PENDING,
SOLD,
};
/// <summary>
/// pet status in the store
Expand Down
20 changes: 10 additions & 10 deletions samples/client/petstore/cpp-restsdk/client/src/model/Color.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@ using EnumUnderlyingType = utility::string_t;
Color::eColor toEnum(const EnumUnderlyingType& val)
{
if (val == utility::conversions::to_string_t(_XPLATSTR("black")))
return Color::eColor::Color_BLACK;
return Color::eColor::BLACK;
if (val == utility::conversions::to_string_t(_XPLATSTR("white")))
return Color::eColor::Color_WHITE;
return Color::eColor::WHITE;
if (val == utility::conversions::to_string_t(_XPLATSTR("brown")))
return Color::eColor::Color_BROWN;
return Color::eColor::BROWN;
if (val == utility::conversions::to_string_t(_XPLATSTR("golden")))
return Color::eColor::Color_GOLDEN;
return Color::eColor::GOLDEN;
if (val == utility::conversions::to_string_t(_XPLATSTR("mixed")))
return Color::eColor::Color_MIXED;
return Color::eColor::MIXED;
return {};
}

EnumUnderlyingType fromEnum(Color::eColor e)
{
switch (e)
{
case Color::eColor::Color_BLACK:
case Color::eColor::BLACK:
return _XPLATSTR("black");
case Color::eColor::Color_WHITE:
case Color::eColor::WHITE:
return _XPLATSTR("white");
case Color::eColor::Color_BROWN:
case Color::eColor::BROWN:
return _XPLATSTR("brown");
case Color::eColor::Color_GOLDEN:
case Color::eColor::GOLDEN:
return _XPLATSTR("golden");
case Color::eColor::Color_MIXED:
case Color::eColor::MIXED:
return _XPLATSTR("mixed");
default:
break;
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,15 @@ Order::StatusEnum Order::toStatusEnum(const utility::string_t& value) const
{

if (value == utility::conversions::to_string_t("placed")) {
return StatusEnum::placed;
return StatusEnum::PLACED;
}

if (value == utility::conversions::to_string_t("approved")) {
return StatusEnum::approved;
return StatusEnum::APPROVED;
}

if (value == utility::conversions::to_string_t("delivered")) {
return StatusEnum::delivered;
return StatusEnum::DELIVERED;
}

throw std::invalid_argument("Invalid value for conversion to StatusEnum");
Expand All @@ -259,11 +259,11 @@ const utility::string_t Order::fromStatusEnum(const StatusEnum value) const
switch(value)
{

case StatusEnum::placed: return utility::conversions::to_string_t("placed");
case StatusEnum::PLACED: return utility::conversions::to_string_t("placed");

case StatusEnum::approved: return utility::conversions::to_string_t("approved");
case StatusEnum::APPROVED: return utility::conversions::to_string_t("approved");

case StatusEnum::delivered: return utility::conversions::to_string_t("delivered");
case StatusEnum::DELIVERED: return utility::conversions::to_string_t("delivered");

}
}
Expand Down
12 changes: 6 additions & 6 deletions samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,15 @@ Pet::StatusEnum Pet::toStatusEnum(const utility::string_t& value) const
{

if (value == utility::conversions::to_string_t("available")) {
return StatusEnum::available;
return StatusEnum::AVAILABLE;
}

if (value == utility::conversions::to_string_t("pending")) {
return StatusEnum::pending;
return StatusEnum::PENDING;
}

if (value == utility::conversions::to_string_t("sold")) {
return StatusEnum::sold;
return StatusEnum::SOLD;
}

throw std::invalid_argument("Invalid value for conversion to StatusEnum");
Expand All @@ -256,11 +256,11 @@ const utility::string_t Pet::fromStatusEnum(const StatusEnum value) const
switch(value)
{

case StatusEnum::available: return utility::conversions::to_string_t("available");
case StatusEnum::AVAILABLE: return utility::conversions::to_string_t("available");

case StatusEnum::pending: return utility::conversions::to_string_t("pending");
case StatusEnum::PENDING: return utility::conversions::to_string_t("pending");

case StatusEnum::sold: return utility::conversions::to_string_t("sold");
case StatusEnum::SOLD: return utility::conversions::to_string_t("sold");

}
}
Expand Down
Loading