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

etherealjoy · web-flow · commit 561c1e064641 · 2019-05-03T19:14:12.000+02:00
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
@@ -289,12 +289,12 @@ protected boolean isFileSchema(CodegenProperty property) {
 
     @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);
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java
@@ -193,12 +193,12 @@ public CodegenModel fromModel(String name, Schema model) {
 
     @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")
diff --git a/samples/client/petstore/cpp-restsdk/ApiClient.h b/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>
 
diff --git a/samples/client/petstore/cpp-restsdk/api/PetApi.h b/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 {
diff --git a/samples/client/petstore/cpp-restsdk/api/StoreApi.h b/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 {
diff --git a/samples/client/petstore/cpp-restsdk/api/UserApi.h b/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 {
diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/PetApi.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/StoreApi.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/api/UserApi.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/ApiResponse.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Category.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Category.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Order.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Order.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Pet.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Pet.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Tag.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/Tag.h b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/User.cpp b/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.
  */
diff --git a/samples/server/petstore/cpp-restbed/model/User.h b/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.
  */

Original file line number	Diff line number	Diff line change
`@@ -289,12 +289,12 @@ protected boolean isFileSchema(CodegenProperty property) {`
`289`	`289`
`290`	`290`	`@Override`
`291`	`291`	`public String toModelFilename(String name) {`
`292`		`- return sanitizeName(toModelName(name));`
	`292`	`+ return toModelName(name);`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`@Override`
`296`	`296`	`public String toApiFilename(String name) {`
`297`		`- return sanitizeName(toModelName(name) + "Api");`
	`297`	`+ return toApiName(name);`
`298`	`298`	`}`
`299`	`299`
`300`	`300`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -193,12 +193,12 @@ public CodegenModel fromModel(String name, Schema model) {`
`193`	`193`
`194`	`194`	`@Override`
`195`	`195`	`public String toModelFilename(String name) {`
`196`		`- return camelize(name);`
	`196`	`+ return toModelName(name);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`@Override`
`200`	`200`	`public String toApiFilename(String name) {`
`201`		`- return camelize(name) + "Api";`
	`201`	`+ return toApiName(name);`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`@SuppressWarnings("unchecked")`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`* OpenAPI spec version: 1.0.0`
`6`	`6`	`*`
`7`	`7`	`*`
`8`		`- * NOTE: This class is auto generated by OpenAPI-Generator 3.3.1-SNAPSHOT.`
	`8`	`+ * NOTE: This class is auto generated by OpenAPI-Generator 4.0.0-SNAPSHOT.`
`9`	`9`	`* https://openapi-generator.tech`
`10`	`10`	`* Do not edit the class manually.`
`11`	`11`	`*/`