Use super class methods for Model and Api Filenames (#2787)

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(toModelName(name));
+        return toModelName(name);
     }
 
     @Override
     public String toApiFilename(String name) {
-        return sanitizeName(toModelName(name) + "Api");
+        return toApiName(name);
     }
 
     /**

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java

@@ -193,12 +193,12 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen {
 
     @Override
     public String toModelFilename(String name) {
-        return camelize(name);
+        return toModelName(name);
     }
 
     @Override
     public String toApiFilename(String name) {
-        return camelize(name) + "Api";
+        return toApiName(name);
     }
 
     @SuppressWarnings("unchecked")

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

@@ -28,6 +28,10 @@
 #include <vector>
 #include <functional>
 
+#if  defined (_WIN32) || defined (_WIN64)
+#undef U
+#endif
+
 #include <cpprest/details/basic_types.h>
 #include <cpprest/http_client.h>
 

samples/client/petstore/cpp-restsdk/api/PetApi.h

@@ -27,10 +27,6 @@
 #include <cpprest/details/basic_types.h>
 
 
-#ifdef _WIN32 | _WIN64
-#undef U
-#endif
-
 #include <boost/optional.hpp>
 
 namespace org {

samples/client/petstore/cpp-restsdk/api/StoreApi.h

@@ -26,10 +26,6 @@
 #include <cpprest/details/basic_types.h>
 
 
-#ifdef _WIN32 | _WIN64
-#undef U
-#endif
-
 #include <boost/optional.hpp>
 
 namespace org {

samples/client/petstore/cpp-restsdk/api/UserApi.h

@@ -26,10 +26,6 @@
 #include <cpprest/details/basic_types.h>
 
 
-#ifdef _WIN32 | _WIN64
-#undef U
-#endif
-
 #include <boost/optional.hpp>
 
 namespace org {

samples/server/petstore/cpp-restbed/api/PetApi.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/api/PetApi.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/api/StoreApi.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/api/StoreApi.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/api/UserApi.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/api/UserApi.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/ApiResponse.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/ApiResponse.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Category.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Category.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Order.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Order.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Pet.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Pet.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Tag.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/Tag.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/User.cpp

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */

samples/server/petstore/cpp-restbed/model/User.h

@@ -5,7 +5,7 @@
  * OpenAPI spec version: 1.0.0
  * 
  *
- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.
+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */