Skip to content

Commit 69ad9a9

Browse files
wing328wing328
authored
remove initialCaps and replace with camelize (#2546)
1 parent 9c7d407 commit 69ad9a9

18 files changed

+45
-41
lines changed

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

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ public String toApiVarName(String name) {
780780
* @return the file name of the model
781781
*/
782782
public String toModelFilename(String name) {
783-
return initialCaps(name);
783+
return camelize(name);
784784
}
785785

786786
/**
@@ -790,7 +790,7 @@ public String toModelFilename(String name) {
790790
* @return the file name of the model
791791
*/
792792
public String toModelTestFilename(String name) {
793-
return initialCaps(name) + "Test";
793+
return camelize(name) + "Test";
794794
}
795795

796796
/**
@@ -800,7 +800,7 @@ public String toModelTestFilename(String name) {
800800
* @return the file name of the model
801801
*/
802802
public String toModelDocFilename(String name) {
803-
return initialCaps(name);
803+
return camelize(name);
804804
}
805805

806806
/**
@@ -1476,17 +1476,6 @@ public String snakeCase(String name) {
14761476
return (name.length() > 0) ? (Character.toLowerCase(name.charAt(0)) + name.substring(1)) : "";
14771477
}
14781478

1479-
/**
1480-
* Capitalize the string. Please use org.openapitools.codegen.utils.StringUtils.camelize instead as this method will be deprecated.
1481-
*
1482-
* @param name string to be capitalized
1483-
* @return capitalized string
1484-
* @deprecated use {@link org.openapitools.codegen.utils.StringUtils#camelize(String)} instead
1485-
*/
1486-
@SuppressWarnings("static-method")
1487-
public String initialCaps(String name) {
1488-
return camelize(name);
1489-
}
14901479

14911480
/**
14921481
* Output the type declaration of a given name
@@ -1576,7 +1565,7 @@ public String toApiName(String name) {
15761565
if (name.length() == 0) {
15771566
return "DefaultApi";
15781567
}
1579-
return initialCaps(name) + "Api";
1568+
return camelize(name) + "Api";
15801569
}
15811570

15821571
/**
@@ -1587,7 +1576,7 @@ public String toApiName(String name) {
15871576
* @return capitalized model name
15881577
*/
15891578
public String toModelName(final String name) {
1590-
return initialCaps(modelNamePrefix + "_" + name + "_" + modelNameSuffix);
1579+
return camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix);
15911580
}
15921581

15931582
/**
@@ -3264,7 +3253,7 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri
32643253
if (builder.toString().length() == 0) {
32653254
part = Character.toLowerCase(part.charAt(0)) + part.substring(1);
32663255
} else {
3267-
part = initialCaps(part);
3256+
part = camelize(part);
32683257
}
32693258
builder.append(part);
32703259
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
import java.util.*;
3737

38+
import static org.openapitools.codegen.utils.StringUtils.*;
39+
3840
public class BashClientCodegen extends DefaultCodegen implements CodegenConfig {
3941
private static final Logger LOGGER = LoggerFactory.getLogger(BashClientCodegen.class);
4042

@@ -743,7 +745,7 @@ public void setParameterExampleValue(CodegenParameter p) {
743745

744746
@Override
745747
public String toModelFilename(String name) {
746-
return initialCaps(name);
748+
return camelize(name);
747749
}
748750

749751

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.io.File;
3030
import java.util.*;
3131

32-
import static org.openapitools.codegen.utils.StringUtils.underscore;
32+
import static org.openapitools.codegen.utils.StringUtils.*;
3333

3434
public class CppPistacheServerCodegen extends AbstractCppCodegen {
3535
protected String implFolder = "impl";
@@ -265,7 +265,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
265265

266266
@Override
267267
public String toModelFilename(String name) {
268-
return initialCaps(toModelName(name));
268+
return camelize(toModelName(name));
269269
}
270270

271271
@Override
@@ -286,7 +286,7 @@ public String apiFilename(String templateName, String tag) {
286286

287287
@Override
288288
public String toApiFilename(String name) {
289-
return modelNamePrefix + initialCaps(name) + "Api";
289+
return modelNamePrefix + camelize(name) + "Api";
290290
}
291291

292292
/**

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
import java.io.File;
2626

27+
import static org.openapitools.codegen.utils.StringUtils.*;
28+
2729
public class CppQt5ClientCodegen extends CppQt5AbstractCodegen implements CodegenConfig {
2830
public static final String OPTIONAL_PROJECT_FILE_DESC = "Generate client.pri.";
2931
// source folder where to write the files
@@ -165,7 +167,7 @@ public String apiFileFolder() {
165167

166168
@Override
167169
public String toApiFilename(String name) {
168-
return modelNamePrefix + sanitizeName(initialCaps(name)) + "Api";
170+
return modelNamePrefix + sanitizeName(camelize(name)) + "Api";
169171
}
170172

171173
public void setOptionalProjectFileFlag(boolean flag) {

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
import java.io.File;
2525

26+
import static org.openapitools.codegen.utils.StringUtils.*;
27+
2628
public class CppQt5QHttpEngineServerCodegen extends CppQt5AbstractCodegen implements CodegenConfig {
2729

2830
protected final String SRC_DIR = "/src";
@@ -189,7 +191,7 @@ public String apiFilename(String templateName, String tag) {
189191

190192
@Override
191193
public String toApiFilename(String name) {
192-
return modelNamePrefix + sanitizeName(initialCaps(name)) + "ApiHandler";
194+
return modelNamePrefix + sanitizeName(camelize(name)) + "ApiHandler";
193195
}
194196

195197
}

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.*;
3232

3333
import static com.google.common.base.Strings.isNullOrEmpty;
34+
import static org.openapitools.codegen.utils.StringUtils.*;
3435

3536
public class CppRestSdkClientCodegen extends AbstractCppCodegen {
3637

@@ -288,12 +289,12 @@ protected boolean isFileSchema(CodegenProperty property) {
288289

289290
@Override
290291
public String toModelFilename(String name) {
291-
return sanitizeName(initialCaps(name));
292+
return sanitizeName(camelize(name));
292293
}
293294

294295
@Override
295296
public String toApiFilename(String name) {
296-
return sanitizeName(initialCaps(name) + "Api");
297+
return sanitizeName(camelize(name) + "Api");
297298
}
298299

299300
/**

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import java.io.File;
2828
import java.util.*;
2929

30+
import static org.openapitools.codegen.utils.StringUtils.*;
31+
3032
public class CppRestbedServerCodegen extends AbstractCppCodegen {
3133

3234
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(CppRestbedServerCodegen.class);
@@ -191,12 +193,12 @@ public CodegenModel fromModel(String name, Schema model) {
191193

192194
@Override
193195
public String toModelFilename(String name) {
194-
return initialCaps(name);
196+
return camelize(name);
195197
}
196198

197199
@Override
198200
public String toApiFilename(String name) {
199-
return initialCaps(name) + "Api";
201+
return camelize(name) + "Api";
200202
}
201203

202204
@SuppressWarnings("unchecked")

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,17 +247,17 @@ public String modelFileFolder() {
247247

248248
@Override
249249
public String toModelFilename(String name) {
250-
return initialCaps(name);
250+
return camelize(name);
251251
}
252252

253253
@Override
254254
public String toApiName(String name) {
255-
return initialCaps(name) + "Manager";
255+
return camelize(name) + "Manager";
256256
}
257257

258258
@Override
259259
public String toApiFilename(String name) {
260-
return initialCaps(name) + "Manager";
260+
return camelize(name) + "Manager";
261261
}
262262

263263
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ public String toApiName(String name) {
236236
if (name.length() == 0) {
237237
return "Default";
238238
}
239-
return initialCaps(name);
239+
return camelize(name);
240240
}
241241

242242
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
import java.util.Map.Entry;
3939
import java.util.regex.Pattern;
4040

41+
import static org.openapitools.codegen.utils.StringUtils.*;
42+
4143
public class NodeJSServerCodegen extends DefaultCodegen implements CodegenConfig {
4244

4345
private static final Logger LOGGER = LoggerFactory.getLogger(NodeJSServerCodegen.class);
@@ -160,7 +162,7 @@ public String toApiName(String name) {
160162
if (name.length() == 0) {
161163
return "DefaultController";
162164
}
163-
return initialCaps(name);
165+
return camelize(name);
164166
}
165167

166168
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import java.net.URLEncoder;
3131
import java.util.*;
3232

33+
import static org.openapitools.codegen.utils.StringUtils.*;
34+
3335
public class PhpSlimServerCodegen extends AbstractPhpCodegen {
3436
private static final Logger LOGGER = LoggerFactory.getLogger(PhpSlimServerCodegen.class);
3537

@@ -175,15 +177,15 @@ public String toApiName(String name) {
175177
if (name.length() == 0) {
176178
return toAbstractName("DefaultApi");
177179
}
178-
return toAbstractName(initialCaps(name) + "Api");
180+
return toAbstractName(camelize(name) + "Api");
179181
}
180182

181183
@Override
182184
public String toApiTestFilename(String name) {
183185
if (name.length() == 0) {
184186
return "DefaultApiTest";
185187
}
186-
return initialCaps(name) + "ApiTest";
188+
return camelize(name) + "ApiTest";
187189
}
188190

189191
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ public String toInstantiationType(Schema p) {
443443
public String toApiName(String name) {
444444
if (name.length() == 0)
445445
return "DefaultAPI";
446-
return initialCaps(name) + "API";
446+
return camelize(name) + "API";
447447
}
448448

449449
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ public String toApiName(String name) {
552552
if (name.length() == 0) {
553553
return "DefaultAPI";
554554
}
555-
return initialCaps(name) + "API";
555+
return camelize(name) + "API";
556556
}
557557

558558
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ public String toSwiftyEnumName(String value) {
434434
public String toApiName(String name) {
435435
if (name.length() == 0)
436436
return "DefaultAPI";
437-
return initialCaps(name) + "API";
437+
return camelize(name) + "API";
438438
}
439439

440440
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ public String toApiName(String name) {
513513
if (name.length() == 0) {
514514
return "DefaultService";
515515
}
516-
return StringUtils.camelize(name) + serviceSuffix;
516+
return camelize(name) + serviceSuffix;
517517
}
518518

519519
@Override

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222

2323
import java.util.*;
2424

25+
import static org.openapitools.codegen.utils.StringUtils.*;
26+
2527
public class TypeScriptAureliaClientCodegen extends AbstractTypeScriptClientCodegen {
2628

2729
public static final String NPM_NAME = "npmName";
@@ -105,7 +107,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
105107
List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
106108
for (CodegenOperation op : operationList) {
107109
// Aurelia uses "asGet", "asPost", ... methods; change the method format
108-
op.httpMethod = StringUtils.camelize(op.httpMethod.toLowerCase(Locale.ROOT));
110+
op.httpMethod = camelize(op.httpMethod.toLowerCase(Locale.ROOT));
109111

110112
// Collect models to be imported
111113
for (CodegenParameter param : op.allParams) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ public String toApiName(String name) {
322322
if (name.length() == 0) {
323323
return "DefaultService";
324324
}
325-
return StringUtils.camelize(name) + "Service";
325+
return camelize(name) + "Service";
326326
}
327327

328328
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public String toApiName(String name) {
9999
if (name.length() == 0) {
100100
return "Default" + apiSuffix;
101101
}
102-
return StringUtils.camelize(name) + apiSuffix;
102+
return camelize(name) + apiSuffix;
103103
}
104104

105105
@Override

0 commit comments

Comments
 (0)