From fa052ffa19aa7b9ecf1527e7f1384b66ec9fe22c Mon Sep 17 00:00:00 2001 From: xhh Date: Wed, 3 Feb 2016 16:01:52 +0800 Subject: [PATCH] JavaScript client: ensure a default project/module name when it is an empty string (same for "projectVersion") Closes #2022 --- .../codegen/languages/JavascriptClientCodegen.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java index f005d222c7e..3efc92209a8 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavascriptClientCodegen.java @@ -164,11 +164,11 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo if (swagger.getInfo() != null) { Info info = swagger.getInfo(); - if (projectName == null && info.getTitle() != null) { + if (StringUtils.isBlank(projectName) && info.getTitle() != null) { // when projectName is not specified, generate it from info.title projectName = dashize(info.getTitle()); } - if (projectVersion == null) { + if (StringUtils.isBlank(projectVersion)) { // when projectVersion is not specified, use info.version projectVersion = info.getVersion(); } @@ -185,13 +185,13 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo } // default values - if (projectName == null) { + if (StringUtils.isBlank(projectName)) { projectName = "swagger-js-client"; } - if (moduleName == null) { + if (StringUtils.isBlank(moduleName)) { moduleName = camelize(underscore(projectName)); } - if (projectVersion == null) { + if (StringUtils.isBlank(projectVersion)) { projectVersion = "1.0.0"; } if (projectDescription == null) {