[cpp-rest-sdk] remove unnecessary prefix for enum classes

Author: aminya

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

@@ -123,7 +123,7 @@ public:
         /// {{.}}
         /// </summary>
         {{/enumDescription}}
-        {{classname}}_{{{name}}}{{^last}},{{/last}}
+        {{{name}}}{{^last}},{{/last}}
         {{/enumVars}}
         {{/allowableValues}}
     };
@@ -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}}
 };

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

@@ -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;
@@ -83,7 +83,7 @@ using EnumUnderlyingType = {{#isNumeric}}int64_t{{/isNumeric}}{{^isNumeric}}util
 {{^isNumeric}}
     {{#enumVars}}
     if (val == utility::conversions::to_string_t(U("{{{value}}}")))
-        return {{classname}}::e{{classname}}::{{classname}}_{{name}};
+        return {{classname}}::e{{classname}}::{{name}};
     {{/enumVars}}
 {{/isNumeric}}
 {{/allowableValues}}
@@ -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}}U("{{value}}"){{/isNumeric}};
 {{#-last}}
     default:

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

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

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

@@ -25,31 +25,31 @@ using EnumUnderlyingType = utility::string_t;
 Color::eColor toEnum(const EnumUnderlyingType& val)
 {
     if (val == utility::conversions::to_string_t(U("black")))
-        return Color::eColor::Color_BLACK;
+        return Color::eColor::BLACK;
     if (val == utility::conversions::to_string_t(U("white")))
-        return Color::eColor::Color_WHITE;
+        return Color::eColor::WHITE;
     if (val == utility::conversions::to_string_t(U("brown")))
-        return Color::eColor::Color_BROWN;
+        return Color::eColor::BROWN;
     if (val == utility::conversions::to_string_t(U("golden")))
-        return Color::eColor::Color_GOLDEN;
+        return Color::eColor::GOLDEN;
     if (val == utility::conversions::to_string_t(U("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 U("black");
-    case Color::eColor::Color_WHITE:
+    case Color::eColor::WHITE:
         return U("white");
-    case Color::eColor::Color_BROWN:
+    case Color::eColor::BROWN:
         return U("brown");
-    case Color::eColor::Color_GOLDEN:
+    case Color::eColor::GOLDEN:
         return U("golden");
-    case Color::eColor::Color_MIXED:
+    case Color::eColor::MIXED:
         return U("mixed");
     default:
         break;