Deprecate initialCaps and replace with camelize

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -780,7 +780,7 @@ public String toApiVarName(String name) {
      * @return the file name of the model
      */
     public String toModelFilename(String name) {
-        return initialCaps(name);
+        return camelize(name);
     }
 
     /**
@@ -790,7 +790,7 @@ public String toModelFilename(String name) {
      * @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 String toModelTestFilename(String name) {
      * @return the file name of the model
      */
     public String toModelDocFilename(String name) {
-        return initialCaps(name);
+        return camelize(name);
     }
 
     /**
@@ -1476,17 +1476,6 @@ public String snakeCase(String name) {
         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 String toApiName(String name) {
         if (name.length() == 0) {
             return "DefaultApi";
         }
-        return initialCaps(name) + "Api";
+        return camelize(name) + "Api";
     }
 
     /**
@@ -1587,7 +1576,7 @@ public String toApiName(String name) {
      * @return capitalized model name
      */
     public String toModelName(final String name) {
-        return initialCaps(modelNamePrefix + "_" + name + "_" + modelNameSuffix);
+        return camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix);
     }
 
     /**
@@ -3264,7 +3253,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri
                     if (builder.toString().length() == 0) {
                         part = Character.toLowerCase(part.charAt(0)) + part.substring(1);
                     } else {
-                        part = initialCaps(part);
+                        part = camelize(part);
                     }
                     builder.append(part);
                 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/BashClientCodegen.java

@@ -35,6 +35,8 @@
 
 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 void setParameterExampleValue(CodegenParameter p) {
 
     @Override
     public String toModelFilename(String name) {
-        return initialCaps(name);
+        return camelize(name);
     }
 
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppPistacheServerCodegen.java

@@ -29,7 +29,7 @@
 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 Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
 
     @Override
     public String toModelFilename(String name) {
-        return initialCaps(toModelName(name));
+        return camelize(toModelName(name));
     }
 
     @Override
@@ -286,7 +286,7 @@ public String apiFilename(String templateName, String tag) {
 
     @Override
     public String toApiFilename(String name) {
-        return  modelNamePrefix + initialCaps(name) + "Api";
+        return  modelNamePrefix + camelize(name) + "Api";
     }
 
     /**

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5ClientCodegen.java

@@ -24,6 +24,8 @@
 
 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
@@ -163,7 +165,7 @@ public String apiFileFolder() {
 
     @Override
     public String toApiFilename(String name) {
-        return modelNamePrefix + sanitizeName(initialCaps(name)) + "Api";
+        return modelNamePrefix + sanitizeName(camelize(name)) + "Api";
     }
 
     public void setOptionalProjectFileFlag(boolean flag) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5QHttpEngineServerCodegen.java

@@ -23,6 +23,8 @@
 
 import java.io.File;
 
+import static org.openapitools.codegen.utils.StringUtils.*;
+
 public class CppQt5QHttpEngineServerCodegen extends CppQt5AbstractCodegen implements CodegenConfig {
 
     protected final String SRC_DIR = "/src";
@@ -187,7 +189,7 @@ public String apiFilename(String templateName, String tag) {
 
     @Override
     public String toApiFilename(String name) {
-        return modelNamePrefix + sanitizeName(initialCaps(name)) + "ApiHandler";
+        return modelNamePrefix + sanitizeName(camelize(name)) + "ApiHandler";
     }
 
 }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestSdkClientCodegen.java

@@ -31,6 +31,7 @@
 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 @@ protected boolean isFileSchema(CodegenProperty property) {
 
     @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");
     }
 
     /**

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppRestbedServerCodegen.java

@@ -27,6 +27,8 @@
 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 CodegenModel fromModel(String name, Schema model) {
 
     @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")

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java

@@ -247,17 +247,17 @@ public String modelFileFolder() {
 
     @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

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java

@@ -236,7 +236,7 @@ public String toApiName(String name) {
         if (name.length() == 0) {
             return "Default";
         }
-        return initialCaps(name);
+        return camelize(name);
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/NodeJSServerCodegen.java

@@ -38,6 +38,8 @@
 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 String toApiName(String name) {
         if (name.length() == 0) {
             return "DefaultController";
         }
-        return initialCaps(name);
+        return camelize(name);
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSlimServerCodegen.java

@@ -30,6 +30,8 @@
 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,15 +177,15 @@ public String toApiName(String name) {
         if (name.length() == 0) {
             return toAbstractName("DefaultApi");
         }
-        return toAbstractName(initialCaps(name) + "Api");
+        return toAbstractName(camelize(name) + "Api");
     }
 
     @Override
     public String toApiTestFilename(String name) {
         if (name.length() == 0) {
             return "DefaultApiTest";
         }
-        return initialCaps(name) + "ApiTest";
+        return camelize(name) + "ApiTest";
     }
 
     /**

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift3Codegen.java

@@ -443,7 +443,7 @@ public String toInstantiationType(Schema p) {
     public String toApiName(String name) {
         if (name.length() == 0)
             return "DefaultAPI";
-        return initialCaps(name) + "API";
+        return camelize(name) + "API";
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java

@@ -552,7 +552,7 @@ public String toApiName(String name) {
         if (name.length() == 0) {
             return "DefaultAPI";
         }
-        return initialCaps(name) + "API";
+        return camelize(name) + "API";
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftClientCodegen.java

@@ -434,7 +434,7 @@ public String toSwiftyEnumName(String value) {
     public String toApiName(String name) {
         if (name.length() == 0)
             return "DefaultAPI";
-        return initialCaps(name) + "API";
+        return camelize(name) + "API";
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java

@@ -513,7 +513,7 @@ public String toApiName(String name) {
         if (name.length() == 0) {
             return "DefaultService";
         }
-        return StringUtils.camelize(name) + serviceSuffix;
+        return camelize(name) + serviceSuffix;
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java

@@ -22,6 +22,8 @@
 
 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 Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
         List<CodegenOperation> operationList = (List<CodegenOperation>) 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) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java

@@ -322,7 +322,7 @@ public String toApiName(String name) {
         if (name.length() == 0) {
             return "DefaultService";
         }
-        return StringUtils.camelize(name) + "Service";
+        return camelize(name) + "Service";
     }
 
     @Override

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java

@@ -99,7 +99,7 @@ public String toApiName(String name) {
         if (name.length() == 0) {
             return "Default" + apiSuffix;
         }
-        return StringUtils.camelize(name) + apiSuffix;
+        return camelize(name) + apiSuffix;
     }
 
     @Override