[C++][Pistache] Add missing setter for arrays

Fixes OpenAPITools#3769
muttleyxd · Sep 5, 2019 · e537132 · e537132
1 parent 9cc7bd1
commit e537132
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache
@@ -35,12 +35,10 @@ public:
     /// <summary>
     /// {{description}}
     /// </summary>
-    {{#isContainer}}{{{dataType}}}& {{getter}}();
-    {{/isContainer}}{{^isContainer}}{{{dataType}}} {{getter}}() const;
-    void {{setter}}({{{dataType}}} const{{^isPrimitiveType}}&{{/isPrimitiveType}} value);
-    {{/isContainer}}{{^required}}bool {{nameInCamelCase}}IsSet() const;
-    void unset{{name}}();
-    {{/required}}
+    {{{dataType}}}{{#isContainer}}&{{/isContainer}} {{getter}}(){{^isContainer}} const{{/isContainer}};
+    void {{setter}}({{{dataType}}} const{{^isPrimitiveType}}&{{/isPrimitiveType}} value);{{^required}}
+    bool {{nameInCamelCase}}IsSet() const;
+    void unset{{name}}();{{/required}}
     {{/vars}}
 
     friend void to_json(nlohmann::json& j, const {{classname}}& o);

diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
@@ -29,7 +29,7 @@ void to_json(nlohmann::json& j, const {{classname}}& o)
 {
     j = nlohmann::json();
     {{#vars}}
-    {{#required}}j["{{baseName}}"] = o.m_{{name}};{{/required}}{{^required}}if(o.{{nameInCamelCase}}IsSet())
+    {{#required}}j["{{baseName}}"] = o.m_{{name}};{{/required}}{{^required}}if(o.{{nameInCamelCase}}IsSet(){{#isContainer}} || !o.m_{{name}}.empty(){{/isContainer}})
         j["{{baseName}}"] = o.m_{{name}};{{/required}}
     {{/vars}}
 }
@@ -45,20 +45,15 @@ void from_json(const nlohmann::json& j, {{classname}}& o)
     {{/vars}}
 }
 
-{{#vars}}{{#isContainer}}{{{dataType}}}& {{classname}}::{{getter}}()
-{
-    return m_{{name}};
-}
-{{/isContainer}}{{^isContainer}}{{{dataType}}} {{classname}}::{{getter}}() const
+{{#vars}}{{{dataType}}}{{#isContainer}}&{{/isContainer}} {{classname}}::{{getter}}(){{^isContainer}} const{{/isContainer}}
 {
     return m_{{name}};
 }
 void {{classname}}::{{setter}}({{{dataType}}} const{{^isPrimitiveType}}&{{/isPrimitiveType}} value)
 {
-    m_{{name}} = value;
-    {{^required}}m_{{name}}IsSet = true;{{/required}}
+    m_{{name}} = value;{{^required}}
+    m_{{name}}IsSet = true;{{/required}}
 }
-{{/isContainer}}
 {{^required}}bool {{classname}}::{{nameInCamelCase}}IsSet() const
 {
     return m_{{name}}IsSet;