loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

remove initialCaps and replace with camelize (#2546)

Browse Source
This commit is contained in:
William Cheng 2019-04-01 11:21:11 +08:00 committed by GitHub
parent 9c7d4073f4
commit 69ad9a9957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);
}

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

@ -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);
}

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

@ -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";
}
/**

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

@ -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) {

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

@ -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";
}
}

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

@ -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");
}
/**

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

@ -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")

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

@ -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

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

@ -236,7 +236,7 @@ public class ElmClientCodegen extends DefaultCodegen implements CodegenConfig {
if (name.length() == 0) {
return "Default";
}
return initialCaps(name);
return camelize(name);
}
@Override

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

@ -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

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

@ -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";
}
/**

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

@ -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

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

@ -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

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

@ -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

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

@ -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

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

@ -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<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) {

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

@ -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

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

@ -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