[cpprestsdk] Better code format (#20237)

* remove blank lines * fix summary, add line break bwtween vars * update
OpenAPITools · Dec 5, 2024 · f406f78 · f406f78
1 parent 05d4aa9
commit f406f78
Show file tree

Hide file tree

Showing 21 changed files with 177 additions and 492 deletions.
diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-header.mustache
@@ -128,9 +128,11 @@ public:
 {{/isEnum}}
 {{^isEnum}}
 
+{{#description}}
 /// <summary>
 /// {{description}}
 /// </summary>
+{{/description}}
 class {{declspec}} {{classname}}
     : public {{{parent}}}{{^parent}}ModelBase{{/parent}}
 {
@@ -154,16 +156,26 @@ public:
     /// {{classname}} members
 
     {{! ENUM DEFINITIONS }}
-    {{#vars}}{{^isInherited}}{{#isEnum}}
+    {{#vars}}
+    {{^isInherited}}
+    {{#isEnum}}
     enum class {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}
     {
         {{#allowableValues}}{{#enumVars}}{{value}},
         {{/enumVars}}{{/allowableValues}}
     };
+    {{#description}}
     /// <summary>
     /// {{description}}
     /// </summary>
-    {{/isEnum}}{{/isInherited}}{{/vars}}{{#vars}}{{^isInherited}}{{#isEnum}}{{#isContainer}}
+    {{/description}}
+    {{/isEnum}}
+    {{/isInherited}}
+    {{/vars}}
+    {{#vars}}
+    {{^isInherited}}
+    {{#isEnum}}
+    {{#isContainer}}
     {{! ENUM CONVERSIONS }}
     {{{enumName}}} to{{{enumName}}}(const utility::string_t& value) const;
     const utility::string_t from{{{enumName}}}(const {{{enumName}}} value) const;
@@ -173,41 +185,67 @@ public:
     {{/isArray}}{{/isContainer}}{{^isContainer}}
     {{{datatypeWithEnum}}} to{{{datatypeWithEnum}}}(const utility::string_t& value) const;
     const utility::string_t from{{{datatypeWithEnum}}}(const {{{datatypeWithEnum}}} value) const;
-    {{/isContainer}}{{/isEnum}}{{/isInherited}}{{/vars}}
+    {{/isContainer}}
+
+    {{/isEnum}}
+    {{/isInherited}}
+    {{/vars}}
 
     {{! SETTER AND GETTERS }}
-    {{#vars}}{{^isInherited}}
+    {{#vars}}
+    {{^isInherited}}
+    {{#description}}
     /// <summary>
     /// {{description}}
     /// </summary>
-    {{#isContainer}}{{^isEnum}}
+    {{/description}}
+    {{#isContainer}}
+    {{^isEnum}}
     {{{dataType}}} {{getter}}() const;
-    {{/isEnum}}{{/isContainer}}{{^isContainer}}{{^isEnum}}
+    {{/isEnum}}
+    {{/isContainer}}
+    {{^isContainer}}
+    {{^isEnum}}
     {{{dataType}}} {{getter}}() const;
-    {{/isEnum}}{{/isContainer}}
-    {{#isEnum}}{{^isMap}}
+    {{/isEnum}}
+    {{/isContainer}}
+    {{#isEnum}}
+    {{^isMap}}
     {{{datatypeWithEnum}}} {{getter}}() const;
-    {{/isMap}}{{#isMap}}
+    {{/isMap}}
+    {{#isMap}}
     {{{dataType}}} {{getter}}() const;
-    {{/isMap}}{{/isEnum}}
+    {{/isMap}}
+    {{/isEnum}}
     bool {{nameInCamelCase}}IsSet() const;
     void unset{{name}}();
     {{#isPrimitiveType}}
     void {{setter}}({{{dataType}}} value);
-    {{/isPrimitiveType}}{{^isPrimitiveType}}{{^isEnum}}
+    {{/isPrimitiveType}}
+    {{^isPrimitiveType}}
+    {{^isEnum}}
     void {{setter}}(const {{{dataType}}}& value);
-    {{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
+    {{/isEnum}}
+    {{/isPrimitiveType}}
+    {{#isEnum}}
     void {{setter}}(const {{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} value);
-    {{/isEnum}}{{/isInherited}}{{/vars}}
+    {{/isEnum}}
+    {{/isInherited}}
+
+    {{/vars}}
 
 protected:
     {{#vars}}
-    {{^isInherited}}{{^isEnum}}
+    {{^isInherited}}
+    {{^isEnum}}
     {{{dataType}}} m_{{name}};
-    {{/isEnum}}{{#isEnum}}
+    {{/isEnum}}
+    {{#isEnum}}
     {{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} m_{{name}};
-    {{/isEnum}}bool m_{{name}}IsSet;
+    {{/isEnum}}
+    bool m_{{name}}IsSet;
     {{/isInherited}}
+
     {{/vars}}
 };
 

diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache
@@ -6,7 +6,8 @@
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {
 {{/modelNamespaceDeclarations}}
-{{#oneOf}}{{#-first}}
+{{#oneOf}}
+{{#-first}}
 
 void {{classname}}::validate()
 {
@@ -54,7 +55,8 @@ template bool {{classname}}::fromJson<{{.}}>(const web::json::value& json);
 template bool {{classname}}::fromMultiPart<{{.}}>(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix);
 {{/oneOf}}
 
-{{/-first}}{{/oneOf}}
+{{/-first}}
+{{/oneOf}}
 {{^oneOf}}
 {{#isEnum}}
 
@@ -218,7 +220,8 @@ web::json::value {{classname}}::toJson() const
     {{^parent}}
     web::json::value val = web::json::value::object();
     {{/parent}}
-    {{#vars}}{{^isInherited}}
+    {{#vars}}
+    {{^isInherited}}
     if(m_{{name}}IsSet)
     {   
         {{#isEnum}}{{#isContainer}}{{#isArray}}
@@ -233,7 +236,8 @@ web::json::value {{classname}}::toJson() const
         val[utility::conversions::to_string_t(U("{{baseName}}"))] = ModelBase::toJson(m_{{name}});
         {{/isEnum}}
     }
-    {{/isInherited}}{{/vars}}
+    {{/isInherited}}
+    {{/vars}}
 
     return val;
 }
@@ -244,7 +248,8 @@ bool {{classname}}::fromJson(const web::json::value& val)
     {{#parent}}
     ok &= this->{{{.}}}::fromJson(val);
     {{/parent}}
-    {{#vars}}{{^isInherited}}
+    {{#vars}}
+    {{^isInherited}}
     if(val.has_field(utility::conversions::to_string_t(U("{{baseName}}"))))
     {
         const web::json::value& fieldValue = val.at(utility::conversions::to_string_t(U("{{baseName}}")));
@@ -263,7 +268,9 @@ bool {{classname}}::fromJson(const web::json::value& val)
             {{setter}}(to{{{datatypeWithEnum}}}(refVal_{{setter}}));
             {{/isContainer}}{{/isEnum}}
         }
-    }{{/isInherited}}{{/vars}}
+    }
+    {{/isInherited}}
+    {{/vars}}
     return ok;
 }
 
@@ -280,13 +287,18 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
         {{^isEnum}}
         multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), m_{{name}}));
         {{/isEnum}}
-        {{#isEnum}}{{#isContainer}}{{#isArray}}
+        {{#isEnum}}
+	{{#isContainer}}
+	{{#isArray}}
         multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), from{{{enumName}}}(m_{{name}})));
         {{/isArray}}{{#isMap}}
         multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), m_{{name}}));
-        {{/isMap}}{{/isContainer}}{{^isContainer}}
+        {{/isMap}}
+	{{/isContainer}}
+	{{^isContainer}}
         multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), from{{{datatypeWithEnum}}}(m_{{name}})));
-        {{/isContainer}}{{/isEnum}}
+        {{/isContainer}}
+	{{/isEnum}}
     }
     {{/vars}}
 }
@@ -308,21 +320,31 @@ bool {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
         {{^isEnum}}
         {{setter}}(refVal_{{setter}});
         {{/isEnum}}
-        {{#isEnum}}{{#isContainer}}{{#isArray}}
+        {{#isEnum}}
+	{{#isContainer}}
+	{{#isArray}}
         {{setter}}(to{{{enumName}}}(refVal_{{setter}}));
-        {{/isArray}}{{#isMap}}
+        {{/isArray}}
+	{{#isMap}}
         {{setter}}(refVal_{{setter}});
-        {{/isMap}}{{/isContainer}}{{^isContainer}}
+        {{/isMap}}
+	{{/isContainer}}
+	{{^isContainer}}
         {{setter}}(to{{{datatypeWithEnum}}}(refVal_{{setter}}));
-        {{/isContainer}}{{/isEnum}}
+        {{/isContainer}}
+	{{/isEnum}}
     }
     {{/vars}}
     return ok;
 }
 
-{{#vars}}{{^isInherited}}{{#isEnum}}{{#isContainer}}
+{{#vars}}
+{{^isInherited}}
+{{#isEnum}}
+{{#isContainer}}
 {{classname}}::{{{enumName}}} {{classname}}::to{{{enumName}}}(const utility::string_t& value) const
-{{/isContainer}}{{^isContainer}}
+{{/isContainer}}
+{{^isContainer}}
 {{classname}}::{{{datatypeWithEnum}}} {{classname}}::to{{{datatypeWithEnum}}}(const {{dataType}}& value) const
 {{/isContainer}}
 {
@@ -348,7 +370,8 @@ const {{dataType}} {{classname}}::from{{{datatypeWithEnum}}}(const {{{datatypeWi
     }
 }
 
-{{#isContainer}}{{#isArray}}
+{{#isContainer}}
+{{#isArray}}
 {{{dataType}}} {{{classname}}}::from{{{enumName}}}(const {{{datatypeWithEnum}}}& value) const
 {
     {{{dataType}}} ret;
@@ -366,19 +389,31 @@ const {{dataType}} {{classname}}::from{{{datatypeWithEnum}}}(const {{{datatypeWi
     }
     return ret;
 }
-{{/isArray}}{{/isContainer}}{{/isEnum}}{{/isInherited}}{{/vars}}
+{{/isArray}}
+{{/isContainer}}
+{{/isEnum}}
+{{/isInherited}}
+{{/vars}}
 
-{{#vars}}{{^isInherited}}{{#isContainer}}{{^isEnum}}
+{{#vars}}
+{{^isInherited}}
+{{#isContainer}}
+{{^isEnum}}
 {{{dataType}}} {{classname}}::{{getter}}() const
 {
     return m_{{name}};
 }
-{{/isEnum}}{{/isContainer}}{{^isContainer}}{{^isEnum}}
+{{/isEnum}}
+{{/isContainer}}
+{{^isContainer}}
+{{^isEnum}}
 {{{dataType}}} {{classname}}::{{getter}}() const
 {
     return m_{{name}};
 }
-{{/isEnum}}{{/isContainer}}{{#isEnum}}
+{{/isEnum}}
+{{/isContainer}}
+{{#isEnum}}
 {{^isMap}}{{#isArray}}{{{baseType}}}<{{/isArray}}{{{classname}}}::{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} {{classname}}::{{getter}}() const
 {
     return m_{{name}};

diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/ApiResponse.h
@@ -55,55 +55,33 @@ class  ApiResponse
     /////////////////////////////////////////////
     /// ApiResponse members
 
-
 
-
-    /// <summary>
-    /// 
-    /// </summary>
-
     int32_t getCode() const;
-
-
     bool codeIsSet() const;
     void unsetCode();
     void setCode(int32_t value);
-
-    /// <summary>
-    /// 
-    /// </summary>
-
+
     utility::string_t getType() const;
-
-
     bool typeIsSet() const;
     void unsetType();
-
     void setType(const utility::string_t& value);
-
-    /// <summary>
-    /// 
-    /// </summary>
-
+
     utility::string_t getMessage() const;
-
-
     bool messageIsSet() const;
     void unsetMessage();
-
     void setMessage(const utility::string_t& value);
-    
+
 
 protected:
-
     int32_t m_Code;
     bool m_CodeIsSet;
-    
+
     utility::string_t m_Type;
     bool m_TypeIsSet;
-    
+
     utility::string_t m_Message;
     bool m_MessageIsSet;
+
 };
 
 

diff --git a/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h b/samples/client/petstore/cpp-restsdk/client/include/CppRestPetstoreClient/model/Category.h
@@ -55,40 +55,25 @@ class  Category
     /////////////////////////////////////////////
     /// Category members
 
-
 
-
-    /// <summary>
-    /// 
-    /// </summary>
-
     int64_t getId() const;
-
-
     bool idIsSet() const;
     void unsetId();
     void setId(int64_t value);
-
-    /// <summary>
-    /// 
-    /// </summary>
-
+
     utility::string_t getName() const;
-
-
     bool nameIsSet() const;
     void unsetName();
-
     void setName(const utility::string_t& value);
-    
+
 
 protected:
-
     int64_t m_Id;
     bool m_IdIsSet;
-    
+
     utility::string_t m_Name;
     bool m_NameIsSet;
+
 };