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

[C++] [rest-sdk] Add missing enum processing in C++Abstract codegen #3986

Merged
merged 1 commit into from
Sep 29, 2019
Merged

[C++] [rest-sdk] Add missing enum processing in C++Abstract codegen #3986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions ...penapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.io.File;
import java.net.URL;
import java.util.Arrays;
import java.util.Map;

abstract public class AbstractCppCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractCppCodegen.class);
Expand Down Expand Up @@ -306,4 +307,9 @@ public void preprocessOpenAPI(OpenAPI openAPI) {
this.additionalProperties.put("serverHost", host);
}
}

@Override
public Map<String, Object> postProcessModels(Map<String, Object> objs) {
return postProcessModelsEnum(objs);
}
}
5 changes: 0 additions & 5 deletions ...api-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,6 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
return objs;
}

@Override
public Map<String, Object> postProcessModels(Map<String, Object> objs) {
return postProcessModelsEnum(objs);
}

@Override
public String toEnumValue(String value, String datatype) {
return escapeText(value);
Expand Down
6 changes: 3 additions & 3 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 @@ -42,14 +42,14 @@ public:
enum class e{{classname}}
{
{{#allowableValues}}
{{#values}}
{{#enumVars}}
{{#enumDescription}}
/// <summary>
/// {{enumDescription}}
/// </summary>
{{/enumDescription}}
{{classname}}_{{.}}{{^last}},{{/last}}
{{/values}}
{{classname}}_{{{name}}}{{^last}},{{/last}}
{{/enumVars}}
{{/allowableValues}}
};

Expand Down
16 changes: 8 additions & 8 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 @@ -27,8 +27,8 @@ web::json::value {{classname}}::toJson() const
{
web::json::value val = web::json::value::object();

{{#allowableValues}}{{#values}}
if (m_value == e{{classname}}::{{classname}}_{{.}}) val = web::json::value::string(U("{{.}}"));{{/values}}{{/allowableValues}}
{{#allowableValues}}{{#enumVars}}
if (m_value == e{{classname}}::{{classname}}_{{name}}) val = web::json::value::string(U({{{value}}}));{{/enumVars}}{{/allowableValues}}

return val;
}
Expand All @@ -37,8 +37,8 @@ void {{classname}}::fromJson(const web::json::value& val)
{
auto s = val.as_string();

{{#allowableValues}}{{#values}}
if (s == utility::conversions::to_string_t("{{.}}")) m_value = e{{classname}}::{{classname}}_{{.}};{{/values}}{{/allowableValues}}
{{#allowableValues}}{{#enumVars}}
if (s == utility::conversions::to_string_t({{{value}}})) m_value = e{{classname}}::{{classname}}_{{name}};{{/enumVars}}{{/allowableValues}}
}

void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& prefix) const
Expand All @@ -51,8 +51,8 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co

utility::string_t s;

{{#allowableValues}}{{#values}}
if (m_value == e{{classname}}::{{classname}}_{{.}}) s = utility::conversions::to_string_t("{{.}}");{{/values}}{{/allowableValues}}
{{#allowableValues}}{{#enumVars}}
if (m_value == e{{classname}}::{{classname}}_{{name}}) s = utility::conversions::to_string_t({{{value}}});{{/enumVars}}{{/allowableValues}}

multipart->add(ModelBase::toHttpContent(namePrefix, s));
}
Expand All @@ -70,8 +70,8 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
s = ModelBase::stringFromHttpContent(multipart->getContent(namePrefix));
e{{classname}} v;

{{#allowableValues}}{{#values}}
if (s == utility::conversions::to_string_t("{{.}}")) v = e{{classname}}::{{classname}}_{{.}};{{/values}}{{/allowableValues}}
{{#allowableValues}}{{#enumVars}}
if (s == utility::conversions::to_string_t({{{value}}})) v = e{{classname}}::{{classname}}_{{name}};{{/enumVars}}{{/allowableValues}}

setValue(v);
}
Expand Down