From fd46b4e566807acd90399bff4150c00adf5b3bc8 Mon Sep 17 00:00:00 2001 From: sunn <33183834+etherealjoy@users.noreply.github.com> Date: Sat, 10 Nov 2018 21:07:49 +0100 Subject: [PATCH] Sanitize Model Import (#1411) --- .../openapitools/codegen/languages/CppQt5ClientCodegen.java | 4 ++-- .../codegen/languages/CppQt5QHttpEngineServerCodegen.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java index fa812143330..9f68c9679fe 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java @@ -276,12 +276,12 @@ public class CppQt5ClientCodegen extends AbstractCppCodegen implements CodegenCo @Override public String toModelFilename(String name) { - return initialCaps(toModelName(name)); + return sanitizeName(initialCaps(toModelName(name))); } @Override public String toApiFilename(String name) { - return modelNamePrefix + initialCaps(name) + "Api"; + return modelNamePrefix + sanitizeName(initialCaps(name)) + "Api"; } /** diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java index f8e2f760999..10ca4b79f8d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java @@ -306,7 +306,7 @@ public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implement @Override public String toModelFilename(String name) { - return modelNamePrefix + initialCaps(name); + return modelNamePrefix + sanitizeName(initialCaps(name)); } @Override @@ -322,7 +322,7 @@ public class CppQt5QHttpEngineServerCodegen extends AbstractCppCodegen implement @Override public String toApiFilename(String name) { - return modelNamePrefix + initialCaps(name) + "ApiHandler"; + return modelNamePrefix + sanitizeName(initialCaps(name)) + "ApiHandler"; } /**