From 69ad9a9957fc0dca9dbd792cb9a6a3b6f5bf197c Mon Sep 17 00:00:00 2001 From: William Cheng Date: Mon, 1 Apr 2019 11:21:11 +0800 Subject: [PATCH] remove initialCaps and replace with camelize (#2546) --- .../openapitools/codegen/DefaultCodegen.java | 23 +++++-------------- .../codegen/languages/BashClientCodegen.java | 4 +++- .../languages/CppPistacheServerCodegen.java | 6 ++--- .../languages/CppQt5ClientCodegen.java | 4 +++- .../CppQt5QHttpEngineServerCodegen.java | 4 +++- .../languages/CppRestSdkClientCodegen.java | 5 ++-- .../languages/CppRestbedServerCodegen.java | 6 +++-- .../languages/CppTizenClientCodegen.java | 6 ++--- .../codegen/languages/ElmClientCodegen.java | 2 +- .../languages/NodeJSServerCodegen.java | 4 +++- .../languages/PhpSlimServerCodegen.java | 6 +++-- .../codegen/languages/Swift3Codegen.java | 2 +- .../codegen/languages/Swift4Codegen.java | 2 +- .../codegen/languages/SwiftClientCodegen.java | 2 +- .../TypeScriptAngularClientCodegen.java | 2 +- .../TypeScriptAureliaClientCodegen.java | 4 +++- .../TypeScriptInversifyClientCodegen.java | 2 +- .../TypeScriptNodeClientCodegen.java | 2 +- 18 files changed, 45 insertions(+), 41 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 0f4b38fb790..2272fb32575 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 @@ -780,7 +780,7 @@ public class DefaultCodegen implements CodegenConfig { * @return the file name of the model */ public String toModelFilename(String name) { - return initialCaps(name); + return camelize(name); } /** @@ -790,7 +790,7 @@ public class DefaultCodegen implements CodegenConfig { * @return the file name of the model */ public String toModelTestFilename(String name) { - return initialCaps(name) + "Test"; + return camelize(name) + "Test"; } /** @@ -800,7 +800,7 @@ public class DefaultCodegen implements CodegenConfig { * @return the file name of the model */ public String toModelDocFilename(String name) { - return initialCaps(name); + return camelize(name); } /** @@ -1476,17 +1476,6 @@ public class DefaultCodegen implements CodegenConfig { return (name.length() > 0) ? (Character.toLowerCase(name.charAt(0)) + name.substring(1)) : ""; } - /** - * Capitalize the string. Please use org.openapitools.codegen.utils.StringUtils.camelize instead as this method will be deprecated. - * - * @param name string to be capitalized - * @return capitalized string - * @deprecated use {@link org.openapitools.codegen.utils.StringUtils#camelize(String)} instead - */ - @SuppressWarnings("static-method") - public String initialCaps(String name) { - return camelize(name); - } /** * Output the type declaration of a given name @@ -1576,7 +1565,7 @@ public class DefaultCodegen implements CodegenConfig { if (name.length() == 0) { return "DefaultApi"; } - return initialCaps(name) + "Api"; + return camelize(name) + "Api"; } /** @@ -1587,7 +1576,7 @@ public class DefaultCodegen implements CodegenConfig { * @return capitalized model name */ public String toModelName(final String name) { - return initialCaps(modelNamePrefix + "_" + name + "_" + modelNameSuffix); + return camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix); } /** @@ -3264,7 +3253,7 @@ public class DefaultCodegen implements CodegenConfig { if (builder.toString().length() == 0) { part = Character.toLowerCase(part.charAt(0)) + part.substring(1); } else { - part = initialCaps(part); + part = camelize(part); } builder.append(part); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java index c2738a28f5f..816405bbe70 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java @@ -35,6 +35,8 @@ import org.slf4j.LoggerFactory; import java.util.*; +import static org.openapitools.codegen.utils.StringUtils.*; + public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(BashClientCodegen.class); @@ -743,7 +745,7 @@ public class BashClientCodegen extends DefaultCodegen implements CodegenConfig { @Override public String toModelFilename(String name) { - return initialCaps(name); + return camelize(name); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java index 973250b5f49..34deb0b0fca 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java @@ -29,7 +29,7 @@ import org.openapitools.codegen.utils.ModelUtils; import java.io.File; import java.util.*; -import static org.openapitools.codegen.utils.StringUtils.underscore; +import static org.openapitools.codegen.utils.StringUtils.*; public class CppPistacheServerCodegen extends AbstractCppCodegen { protected String implFolder = "impl"; @@ -265,7 +265,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { @Override public String toModelFilename(String name) { - return initialCaps(toModelName(name)); + return camelize(toModelName(name)); } @Override @@ -286,7 +286,7 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen { @Override public String toApiFilename(String name) { - return modelNamePrefix + initialCaps(name) + "Api"; + return modelNamePrefix + camelize(name) + "Api"; } /** 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 8e4abe0f9b6..62ea88cc658 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 @@ -24,6 +24,8 @@ import org.openapitools.codegen.SupportingFile; import java.io.File; +import static org.openapitools.codegen.utils.StringUtils.*; + public class CppQt5ClientCodegen extends CppQt5AbstractCodegen implements CodegenConfig { public static final String OPTIONAL_PROJECT_FILE_DESC = "Generate client.pri."; // source folder where to write the files @@ -165,7 +167,7 @@ public class CppQt5ClientCodegen extends CppQt5AbstractCodegen implements Codege @Override public String toApiFilename(String name) { - return modelNamePrefix + sanitizeName(initialCaps(name)) + "Api"; + return modelNamePrefix + sanitizeName(camelize(name)) + "Api"; } public void setOptionalProjectFileFlag(boolean flag) { 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 db8e6ba0d25..6911ede7093 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 @@ -23,6 +23,8 @@ import org.openapitools.codegen.SupportingFile; import java.io.File; +import static org.openapitools.codegen.utils.StringUtils.*; + public class CppQt5QHttpEngineServerCodegen extends CppQt5AbstractCodegen implements CodegenConfig { protected final String SRC_DIR = "/src"; @@ -189,7 +191,7 @@ public class CppQt5QHttpEngineServerCodegen extends CppQt5AbstractCodegen implem @Override public String toApiFilename(String name) { - return modelNamePrefix + sanitizeName(initialCaps(name)) + "ApiHandler"; + return modelNamePrefix + sanitizeName(camelize(name)) + "ApiHandler"; } } 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 index 9521e478a0b..87ff50b0305 100644 --- 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 @@ -31,6 +31,7 @@ import org.openapitools.codegen.utils.ModelUtils; import java.util.*; import static com.google.common.base.Strings.isNullOrEmpty; +import static org.openapitools.codegen.utils.StringUtils.*; public class CppRestSdkClientCodegen extends AbstractCppCodegen { @@ -288,12 +289,12 @@ public class CppRestSdkClientCodegen extends AbstractCppCodegen { @Override public String toModelFilename(String name) { - return sanitizeName(initialCaps(name)); + return sanitizeName(camelize(name)); } @Override public String toApiFilename(String name) { - return sanitizeName(initialCaps(name) + "Api"); + return sanitizeName(camelize(name) + "Api"); } /** 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 index 64ee7fa203c..e8cbe527304 100644 --- 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 @@ -27,6 +27,8 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.util.*; +import static org.openapitools.codegen.utils.StringUtils.*; + public class CppRestbedServerCodegen extends AbstractCppCodegen { private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(CppRestbedServerCodegen.class); @@ -191,12 +193,12 @@ public class CppRestbedServerCodegen extends AbstractCppCodegen { @Override public String toModelFilename(String name) { - return initialCaps(name); + return camelize(name); } @Override public String toApiFilename(String name) { - return initialCaps(name) + "Api"; + return camelize(name) + "Api"; } @SuppressWarnings("unchecked") diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java index 9f742c62f30..f277c322173 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java @@ -247,17 +247,17 @@ public class CppTizenClientCodegen extends AbstractCppCodegen implements Codegen @Override public String toModelFilename(String name) { - return initialCaps(name); + return camelize(name); } @Override public String toApiName(String name) { - return initialCaps(name) + "Manager"; + return camelize(name) + "Manager"; } @Override public String toApiFilename(String name) { - return initialCaps(name) + "Manager"; + return camelize(name) + "Manager"; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java index 1b46c7f2240..b92d62445bc 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java @@ -236,7 +236,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig { if (name.length() == 0) { return "Default"; } - return initialCaps(name); + return camelize(name); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java index b8a3cf5bb27..896f0837e57 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java @@ -38,6 +38,8 @@ import java.util.*; import java.util.Map.Entry; import java.util.regex.Pattern; +import static org.openapitools.codegen.utils.StringUtils.*; + public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig { private static final Logger LOGGER = LoggerFactory.getLogger(NodeJSServerCodegen.class); @@ -160,7 +162,7 @@ public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig if (name.length() == 0) { return "DefaultController"; } - return initialCaps(name); + return camelize(name); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java index 990cd476d58..ef71b2d579f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java @@ -30,6 +30,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.*; +import static org.openapitools.codegen.utils.StringUtils.*; + public class PhpSlimServerCodegen extends AbstractPhpCodegen { private static final Logger LOGGER = LoggerFactory.getLogger(PhpSlimServerCodegen.class); @@ -175,7 +177,7 @@ public class PhpSlimServerCodegen extends AbstractPhpCodegen { if (name.length() == 0) { return toAbstractName("DefaultApi"); } - return toAbstractName(initialCaps(name) + "Api"); + return toAbstractName(camelize(name) + "Api"); } @Override @@ -183,7 +185,7 @@ public class PhpSlimServerCodegen extends AbstractPhpCodegen { if (name.length() == 0) { return "DefaultApiTest"; } - return initialCaps(name) + "ApiTest"; + return camelize(name) + "ApiTest"; } /** diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java index 22daa4334d6..e68b6df2496 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java @@ -443,7 +443,7 @@ public class Swift3Codegen extends DefaultCodegen implements CodegenConfig { public String toApiName(String name) { if (name.length() == 0) return "DefaultAPI"; - return initialCaps(name) + "API"; + return camelize(name) + "API"; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java index 24f55bfca31..28108ed917e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java @@ -552,7 +552,7 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig { if (name.length() == 0) { return "DefaultAPI"; } - return initialCaps(name) + "API"; + return camelize(name) + "API"; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java index acfa9243117..077a1ec8767 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java @@ -434,7 +434,7 @@ public class SwiftClientCodegen extends DefaultCodegen implements CodegenConfig public String toApiName(String name) { if (name.length() == 0) return "DefaultAPI"; - return initialCaps(name) + "API"; + return camelize(name) + "API"; } @Override 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 64ab80cb594..108f71aba5d 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 @@ -513,7 +513,7 @@ public class TypeScriptAngularClientCodegen extends AbstractTypeScriptClientCode if (name.length() == 0) { return "DefaultService"; } - return StringUtils.camelize(name) + serviceSuffix; + return camelize(name) + serviceSuffix; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java index 70dc269ec89..2a9d2123ce2 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java @@ -22,6 +22,8 @@ import org.openapitools.codegen.utils.StringUtils; import java.util.*; +import static org.openapitools.codegen.utils.StringUtils.*; + public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCodegen { public static final String NPM_NAME = "npmName"; @@ -105,7 +107,7 @@ public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCode List operationList = (List) operations.get("operation"); for (CodegenOperation op : operationList) { // Aurelia uses "asGet", "asPost", ... methods; change the method format - op.httpMethod = StringUtils.camelize(op.httpMethod.toLowerCase(Locale.ROOT)); + op.httpMethod = camelize(op.httpMethod.toLowerCase(Locale.ROOT)); // Collect models to be imported for (CodegenParameter param : op.allParams) { diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java index bc8bc0dc270..05464d1a1fa 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java @@ -322,7 +322,7 @@ public class TypeScriptInversifyClientCodegen extends AbstractTypeScriptClientCo if (name.length() == 0) { return "DefaultService"; } - return StringUtils.camelize(name) + "Service"; + return camelize(name) + "Service"; } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index a794c5a7abc..3bffc213e4c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -99,7 +99,7 @@ public class TypeScriptNodeClientCodegen extends AbstractTypeScriptClientCodegen if (name.length() == 0) { return "Default" + apiSuffix; } - return StringUtils.camelize(name) + apiSuffix; + return camelize(name) + apiSuffix; } @Override