Skip to content

Commit db462a6

Browse files
committed
DRY regex patterns
1 parent 848b5fc commit db462a6

7 files changed

Lines changed: 16 additions & 16 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ public String toApiVarName(String name) {
776776
}
777777

778778
protected static String dropDots(String str) {
779-
return str.replaceAll("\\.", "_");
779+
return DOT.matcher(str).replaceAll("_");
780780
}
781781

782782
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void processOpts() {
103103
} else {
104104
// default: set project based on package name
105105
// e.g. petstore.api (package name) => petstore_api (project name)
106-
projectName = packageName.replaceAll("\\.", "_");
106+
projectName = DOT.matcher(packageName).replaceAll("_");
107107
}
108108
String configBaseName = modelPackage.toLowerCase(Locale.ROOT);
109109
supportingFiles.add(new SupportingFile("gnat-project.mustache", "", toFilename(projectName) + ".gpr"));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public void processOpts() {
108108
} else {
109109
// default: set project based on package name
110110
// e.g. petstore.api (package name) => petstore_api (project name)
111-
projectName = packageName.replaceAll("\\.", "_");
111+
projectName = DOT.matcher(packageName).replaceAll("_");
112112
}
113113
String configBaseName = modelPackage.toLowerCase(Locale.ROOT);
114114
supportingFiles.add(new SupportingFile("gnat-project.mustache", "", toFilename(projectName) + ".gpr"));

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,9 @@ public String toEnumVarName(String name, String datatype) {
739739
// number
740740
if ("Integer".equals(datatype) || "Float".equals(datatype)) {
741741
String varName = name;
742-
varName = varName.replaceAll("-", "MINUS_");
743-
varName = varName.replaceAll("\\+", "PLUS_");
744-
varName = varName.replaceAll("\\.", "_DOT_");
742+
varName = MINUS.matcher(varName).replaceAll("MINUS_");
743+
varName = PLUS.matcher(varName).replaceAll("PLUS_");
744+
varName = DOT.matcher(varName).replaceAll("_DOT_");
745745
return varName;
746746
}
747747

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,9 +1316,9 @@ public String toEnumVarName(String value, String datatype) {
13161316
datatype.startsWith("long") || datatype.startsWith("ulong") ||
13171317
datatype.startsWith("double") || datatype.startsWith("float")) {
13181318
String varName = "NUMBER_" + value;
1319-
varName = varName.replaceAll("-", "MINUS_");
1320-
varName = varName.replaceAll("\\+", "PLUS_");
1321-
varName = varName.replaceAll("\\.", "_DOT_");
1319+
varName = MINUS.matcher(varName).replaceAll("MINUS_");
1320+
varName = PLUS.matcher(varName).replaceAll("PLUS_");
1321+
varName = DOT.matcher(varName).replaceAll("_DOT_");
13221322
return varName;
13231323
}
13241324

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,9 +840,9 @@ public String toEnumVarName(String value, String datatype) {
840840
if (datatype.startsWith("int") || datatype.startsWith("long") ||
841841
datatype.startsWith("double") || datatype.startsWith("float")) {
842842
String varName = "NUMBER_" + value;
843-
varName = varName.replaceAll("-", "MINUS_");
844-
varName = varName.replaceAll("\\+", "PLUS_");
845-
varName = varName.replaceAll("\\.", "_DOT_");
843+
varName = MINUS.matcher(varName).replaceAll("MINUS_");
844+
varName = PLUS.matcher(varName).replaceAll("PLUS_");
845+
varName = DOT.matcher(varName).replaceAll("_DOT_");
846846
return varName;
847847
}
848848

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ public String toArrayModelParamName(String name) {
340340

341341
@Override
342342
public String toModelName(String name) {
343-
return this.packageName + "_" + underscore(name.replaceAll("-", "_").replaceAll("\\.", "_"));
343+
return this.packageName + "_" + underscore(DOT.matcher(MINUS.matcher(name).replaceAll("_")).replaceAll("_"));
344344
}
345345

346346
@Override
@@ -350,7 +350,7 @@ public String toApiName(String name) {
350350

351351
@Override
352352
public String toModelFilename(String name) {
353-
return this.packageName + "_" + underscore(name.replaceAll("\\.", "_"));
353+
return this.packageName + "_" + underscore(DOT.matcher(name).replaceAll("_"));
354354
}
355355

356356
@Override
@@ -362,11 +362,11 @@ public String toApiFilename(String name) {
362362
public String toOperationId(String operationId) {
363363
// method name cannot use reserved keyword, e.g. return
364364
if (isReservedWord(operationId)) {
365-
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, underscore(sanitizeName("call_" + operationId)).replaceAll("\\.", "_"));
365+
LOGGER.warn("{} (reserved word) cannot be used as method name. Renamed to {}", operationId, DOT.matcher(underscore(sanitizeName("call_" + operationId))).replaceAll("_"));
366366
operationId = "call_" + operationId;
367367
}
368368

369-
return underscore(operationId.replaceAll("\\.", "_"));
369+
return underscore(DOT.matcher(operationId).replaceAll("_"));
370370
}
371371

372372
@Override

0 commit comments

Comments
 (0)