Skip to content

Commit 86d7009

Browse files
wing328wing328
authored
replace tab with spaces, fix empty spaces in new lines (#632)
1 parent 5300651 commit 86d7009

38 files changed

Lines changed: 98 additions & 82 deletions

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ utility::string_t ApiClient::parameterToString(utility::string_t value)
3333
}
3434
utility::string_t ApiClient::parameterToString(int64_t value)
3535
{
36-
std::stringstream valueAsStringStream;
37-
valueAsStringStream << value;
36+
std::stringstream valueAsStringStream;
37+
valueAsStringStream << value;
3838
return utility::conversions::to_string_t(valueAsStringStream.str());
3939
}
4040
utility::string_t ApiClient::parameterToString(int32_t value)
4141
{
42-
std::stringstream valueAsStringStream;
43-
valueAsStringStream << value;
42+
std::stringstream valueAsStringStream;
43+
valueAsStringStream << value;
4444
return utility::conversions::to_string_t(valueAsStringStream.str());
4545
}
4646

@@ -132,7 +132,7 @@ pplx::task<web::http::http_response> ApiClient::callApi(
132132
if (!formParams.empty())
133133
{
134134
request.set_body(body_data);
135-
}
135+
}
136136
}
137137
else
138138
{

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

Lines changed: 49 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -245,29 +245,35 @@ void {{classname}}::fromJson(web::json::value& val)
245245
{{#isString}}
246246
{{setter}}(ModelBase::stringFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));
247247
{{/isString}}
248-
{{#isByteArray}}{{setter}}(ModelBase::stringFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));{{/isByteArray}}
248+
{{#isByteArray}}
249+
{{setter}}(ModelBase::stringFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));
250+
{{/isByteArray}}
249251
{{^isString}}
250252
{{#isDateTime}}
251253
{{setter}}(ModelBase::dateFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));
252254
{{/isDateTime}}
253-
{{^isDateTime}}{{^isByteArray}}
255+
{{^isDateTime}}
256+
{{^isByteArray}}
254257
if(!val[utility::conversions::to_string_t("{{baseName}}")].is_null())
255258
{
256259
{{{dataType}}} newItem({{{defaultValue}}});
257260
newItem->fromJson(val[utility::conversions::to_string_t("{{baseName}}")]);
258261
{{setter}}( newItem );
259262
}
260-
{{/isByteArray}}{{/isDateTime}}
263+
{{/isByteArray}}
264+
{{/isDateTime}}
261265
{{/isString}}
262266
}
263267
{{/required}}
264268
{{#required}}
265269
{{#isString}}
266270
{{setter}}(ModelBase::stringFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));
267-
{{/isString}}{{#isByteArray}}
271+
{{/isString}}
272+
{{#isByteArray}}
268273
{{setter}}(ModelBase::stringFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));
269274
{{/isByteArray}}
270-
{{^isString}}{{^isByteArray}}
275+
{{^isString}}
276+
{{^isByteArray}}
271277
{{#isDateTime}}
272278
{{setter}}
273279
(ModelBase::dateFromJson(val[utility::conversions::to_string_t("{{baseName}}")]));
@@ -282,7 +288,8 @@ void {{classname}}::fromJson(web::json::value& val)
282288
{{setter}}( new{{name}} );
283289
{{/vendorExtensions.x-codegen-file}}
284290
{{/isDateTime}}
285-
{{/isByteArray}}{{/isString}}
291+
{{/isByteArray}}
292+
{{/isString}}
286293
{{/required}}
287294
{{/isPrimitiveType}}
288295
{{/isMapContainer}}
@@ -356,33 +363,47 @@ void {{classname}}::toMultipart(std::shared_ptr<MultipartFormData> multipart, co
356363
{{^required}}
357364
if(m_{{name}}IsSet)
358365
{
359-
{{#isString}}multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));{{/isString}}{{#isByteArray}}multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
360-
{{/isByteArray}}{{^isString}}{{#isDateTime}}multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
361-
{{/isDateTime}}{{^isDateTime}}{{^isByteArray}}if (m_{{name}}.get())
366+
{{#isString}}
367+
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
368+
{{/isString}}
369+
{{#isByteArray}}
370+
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
371+
{{/isByteArray}}
372+
{{^isString}}
373+
{{#isDateTime}}
374+
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
375+
{{/isDateTime}}
376+
{{^isDateTime}}
377+
{{^isByteArray}}if (m_{{name}}.get())
362378
{
363379
m_{{name}}->toMultipart(multipart, utility::conversions::to_string_t("{{baseName}}."));
364380
}
365-
{{/isByteArray}}{{/isDateTime}}{{/isString}}
381+
{{/isByteArray}}
382+
{{/isDateTime}}
383+
{{/isString}}
366384
}
367385
{{/required}}
368386
{{#required}}
369387
{{#isString}}
370388
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
371-
{{/isString}}{{#isByteArray}}
389+
{{/isString}}
390+
{{#isByteArray}}
372391
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
373392
{{/isByteArray}}
374393
{{^isString}}
375394
{{#isDateTime}}
376395
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
377396
{{/isDateTime}}
378-
{{^isDateTime}}{{^isByteArray}}
397+
{{^isDateTime}}
398+
{{^isByteArray}}
379399
{{#vendorExtensions.x-codegen-file}}
380400
multipart->add(ModelBase::toHttpContent(namePrefix + utility::conversions::to_string_t("{{baseName}}"), m_{{name}}));
381401
{{/vendorExtensions.x-codegen-file}}
382402
{{^vendorExtensions.x-codegen-file}}
383403
m_{{name}}->toMultipart(multipart, utility::conversions::to_string_t("{{baseName}}."));
384404
{{/vendorExtensions.x-codegen-file}}
385-
{{/isByteArray}}{{/isDateTime}}
405+
{{/isByteArray}}
406+
{{/isDateTime}}
386407
{{/isString}}
387408
{{/required}}
388409
{{/isPrimitiveType}}
@@ -513,8 +534,11 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
513534
{{#isString}}
514535
{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));
515536
{{/isString}}
516-
{{#isByteArray}}{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));{{/isByteArray}}
517-
{{^isString}}{{^isByteArray}}
537+
{{#isByteArray}}
538+
{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));
539+
{{/isByteArray}}
540+
{{^isString}}
541+
{{^isByteArray}}
518542
{{#isDateTime}}
519543
{{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));
520544
{{/isDateTime}}
@@ -526,14 +550,19 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
526550
{{setter}}( newItem );
527551
}
528552
{{/isDateTime}}
529-
{{/isByteArray}}{{/isString}}
553+
{{/isByteArray}}
554+
{{/isString}}
530555
}
531556
{{/required}}
532557
{{#required}}
533558
{{#isString}}
534559
{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));
535-
{{/isString}}{{#isByteArray}}{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));{{/isByteArray}}
536-
{{^isString}}{{^isByteArray}}
560+
{{/isString}}
561+
{{#isByteArray}}
562+
{{setter}}(ModelBase::stringFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));
563+
{{/isByteArray}}
564+
{{^isString}}
565+
{{^isByteArray}}
537566
{{#isDateTime}}
538567
{{setter}}(ModelBase::dateFromHttpContent(multipart->getContent(utility::conversions::to_string_t("{{baseName}}"))));
539568
{{/isDateTime}}
@@ -547,7 +576,8 @@ void {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
547576
{{setter}}( new{{name}} );
548577
{{/vendorExtensions.x-codegen-file}}
549578
{{/isDateTime}}
550-
{{/isByteArray}}{{/isString}}
579+
{{/isByteArray}}
580+
{{/isString}}
551581
{{/required}}
552582
{{/isPrimitiveType}}
553583
{{/isMapContainer}}

‎samples/client/petstore/cpp-restsdk/.openapi-generator/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1.1-SNAPSHOT
1+
3.1.2-SNAPSHOT

‎samples/client/petstore/cpp-restsdk/ApiClient.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/
@@ -44,14 +44,14 @@ utility::string_t ApiClient::parameterToString(utility::string_t value)
4444
}
4545
utility::string_t ApiClient::parameterToString(int64_t value)
4646
{
47-
std::stringstream valueAsStringStream;
48-
valueAsStringStream << value;
47+
std::stringstream valueAsStringStream;
48+
valueAsStringStream << value;
4949
return utility::conversions::to_string_t(valueAsStringStream.str());
5050
}
5151
utility::string_t ApiClient::parameterToString(int32_t value)
5252
{
53-
std::stringstream valueAsStringStream;
54-
valueAsStringStream << value;
53+
std::stringstream valueAsStringStream;
54+
valueAsStringStream << value;
5555
return utility::conversions::to_string_t(valueAsStringStream.str());
5656
}
5757

@@ -143,7 +143,7 @@ pplx::task<web::http::http_response> ApiClient::callApi(
143143
if (!formParams.empty())
144144
{
145145
request.set_body(body_data);
146-
}
146+
}
147147
}
148148
else
149149
{

‎samples/client/petstore/cpp-restsdk/ApiClient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/

‎samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/

‎samples/client/petstore/cpp-restsdk/ApiConfiguration.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/

‎samples/client/petstore/cpp-restsdk/ApiException.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/

‎samples/client/petstore/cpp-restsdk/ApiException.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/

‎samples/client/petstore/cpp-restsdk/HttpContent.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* OpenAPI spec version: 1.0.0
66
*
7-
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.1-SNAPSHOT.
7+
* NOTE: This class is auto generated by OpenAPI-Generator 3.1.2-SNAPSHOT.
88
* https://openapi-generator.tech
99
* Do not edit the class manually.
1010
*/

0 commit comments

Comments
 (0)