From f2dc8d1a564bd175e4b49158c87200fcccb61c8e Mon Sep 17 00:00:00 2001
From: etherealjoy <sunn.ssb@live.com>
Date: Fri, 26 Apr 2019 01:38:47 +0200
Subject: [PATCH] Fix filename generation due to camelize rework

---
 .../languages/CppRestSdkClientCodegen.java    |  4 +-
 .../client/petstore/cpp-restsdk/ApiClient.cpp |  2 +-
 .../client/petstore/cpp-restsdk/ApiClient.h   |  2 +-
 .../petstore/cpp-restsdk/ApiConfiguration.cpp |  2 +-
 .../petstore/cpp-restsdk/ApiConfiguration.h   |  2 +-
 .../petstore/cpp-restsdk/ApiException.cpp     |  2 +-
 .../petstore/cpp-restsdk/ApiException.h       |  2 +-
 .../petstore/cpp-restsdk/HttpContent.cpp      |  2 +-
 .../client/petstore/cpp-restsdk/HttpContent.h |  2 +-
 .../client/petstore/cpp-restsdk/IHttpBody.h   |  2 +-
 .../client/petstore/cpp-restsdk/JsonBody.cpp  |  2 +-
 .../client/petstore/cpp-restsdk/JsonBody.h    |  2 +-
 .../client/petstore/cpp-restsdk/ModelBase.cpp |  2 +-
 .../client/petstore/cpp-restsdk/ModelBase.h   |  2 +-
 .../cpp-restsdk/MultipartFormData.cpp         |  2 +-
 .../petstore/cpp-restsdk/MultipartFormData.h  |  2 +-
 .../client/petstore/cpp-restsdk/Object.cpp    |  2 +-
 samples/client/petstore/cpp-restsdk/Object.h  |  2 +-
 .../petstore/cpp-restsdk/api/PetApi.cpp       | 30 ++++++------
 .../client/petstore/cpp-restsdk/api/PetApi.h  | 10 ++--
 .../petstore/cpp-restsdk/api/StoreApi.cpp     | 16 +++----
 .../petstore/cpp-restsdk/api/StoreApi.h       |  6 +--
 .../petstore/cpp-restsdk/api/UserApi.cpp      | 46 +++++++++----------
 .../client/petstore/cpp-restsdk/api/UserApi.h | 18 ++++----
 .../cpp-restsdk/model/ApiResponse.cpp         |  2 +-
 .../petstore/cpp-restsdk/model/ApiResponse.h  |  2 +-
 .../petstore/cpp-restsdk/model/Category.cpp   |  2 +-
 .../petstore/cpp-restsdk/model/Category.h     |  2 +-
 .../petstore/cpp-restsdk/model/Order.cpp      |  2 +-
 .../client/petstore/cpp-restsdk/model/Order.h |  2 +-
 .../client/petstore/cpp-restsdk/model/Pet.cpp |  2 +-
 .../client/petstore/cpp-restsdk/model/Pet.h   |  2 +-
 .../client/petstore/cpp-restsdk/model/Tag.cpp |  2 +-
 .../client/petstore/cpp-restsdk/model/Tag.h   |  2 +-
 .../petstore/cpp-restsdk/model/User.cpp       |  2 +-
 .../client/petstore/cpp-restsdk/model/User.h  |  2 +-
 36 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
index 87ff50b0305..5470af626d0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java
@@ -289,12 +289,12 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen {
 
     @Override
     public String toModelFilename(String name) {
-        return sanitizeName(camelize(name));
+        return sanitizeName(toModelName(name));
     }
 
     @Override
     public String toApiFilename(String name) {
-        return sanitizeName(camelize(name) + "Api");
+        return sanitizeName(toModelName(name) + "Api");
     }
 
     /**
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.cpp b/samples/client/petstore/cpp-restsdk/ApiClient.cpp
index 116daba81b1..f9445bd20c6 100644
--- a/samples/client/petstore/cpp-restsdk/ApiClient.cpp
+++ b/samples/client/petstore/cpp-restsdk/ApiClient.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/samples/client/petstore/cpp-restsdk/ApiClient.h
index efbb2c62cb6..a636b1d3cb3 100644
--- a/samples/client/petstore/cpp-restsdk/ApiClient.h
+++ b/samples/client/petstore/cpp-restsdk/ApiClient.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
index 6f5f140a410..531320239fb 100644
--- a/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
+++ b/samples/client/petstore/cpp-restsdk/ApiConfiguration.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
index 6b2dcfc4bcd..d89fea879e4 100644
--- a/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
+++ b/samples/client/petstore/cpp-restsdk/ApiConfiguration.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiException.cpp b/samples/client/petstore/cpp-restsdk/ApiException.cpp
index 2c47ab45d1b..124bf391142 100644
--- a/samples/client/petstore/cpp-restsdk/ApiException.cpp
+++ b/samples/client/petstore/cpp-restsdk/ApiException.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ApiException.h b/samples/client/petstore/cpp-restsdk/ApiException.h
index 22489f8e0bb..d419f13f3dd 100644
--- a/samples/client/petstore/cpp-restsdk/ApiException.h
+++ b/samples/client/petstore/cpp-restsdk/ApiException.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.cpp b/samples/client/petstore/cpp-restsdk/HttpContent.cpp
index a732ac5415a..0c0cce5fcdd 100644
--- a/samples/client/petstore/cpp-restsdk/HttpContent.cpp
+++ b/samples/client/petstore/cpp-restsdk/HttpContent.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/HttpContent.h b/samples/client/petstore/cpp-restsdk/HttpContent.h
index eb9cce62fcb..25dd1d5c6e0 100644
--- a/samples/client/petstore/cpp-restsdk/HttpContent.h
+++ b/samples/client/petstore/cpp-restsdk/HttpContent.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/IHttpBody.h b/samples/client/petstore/cpp-restsdk/IHttpBody.h
index 34dcfef4240..07d0e5c84ce 100644
--- a/samples/client/petstore/cpp-restsdk/IHttpBody.h
+++ b/samples/client/petstore/cpp-restsdk/IHttpBody.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.cpp b/samples/client/petstore/cpp-restsdk/JsonBody.cpp
index 5d6d3675a08..b523ba6f67c 100644
--- a/samples/client/petstore/cpp-restsdk/JsonBody.cpp
+++ b/samples/client/petstore/cpp-restsdk/JsonBody.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/JsonBody.h b/samples/client/petstore/cpp-restsdk/JsonBody.h
index be54577d003..dacf42985c9 100644
--- a/samples/client/petstore/cpp-restsdk/JsonBody.h
+++ b/samples/client/petstore/cpp-restsdk/JsonBody.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.cpp b/samples/client/petstore/cpp-restsdk/ModelBase.cpp
index 0e6bea7b80f..ec9192c14e2 100644
--- a/samples/client/petstore/cpp-restsdk/ModelBase.cpp
+++ b/samples/client/petstore/cpp-restsdk/ModelBase.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/ModelBase.h b/samples/client/petstore/cpp-restsdk/ModelBase.h
index a4b7b9d6fa1..80e8a76edbf 100644
--- a/samples/client/petstore/cpp-restsdk/ModelBase.h
+++ b/samples/client/petstore/cpp-restsdk/ModelBase.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
index 7441862c19f..fda5c805bdd 100644
--- a/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
+++ b/samples/client/petstore/cpp-restsdk/MultipartFormData.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/MultipartFormData.h b/samples/client/petstore/cpp-restsdk/MultipartFormData.h
index 40adaa88ecc..cff61c6cb5c 100644
--- a/samples/client/petstore/cpp-restsdk/MultipartFormData.h
+++ b/samples/client/petstore/cpp-restsdk/MultipartFormData.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/Object.cpp b/samples/client/petstore/cpp-restsdk/Object.cpp
index 106bcd946f6..a63e69cea48 100644
--- a/samples/client/petstore/cpp-restsdk/Object.cpp
+++ b/samples/client/petstore/cpp-restsdk/Object.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/Object.h b/samples/client/petstore/cpp-restsdk/Object.h
index a57a86ef013..99179be55bd 100644
--- a/samples/client/petstore/cpp-restsdk/Object.h
+++ b/samples/client/petstore/cpp-restsdk/Object.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
index 692e502cc2f..d8530e324c0 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -35,13 +35,13 @@ PetApi::~PetApi()
 {
 }
 
-pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> pet)
+pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> body)
 {
 
-    // verify the required parameter 'pet' is set
-    if (pet == nullptr)
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
     {
-        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'pet' when calling PetApi->addPet"));
+        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'body' when calling PetApi->addPet"));
     }
 
 
@@ -93,7 +93,7 @@ pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> pet)
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        localVarJson = ModelBase::toJson(pet);
+        localVarJson = ModelBase::toJson(body);
         
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
@@ -104,9 +104,9 @@ pplx::task<void> PetApi::addPet(std::shared_ptr<Pet> pet)
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(pet.get())
+        if(body.get())
         {
-            pet->toMultipart(localVarMultipart, utility::conversions::to_string_t("pet"));
+            body->toMultipart(localVarMultipart, utility::conversions::to_string_t("body"));
         }
 
         localVarHttpBody = localVarMultipart;
@@ -655,13 +655,13 @@ pplx::task<std::shared_ptr<Pet>> PetApi::getPetById(int64_t petId)
         return localVarResult;
     });
 }
-pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> pet)
+pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> body)
 {
 
-    // verify the required parameter 'pet' is set
-    if (pet == nullptr)
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
     {
-        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'pet' when calling PetApi->updatePet"));
+        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'body' when calling PetApi->updatePet"));
     }
 
 
@@ -713,7 +713,7 @@ pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> pet)
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        localVarJson = ModelBase::toJson(pet);
+        localVarJson = ModelBase::toJson(body);
         
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
@@ -724,9 +724,9 @@ pplx::task<void> PetApi::updatePet(std::shared_ptr<Pet> pet)
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(pet.get())
+        if(body.get())
         {
-            pet->toMultipart(localVarMultipart, utility::conversions::to_string_t("pet"));
+            body->toMultipart(localVarMultipart, utility::conversions::to_string_t("body"));
         }
 
         localVarHttpBody = localVarMultipart;
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/samples/client/petstore/cpp-restsdk/api/PetApi.h
index 8dbcce2922c..bb7b6f7b199 100644
--- a/samples/client/petstore/cpp-restsdk/api/PetApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/PetApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -52,9 +52,9 @@ public:
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="pet">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     pplx::task<void> addPet(
-        std::shared_ptr<Pet> pet
+        std::shared_ptr<Pet> body
     );
     /// <summary>
     /// Deletes a pet
@@ -104,9 +104,9 @@ public:
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="pet">Pet object that needs to be added to the store</param>
+    /// <param name="body">Pet object that needs to be added to the store</param>
     pplx::task<void> updatePet(
-        std::shared_ptr<Pet> pet
+        std::shared_ptr<Pet> body
     );
     /// <summary>
     /// Updates a pet in the store with form data
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
index 92fef465129..0ec396c54e4 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -386,13 +386,13 @@ pplx::task<std::shared_ptr<Order>> StoreApi::getOrderById(int64_t orderId)
         return localVarResult;
     });
 }
-pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> order)
+pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> body)
 {
 
-    // verify the required parameter 'order' is set
-    if (order == nullptr)
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
     {
-        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'order' when calling StoreApi->placeOrder"));
+        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'body' when calling StoreApi->placeOrder"));
     }
 
 
@@ -444,7 +444,7 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> o
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        localVarJson = ModelBase::toJson(order);
+        localVarJson = ModelBase::toJson(body);
         
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
@@ -455,9 +455,9 @@ pplx::task<std::shared_ptr<Order>> StoreApi::placeOrder(std::shared_ptr<Order> o
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(order.get())
+        if(body.get())
         {
-            order->toMultipart(localVarMultipart, utility::conversions::to_string_t("order"));
+            body->toMultipart(localVarMultipart, utility::conversions::to_string_t("body"));
         }
 
         localVarHttpBody = localVarMultipart;
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
index 2e4ffb799ea..700f788df27 100644
--- a/samples/client/petstore/cpp-restsdk/api/StoreApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/StoreApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -79,9 +79,9 @@ public:
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="order">order placed for purchasing the pet</param>
+    /// <param name="body">order placed for purchasing the pet</param>
     pplx::task<std::shared_ptr<Order>> placeOrder(
-        std::shared_ptr<Order> order
+        std::shared_ptr<Order> body
     );
 
 protected:
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
index 1b2d1994631..ba8769d344a 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -35,13 +35,13 @@ UserApi::~UserApi()
 {
 }
 
-pplx::task<void> UserApi::createUser(std::shared_ptr<User> user)
+pplx::task<void> UserApi::createUser(std::shared_ptr<User> body)
 {
 
-    // verify the required parameter 'user' is set
-    if (user == nullptr)
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
     {
-        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'user' when calling UserApi->createUser"));
+        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'body' when calling UserApi->createUser"));
     }
 
 
@@ -91,7 +91,7 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> user)
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        localVarJson = ModelBase::toJson(user);
+        localVarJson = ModelBase::toJson(body);
         
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
@@ -102,9 +102,9 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> user)
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(user.get())
+        if(body.get())
         {
-            user->toMultipart(localVarMultipart, utility::conversions::to_string_t("user"));
+            body->toMultipart(localVarMultipart, utility::conversions::to_string_t("body"));
         }
 
         localVarHttpBody = localVarMultipart;
@@ -155,7 +155,7 @@ pplx::task<void> UserApi::createUser(std::shared_ptr<User> user)
         return void();
     });
 }
-pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<User>> user)
+pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<User>> body)
 {
 
 
@@ -207,7 +207,7 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
 
         {
             std::vector<web::json::value> localVarJsonArray;
-            for( auto& localVarItem : user )
+            for( auto& localVarItem : body )
             {
                 localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
@@ -224,12 +224,12 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
         {
             std::vector<web::json::value> localVarJsonArray;
-            for( auto& localVarItem : user )
+            for( auto& localVarItem : body )
             {
                 localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
             }
-            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("user"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
+            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("body"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
         }
         
         localVarHttpBody = localVarMultipart;
@@ -280,7 +280,7 @@ pplx::task<void> UserApi::createUsersWithArrayInput(std::vector<std::shared_ptr<
         return void();
     });
 }
-pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<User>> user)
+pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<User>> body)
 {
 
 
@@ -332,7 +332,7 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
 
         {
             std::vector<web::json::value> localVarJsonArray;
-            for( auto& localVarItem : user )
+            for( auto& localVarItem : body )
             {
                 localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
@@ -349,12 +349,12 @@ pplx::task<void> UserApi::createUsersWithListInput(std::vector<std::shared_ptr<U
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
         {
             std::vector<web::json::value> localVarJsonArray;
-            for( auto& localVarItem : user )
+            for( auto& localVarItem : body )
             {
                 localVarJsonArray.push_back( localVarItem.get() ? localVarItem->toJson() : web::json::value::null() );
                 
             }
-            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("user"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
+            localVarMultipart->add(ModelBase::toHttpContent(utility::conversions::to_string_t("body"), web::json::value::array(localVarJsonArray), utility::conversions::to_string_t("application/json")));
         }
         
         localVarHttpBody = localVarMultipart;
@@ -859,13 +859,13 @@ pplx::task<void> UserApi::logoutUser()
         return void();
     });
 }
-pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr<User> user)
+pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr<User> body)
 {
 
-    // verify the required parameter 'user' is set
-    if (user == nullptr)
+    // verify the required parameter 'body' is set
+    if (body == nullptr)
     {
-        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'user' when calling UserApi->updateUser"));
+        throw ApiException(400, utility::conversions::to_string_t("Missing required parameter 'body' when calling UserApi->updateUser"));
     }
 
 
@@ -916,7 +916,7 @@ pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr
         localVarRequestHttpContentType = utility::conversions::to_string_t("application/json");
         web::json::value localVarJson;
 
-        localVarJson = ModelBase::toJson(user);
+        localVarJson = ModelBase::toJson(body);
         
 
         localVarHttpBody = std::shared_ptr<IHttpBody>( new JsonBody( localVarJson ) );
@@ -927,9 +927,9 @@ pplx::task<void> UserApi::updateUser(utility::string_t username, std::shared_ptr
         localVarRequestHttpContentType = utility::conversions::to_string_t("multipart/form-data");
         std::shared_ptr<MultipartFormData> localVarMultipart(new MultipartFormData);
 
-        if(user.get())
+        if(body.get())
         {
-            user->toMultipart(localVarMultipart, utility::conversions::to_string_t("user"));
+            body->toMultipart(localVarMultipart, utility::conversions::to_string_t("body"));
         }
 
         localVarHttpBody = localVarMultipart;
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.h b/samples/client/petstore/cpp-restsdk/api/UserApi.h
index 854c7a27df9..fc76cfc9177 100644
--- a/samples/client/petstore/cpp-restsdk/api/UserApi.h
+++ b/samples/client/petstore/cpp-restsdk/api/UserApi.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
@@ -51,9 +51,9 @@ public:
     /// <remarks>
     /// This can only be done by the logged in user.
     /// </remarks>
-    /// <param name="user">Created user object</param>
+    /// <param name="body">Created user object</param>
     pplx::task<void> createUser(
-        std::shared_ptr<User> user
+        std::shared_ptr<User> body
     );
     /// <summary>
     /// Creates list of users with given input array
@@ -61,9 +61,9 @@ public:
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="user">List of user object</param>
+    /// <param name="body">List of user object</param>
     pplx::task<void> createUsersWithArrayInput(
-        std::vector<std::shared_ptr<User>> user
+        std::vector<std::shared_ptr<User>> body
     );
     /// <summary>
     /// Creates list of users with given input array
@@ -71,9 +71,9 @@ public:
     /// <remarks>
     /// 
     /// </remarks>
-    /// <param name="user">List of user object</param>
+    /// <param name="body">List of user object</param>
     pplx::task<void> createUsersWithListInput(
-        std::vector<std::shared_ptr<User>> user
+        std::vector<std::shared_ptr<User>> body
     );
     /// <summary>
     /// Delete user
@@ -122,10 +122,10 @@ public:
     /// This can only be done by the logged in user.
     /// </remarks>
     /// <param name="username">name that need to be deleted</param>
-    /// <param name="user">Updated user object</param>
+    /// <param name="body">Updated user object</param>
     pplx::task<void> updateUser(
         utility::string_t username,
-        std::shared_ptr<User> user
+        std::shared_ptr<User> body
     );
 
 protected:
diff --git a/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
index 87593dea7fc..501d81308b3 100644
--- a/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/ApiResponse.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/ApiResponse.h b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
index 9910ee43c85..ae6800aee9d 100644
--- a/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
+++ b/samples/client/petstore/cpp-restsdk/model/ApiResponse.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Category.cpp b/samples/client/petstore/cpp-restsdk/model/Category.cpp
index a124c426dcd..f332d75fc29 100644
--- a/samples/client/petstore/cpp-restsdk/model/Category.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Category.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Category.h b/samples/client/petstore/cpp-restsdk/model/Category.h
index c2d5e3153eb..281764a6e22 100644
--- a/samples/client/petstore/cpp-restsdk/model/Category.h
+++ b/samples/client/petstore/cpp-restsdk/model/Category.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Order.cpp b/samples/client/petstore/cpp-restsdk/model/Order.cpp
index 1b78741ac6c..328810e0da2 100644
--- a/samples/client/petstore/cpp-restsdk/model/Order.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Order.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Order.h b/samples/client/petstore/cpp-restsdk/model/Order.h
index 80fcff46d68..e0ac20b8543 100644
--- a/samples/client/petstore/cpp-restsdk/model/Order.h
+++ b/samples/client/petstore/cpp-restsdk/model/Order.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Pet.cpp b/samples/client/petstore/cpp-restsdk/model/Pet.cpp
index 6089767838e..29603278d97 100644
--- a/samples/client/petstore/cpp-restsdk/model/Pet.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Pet.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Pet.h b/samples/client/petstore/cpp-restsdk/model/Pet.h
index 948cf34a84e..e151a071c28 100644
--- a/samples/client/petstore/cpp-restsdk/model/Pet.h
+++ b/samples/client/petstore/cpp-restsdk/model/Pet.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Tag.cpp b/samples/client/petstore/cpp-restsdk/model/Tag.cpp
index d1aa9a9234b..e68b2109427 100644
--- a/samples/client/petstore/cpp-restsdk/model/Tag.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/Tag.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/Tag.h b/samples/client/petstore/cpp-restsdk/model/Tag.h
index 763c21cce1d..67556cc2c40 100644
--- a/samples/client/petstore/cpp-restsdk/model/Tag.h
+++ b/samples/client/petstore/cpp-restsdk/model/Tag.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/User.cpp b/samples/client/petstore/cpp-restsdk/model/User.cpp
index 805ebadff32..9f8645431b4 100644
--- a/samples/client/petstore/cpp-restsdk/model/User.cpp
+++ b/samples/client/petstore/cpp-restsdk/model/User.cpp
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
diff --git a/samples/client/petstore/cpp-restsdk/model/User.h b/samples/client/petstore/cpp-restsdk/model/User.h
index 1317714c826..b4a858d837d 100644
--- a/samples/client/petstore/cpp-restsdk/model/User.h
+++ b/samples/client/petstore/cpp-restsdk/model/User.h
@@ -4,7 +4,7 @@
  *
  * OpenAPI spec version: 1.0.0
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.4.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
-- 
GitLab