Skip to content

FIX: remove special quotation marks from filename generation. #1157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 7 commits into from
Oct 4, 2018
Merged

FIX: remove special quotation marks from filename generation. #1157

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
695fb76
remove left|right point double angle quotation marks
smasala Oct 2, 2018
3f3dfd8
move to DefaultCodeGen and update TypeScriptAngularClientCodegen to r…
smasala Oct 2, 2018
5ba7775
rename to a more accurate name :)
smasala Oct 2, 2018
f13a340
shippable fixes
smasala Oct 2, 2018
c172436
shippable javadoc fix
smasala Oct 2, 2018
00b4eff
replaced cleanModelFilename with sanitzeName
smasala Oct 2, 2018
d2a2aa7
remove DefaultCodegen changes
smasala Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
remove left|right point double angle quotation marks
  • Loading branch information
@smasala
smasala committed Oct 2, 2018
commit 695fb76ec11d4fcf4ffe2a0e790d23bcf58c688b
14 changes: 13 additions & 1 deletion modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,8 @@ private void generateModelDocumentation(List<File> files, Map<String, Object> mo
private void generateModel(List<File> files, Map<String, Object> 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;
Expand All @@ -311,6 +312,17 @@ private void generateModel(List<File> files, Map<String, Object> 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<File> files, List<Object> allModels, List<String> unusedModels) {
if (!generateModels) {
return;
Expand Down