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

Author: aminya

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache

@@ -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>

modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache

@@ -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}}}");
@@ -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}}
     }
 }

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Order.h

@@ -58,10 +58,9 @@ class  Order
 
     enum class StatusEnum
     {
-        placed,
-        approved,
-        delivered,
-        
+        PLACED,
+        APPROVED,
+        DELIVERED,
     };
     /// <summary>
     /// Order Status

samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Pet.h

@@ -63,10 +63,9 @@ class  Pet
 
     enum class StatusEnum
     {
-        available,
-        pending,
-        sold,
-        
+        AVAILABLE,
+        PENDING,
+        SOLD,
     };
     /// <summary>
     /// pet status in the store

samples/client/petstore/cpp-restsdk/client/src/model/Order.cpp

@@ -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");
@@ -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");
 
     }
 }

samples/client/petstore/cpp-restsdk/client/src/model/Pet.cpp

@@ -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");
@@ -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");
 
     }
 }