Skip to content

Commit f406f78

Browse files
wing328wing328
authored
[cpprestsdk] Better code format (#20237)
* remove blank lines * fix summary, add line break bwtween vars * update
1 parent 05d4aa9 commit f406f78

File tree

21 files changed

+177
-492
lines changed

21 files changed

+177
-492
lines changed

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

Lines changed: 54 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,11 @@ public:
128128
{{/isEnum}}
129129
{{^isEnum}}
130130

131+
{{#description}}
131132
/// <summary>
132133
/// {{description}}
133134
/// </summary>
135+
{{/description}}
134136
class {{declspec}} {{classname}}
135137
: public {{{parent}}}{{^parent}}ModelBase{{/parent}}
136138
{
@@ -154,16 +156,26 @@ public:
154156
/// {{classname}} members
155157

156158
{{! ENUM DEFINITIONS }}
157-
{{#vars}}{{^isInherited}}{{#isEnum}}
159+
{{#vars}}
160+
{{^isInherited}}
161+
{{#isEnum}}
158162
enum class {{#isContainer}}{{{enumName}}}{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}
159163
{
160164
{{#allowableValues}}{{#enumVars}}{{value}},
161165
{{/enumVars}}{{/allowableValues}}
162166
};
167+
{{#description}}
163168
/// <summary>
164169
/// {{description}}
165170
/// </summary>
166-
{{/isEnum}}{{/isInherited}}{{/vars}}{{#vars}}{{^isInherited}}{{#isEnum}}{{#isContainer}}
171+
{{/description}}
172+
{{/isEnum}}
173+
{{/isInherited}}
174+
{{/vars}}
175+
{{#vars}}
176+
{{^isInherited}}
177+
{{#isEnum}}
178+
{{#isContainer}}
167179
{{! ENUM CONVERSIONS }}
168180
{{{enumName}}} to{{{enumName}}}(const utility::string_t& value) const;
169181
const utility::string_t from{{{enumName}}}(const {{{enumName}}} value) const;
@@ -173,41 +185,67 @@ public:
173185
{{/isArray}}{{/isContainer}}{{^isContainer}}
174186
{{{datatypeWithEnum}}} to{{{datatypeWithEnum}}}(const utility::string_t& value) const;
175187
const utility::string_t from{{{datatypeWithEnum}}}(const {{{datatypeWithEnum}}} value) const;
176-
{{/isContainer}}{{/isEnum}}{{/isInherited}}{{/vars}}
188+
{{/isContainer}}
189+
190+
{{/isEnum}}
191+
{{/isInherited}}
192+
{{/vars}}
177193

178194
{{! SETTER AND GETTERS }}
179-
{{#vars}}{{^isInherited}}
195+
{{#vars}}
196+
{{^isInherited}}
197+
{{#description}}
180198
/// <summary>
181199
/// {{description}}
182200
/// </summary>
183-
{{#isContainer}}{{^isEnum}}
201+
{{/description}}
202+
{{#isContainer}}
203+
{{^isEnum}}
184204
{{{dataType}}} {{getter}}() const;
185-
{{/isEnum}}{{/isContainer}}{{^isContainer}}{{^isEnum}}
205+
{{/isEnum}}
206+
{{/isContainer}}
207+
{{^isContainer}}
208+
{{^isEnum}}
186209
{{{dataType}}} {{getter}}() const;
187-
{{/isEnum}}{{/isContainer}}
188-
{{#isEnum}}{{^isMap}}
210+
{{/isEnum}}
211+
{{/isContainer}}
212+
{{#isEnum}}
213+
{{^isMap}}
189214
{{{datatypeWithEnum}}} {{getter}}() const;
190-
{{/isMap}}{{#isMap}}
215+
{{/isMap}}
216+
{{#isMap}}
191217
{{{dataType}}} {{getter}}() const;
192-
{{/isMap}}{{/isEnum}}
218+
{{/isMap}}
219+
{{/isEnum}}
193220
bool {{nameInCamelCase}}IsSet() const;
194221
void unset{{name}}();
195222
{{#isPrimitiveType}}
196223
void {{setter}}({{{dataType}}} value);
197-
{{/isPrimitiveType}}{{^isPrimitiveType}}{{^isEnum}}
224+
{{/isPrimitiveType}}
225+
{{^isPrimitiveType}}
226+
{{^isEnum}}
198227
void {{setter}}(const {{{dataType}}}& value);
199-
{{/isEnum}}{{/isPrimitiveType}}{{#isEnum}}
228+
{{/isEnum}}
229+
{{/isPrimitiveType}}
230+
{{#isEnum}}
200231
void {{setter}}(const {{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} value);
201-
{{/isEnum}}{{/isInherited}}{{/vars}}
232+
{{/isEnum}}
233+
{{/isInherited}}
234+
235+
{{/vars}}
202236

203237
protected:
204238
{{#vars}}
205-
{{^isInherited}}{{^isEnum}}
239+
{{^isInherited}}
240+
{{^isEnum}}
206241
{{{dataType}}} m_{{name}};
207-
{{/isEnum}}{{#isEnum}}
242+
{{/isEnum}}
243+
{{#isEnum}}
208244
{{^isMap}}{{{datatypeWithEnum}}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} m_{{name}};
209-
{{/isEnum}}bool m_{{name}}IsSet;
245+
{{/isEnum}}
246+
bool m_{{name}}IsSet;
210247
{{/isInherited}}
248+
211249
{{/vars}}
212250
};
213251

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

Lines changed: 55 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
{{#modelNamespaceDeclarations}}
77
namespace {{this}} {
88
{{/modelNamespaceDeclarations}}
9-
{{#oneOf}}{{#-first}}
9+
{{#oneOf}}
10+
{{#-first}}
1011

1112
void {{classname}}::validate()
1213
{
@@ -54,7 +55,8 @@ template bool {{classname}}::fromJson<{{.}}>(const web::json::value& json);
5455
template bool {{classname}}::fromMultiPart<{{.}}>(std::shared_ptr<MultipartFormData> multipart, const utility::string_t& namePrefix);
5556
{{/oneOf}}
5657

57-
{{/-first}}{{/oneOf}}
58+
{{/-first}}
59+
{{/oneOf}}
5860
{{^oneOf}}
5961
{{#isEnum}}
6062

@@ -218,7 +220,8 @@ web::json::value {{classname}}::toJson() const
218220
{{^parent}}
219221
web::json::value val = web::json::value::object();
220222
{{/parent}}
221-
{{#vars}}{{^isInherited}}
223+
{{#vars}}
224+
{{^isInherited}}
222225
if(m_{{name}}IsSet)
223226
{
224227
{{#isEnum}}{{#isContainer}}{{#isArray}}
@@ -233,7 +236,8 @@ web::json::value {{classname}}::toJson() const
233236
val[utility::conversions::to_string_t(U("{{baseName}}"))] = ModelBase::toJson(m_{{name}});
234237
{{/isEnum}}
235238
}
236-
{{/isInherited}}{{/vars}}
239+
{{/isInherited}}
240+
{{/vars}}
237241

238242
return val;
239243
}
@@ -244,7 +248,8 @@ bool {{classname}}::fromJson(const web::json::value& val)
244248
{{#parent}}
245249
ok &= this->{{{.}}}::fromJson(val);
246250
{{/parent}}
247-
{{#vars}}{{^isInherited}}
251+
{{#vars}}
252+
{{^isInherited}}
248253
if(val.has_field(utility::conversions::to_string_t(U("{{baseName}}"))))
249254
{
250255
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)
263268
{{setter}}(to{{{datatypeWithEnum}}}(refVal_{{setter}}));
264269
{{/isContainer}}{{/isEnum}}
265270
}
266-
}{{/isInherited}}{{/vars}}
271+
}
272+
{{/isInherited}}
273+
{{/vars}}
267274
return ok;
268275
}
269276

@@ -280,13 +287,18 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
280287
{{^isEnum}}
281288
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), m_{{name}}));
282289
{{/isEnum}}
283-
{{#isEnum}}{{#isContainer}}{{#isArray}}
290+
{{#isEnum}}
291+
{{#isContainer}}
292+
{{#isArray}}
284293
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), from{{{enumName}}}(m_{{name}})));
285294
{{/isArray}}{{#isMap}}
286295
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), m_{{name}}));
287-
{{/isMap}}{{/isContainer}}{{^isContainer}}
296+
{{/isMap}}
297+
{{/isContainer}}
298+
{{^isContainer}}
288299
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t(U("{{baseName}}")), from{{{datatypeWithEnum}}}(m_{{name}})));
289-
{{/isContainer}}{{/isEnum}}
300+
{{/isContainer}}
301+
{{/isEnum}}
290302
}
291303
{{/vars}}
292304
}
@@ -308,21 +320,31 @@ bool {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
308320
{{^isEnum}}
309321
{{setter}}(refVal_{{setter}});
310322
{{/isEnum}}
311-
{{#isEnum}}{{#isContainer}}{{#isArray}}
323+
{{#isEnum}}
324+
{{#isContainer}}
325+
{{#isArray}}
312326
{{setter}}(to{{{enumName}}}(refVal_{{setter}}));
313-
{{/isArray}}{{#isMap}}
327+
{{/isArray}}
328+
{{#isMap}}
314329
{{setter}}(refVal_{{setter}});
315-
{{/isMap}}{{/isContainer}}{{^isContainer}}
330+
{{/isMap}}
331+
{{/isContainer}}
332+
{{^isContainer}}
316333
{{setter}}(to{{{datatypeWithEnum}}}(refVal_{{setter}}));
317-
{{/isContainer}}{{/isEnum}}
334+
{{/isContainer}}
335+
{{/isEnum}}
318336
}
319337
{{/vars}}
320338
return ok;
321339
}
322340

323-
{{#vars}}{{^isInherited}}{{#isEnum}}{{#isContainer}}
341+
{{#vars}}
342+
{{^isInherited}}
343+
{{#isEnum}}
344+
{{#isContainer}}
324345
{{classname}}::{{{enumName}}} {{classname}}::to{{{enumName}}}(const utility::string_t& value) const
325-
{{/isContainer}}{{^isContainer}}
346+
{{/isContainer}}
347+
{{^isContainer}}
326348
{{classname}}::{{{datatypeWithEnum}}} {{classname}}::to{{{datatypeWithEnum}}}(const {{dataType}}& value) const
327349
{{/isContainer}}
328350
{
@@ -348,7 +370,8 @@ const {{dataType}} {{classname}}::from{{{datatypeWithEnum}}}(const {{{datatypeWi
348370
}
349371
}
350372

351-
{{#isContainer}}{{#isArray}}
373+
{{#isContainer}}
374+
{{#isArray}}
352375
{{{dataType}}} {{{classname}}}::from{{{enumName}}}(const {{{datatypeWithEnum}}}& value) const
353376
{
354377
{{{dataType}}} ret;
@@ -366,19 +389,31 @@ const {{dataType}} {{classname}}::from{{{datatypeWithEnum}}}(const {{{datatypeWi
366389
}
367390
return ret;
368391
}
369-
{{/isArray}}{{/isContainer}}{{/isEnum}}{{/isInherited}}{{/vars}}
392+
{{/isArray}}
393+
{{/isContainer}}
394+
{{/isEnum}}
395+
{{/isInherited}}
396+
{{/vars}}
370397

371-
{{#vars}}{{^isInherited}}{{#isContainer}}{{^isEnum}}
398+
{{#vars}}
399+
{{^isInherited}}
400+
{{#isContainer}}
401+
{{^isEnum}}
372402
{{{dataType}}} {{classname}}::{{getter}}() const
373403
{
374404
return m_{{name}};
375405
}
376-
{{/isEnum}}{{/isContainer}}{{^isContainer}}{{^isEnum}}
406+
{{/isEnum}}
407+
{{/isContainer}}
408+
{{^isContainer}}
409+
{{^isEnum}}
377410
{{{dataType}}} {{classname}}::{{getter}}() const
378411
{
379412
return m_{{name}};
380413
}
381-
{{/isEnum}}{{/isContainer}}{{#isEnum}}
414+
{{/isEnum}}
415+
{{/isContainer}}
416+
{{#isEnum}}
382417
{{^isMap}}{{#isArray}}{{{baseType}}}<{{/isArray}}{{{classname}}}::{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isMap}}{{#isMap}}{{{dataType}}}{{/isMap}} {{classname}}::{{getter}}() const
383418
{
384419
return m_{{name}};

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

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -55,55 +55,33 @@ class ApiResponse
5555
/////////////////////////////////////////////
5656
/// ApiResponse members
5757

58-
5958

60-
61-
/// <summary>
62-
///
63-
/// </summary>
64-
6559
int32_t getCode() const;
66-
67-
6860
bool codeIsSet() const;
6961
void unsetCode();
7062
void setCode(int32_t value);
71-
72-
/// <summary>
73-
///
74-
/// </summary>
75-
63+
7664
utility::string_t getType() const;
77-
78-
7965
bool typeIsSet() const;
8066
void unsetType();
81-
8267
void setType(const utility::string_t& value);
83-
84-
/// <summary>
85-
///
86-
/// </summary>
87-
68+
8869
utility::string_t getMessage() const;
89-
90-
9170
bool messageIsSet() const;
9271
void unsetMessage();
93-
9472
void setMessage(const utility::string_t& value);
95-
73+
9674

9775
protected:
98-
9976
int32_t m_Code;
10077
bool m_CodeIsSet;
101-
78+
10279
utility::string_t m_Type;
10380
bool m_TypeIsSet;
104-
81+
10582
utility::string_t m_Message;
10683
bool m_MessageIsSet;
84+
10785
};
10886

10987

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

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -55,40 +55,25 @@ class Category
5555
/////////////////////////////////////////////
5656
/// Category members
5757

58-
5958

60-
61-
/// <summary>
62-
///
63-
/// </summary>
64-
6559
int64_t getId() const;
66-
67-
6860
bool idIsSet() const;
6961
void unsetId();
7062
void setId(int64_t value);
71-
72-
/// <summary>
73-
///
74-
/// </summary>
75-
63+
7664
utility::string_t getName() const;
77-
78-
7965
bool nameIsSet() const;
8066
void unsetName();
81-
8267
void setName(const utility::string_t& value);
83-
68+
8469

8570
protected:
86-
8771
int64_t m_Id;
8872
bool m_IdIsSet;
89-
73+
9074
utility::string_t m_Name;
9175
bool m_NameIsSet;
76+
9277
};
9378

9479

0 commit comments

Comments
 (0)