From 695fb76ec11d4fcf4ffe2a0e790d23bcf58c688b Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Tue, 2 Oct 2018 11:50:02 +0200 Subject: [PATCH 1/7] remove left|right point double angle quotation marks --- .../org/openapitools/codegen/DefaultGenerator.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 6efd0deecbed..90acd2a5d572 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -298,7 +298,8 @@ private void generateModelDocumentation(List files, Map mo private void generateModel(List files, Map models, String modelName) throws IOException { for (String templateName : config.modelTemplateFiles().keySet()) { String suffix = config.modelTemplateFiles().get(templateName); - String filename = config.modelFileFolder() + File.separator + config.toModelFilename(modelName) + suffix; + String cleanedModelFileName = this.cleanModelFilename(config.toModelFilename(modelName)); + String filename = config.modelFileFolder() + File.separator + cleanedModelFileName + suffix; if (!config.shouldOverwrite(filename)) { LOGGER.info("Skipped overwriting " + filename); continue; @@ -311,6 +312,17 @@ private void generateModel(List files, Map models, String } } + /** + * Cleans the given filename by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs + * for model names marked with generics. + * myModel«MyGeneric» => myModelMyGeneric + * @param filename + * @return cleaned filename + */ + private String cleanModelFilename(String filename) { + return filename.replaceAll("[\\u00AB\\u00BB]", ""); + } + private void generateModels(List files, List allModels, List unusedModels) { if (!generateModels) { return; From 3f3dfd84f3de57e534690c44e0d9f0a6eb2baae4 Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Tue, 2 Oct 2018 12:48:35 +0200 Subject: [PATCH 2/7] move to DefaultCodeGen and update TypeScriptAngularClientCodegen to reflect new clean function so that the filename AND imports are added correctly --- .../org/openapitools/codegen/DefaultCodegen.java | 15 +++++++++++++-- .../openapitools/codegen/DefaultGenerator.java | 14 +------------- .../languages/TypeScriptAngularClientCodegen.java | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 8ddbb41197b3..24691a7a66d8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -731,7 +731,7 @@ public String toApiVarName(String name) { * @return the file name of the model */ public String toModelFilename(String name) { - return initialCaps(name); + return this.cleanModelName(initialCaps(name)); } /** @@ -741,7 +741,7 @@ public String toModelFilename(String name) { * @return the file name of the model */ public String toModelTestFilename(String name) { - return initialCaps(name) + "Test"; + return this.cleanModelName(initialCaps(name) + "Test"); } /** @@ -4702,5 +4702,16 @@ private void setParameterNullable(CodegenParameter parameter, CodegenProperty pr */ public void postProcessFile(File file, String fileType) { LOGGER.debug("Post processing file {} ({})", file, fileType); + } + + /** + * Cleans the given name by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs + * for model names marked with generics. + * myModel«MyGeneric» => myModelMyGeneric + * @param name + * @return cleaned name + */ + protected String cleanModelName(String name) { + return name.replaceAll("[\\u00AB\\u00BB]", ""); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java index 90acd2a5d572..6efd0deecbed 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java @@ -298,8 +298,7 @@ private void generateModelDocumentation(List files, Map mo private void generateModel(List files, Map models, String modelName) throws IOException { for (String templateName : config.modelTemplateFiles().keySet()) { String suffix = config.modelTemplateFiles().get(templateName); - String cleanedModelFileName = this.cleanModelFilename(config.toModelFilename(modelName)); - String filename = config.modelFileFolder() + File.separator + cleanedModelFileName + suffix; + String filename = config.modelFileFolder() + File.separator + config.toModelFilename(modelName) + suffix; if (!config.shouldOverwrite(filename)) { LOGGER.info("Skipped overwriting " + filename); continue; @@ -312,17 +311,6 @@ private void generateModel(List files, Map models, String } } - /** - * Cleans the given filename by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs - * for model names marked with generics. - * myModel«MyGeneric» => myModelMyGeneric - * @param filename - * @return cleaned filename - */ - private String cleanModelFilename(String filename) { - return filename.replaceAll("[\\u00AB\\u00BB]", ""); - } - private void generateModels(List files, List allModels, List unusedModels) { if (!generateModels) { return; diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 17ad3c37e781..31e86fc0efc4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -472,7 +472,7 @@ public String toApiImport(String name) { @Override public String toModelFilename(String name) { - return this.convertUsingFileNamingConvention(name) + modelFileSuffix; + return this.cleanModelName(this.convertUsingFileNamingConvention(name) + modelFileSuffix); } @Override From 5ba77750e4023c4ad33744bde756ac9c6ddae8f3 Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Tue, 2 Oct 2018 12:52:40 +0200 Subject: [PATCH 3/7] rename to a more accurate name :) --- .../java/org/openapitools/codegen/DefaultCodegen.java | 10 +++++----- .../languages/TypeScriptAngularClientCodegen.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 24691a7a66d8..fb9645fe5c2c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -731,7 +731,7 @@ public String toApiVarName(String name) { * @return the file name of the model */ public String toModelFilename(String name) { - return this.cleanModelName(initialCaps(name)); + return this.cleanModelFilename(initialCaps(name)); } /** @@ -741,7 +741,7 @@ public String toModelFilename(String name) { * @return the file name of the model */ public String toModelTestFilename(String name) { - return this.cleanModelName(initialCaps(name) + "Test"); + return this.cleanModelFilename(initialCaps(name) + "Test"); } /** @@ -4705,13 +4705,13 @@ public void postProcessFile(File file, String fileType) { } /** - * Cleans the given name by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs + * Cleans the given filename by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs * for model names marked with generics. * myModel«MyGeneric» => myModelMyGeneric * @param name - * @return cleaned name + * @return cleaned filename */ - protected String cleanModelName(String name) { + protected String cleanModelFilename(String name) { return name.replaceAll("[\\u00AB\\u00BB]", ""); } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 31e86fc0efc4..64229f5b325d 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -472,7 +472,7 @@ public String toApiImport(String name) { @Override public String toModelFilename(String name) { - return this.cleanModelName(this.convertUsingFileNamingConvention(name) + modelFileSuffix); + return this.cleanModelFilename(this.convertUsingFileNamingConvention(name) + modelFileSuffix); } @Override From f13a340a48684d41aa28feb83dfb036de05c531a Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Tue, 2 Oct 2018 12:57:23 +0200 Subject: [PATCH 4/7] shippable fixes --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index fb9645fe5c2c..d92347e635b6 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4708,7 +4708,8 @@ public void postProcessFile(File file, String fileType) { * Cleans the given filename by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs * for model names marked with generics. * myModel«MyGeneric» => myModelMyGeneric - * @param name + * + * @param name given filename string to clean * @return cleaned filename */ protected String cleanModelFilename(String name) { From c17243681c4c89e5178767649dc79949699a3535 Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Tue, 2 Oct 2018 13:19:41 +0200 Subject: [PATCH 5/7] shippable javadoc fix --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index d92347e635b6..5229bb158ab4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -4707,7 +4707,7 @@ public void postProcessFile(File file, String fileType) { /** * Cleans the given filename by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs * for model names marked with generics. - * myModel«MyGeneric» => myModelMyGeneric + * "myModel«MyGeneric»" to "myModelMyGeneric" * * @param name given filename string to clean * @return cleaned filename From 00b4effcdb87518926a6d4861a7fcec2bb60f2f8 Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Tue, 2 Oct 2018 15:03:06 +0200 Subject: [PATCH 6/7] replaced cleanModelFilename with sanitzeName --- .../org/openapitools/codegen/DefaultCodegen.java | 15 ++------------- .../languages/TypeScriptAngularClientCodegen.java | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 5229bb158ab4..81dbb1288e76 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -731,7 +731,7 @@ public String toApiVarName(String name) { * @return the file name of the model */ public String toModelFilename(String name) { - return this.cleanModelFilename(initialCaps(name)); + return this.sanitizeName(initialCaps(name)); } /** @@ -741,7 +741,7 @@ public String toModelFilename(String name) { * @return the file name of the model */ public String toModelTestFilename(String name) { - return this.cleanModelFilename(initialCaps(name) + "Test"); + return this.sanitizeName(initialCaps(name) + "Test"); } /** @@ -4704,15 +4704,4 @@ public void postProcessFile(File file, String fileType) { LOGGER.debug("Post processing file {} ({})", file, fileType); } - /** - * Cleans the given filename by removing all {LEFT-POINTING | RIGH-POINTING} DOUBLE ANGLE QUOTATION MARKs - * for model names marked with generics. - * "myModel«MyGeneric»" to "myModelMyGeneric" - * - * @param name given filename string to clean - * @return cleaned filename - */ - protected String cleanModelFilename(String name) { - return name.replaceAll("[\\u00AB\\u00BB]", ""); - } } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index 64229f5b325d..5704ce5fbd19 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -472,7 +472,7 @@ public String toApiImport(String name) { @Override public String toModelFilename(String name) { - return this.cleanModelFilename(this.convertUsingFileNamingConvention(name) + modelFileSuffix); + return this.sanitizeName(this.convertUsingFileNamingConvention(name) + modelFileSuffix); } @Override From d2a2aa76bfdac207c7cca384e14c544f20d38b8b Mon Sep 17 00:00:00 2001 From: Steven Masala Date: Thu, 4 Oct 2018 11:17:01 +0200 Subject: [PATCH 7/7] remove DefaultCodegen changes --- .../main/java/org/openapitools/codegen/DefaultCodegen.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 81dbb1288e76..d6be96d6fdf0 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -731,7 +731,7 @@ public String toApiVarName(String name) { * @return the file name of the model */ public String toModelFilename(String name) { - return this.sanitizeName(initialCaps(name)); + return initialCaps(name); } /** @@ -741,7 +741,7 @@ public String toModelFilename(String name) { * @return the file name of the model */ public String toModelTestFilename(String name) { - return this.sanitizeName(initialCaps(name) + "Test"); + return initialCaps(name) + "Test"; } /**