(this.vendorExtensions);
}
output.hasValidation = this.hasValidation;
+ output.isNullable = this.isNullable;
output.isBinary = this.isBinary;
output.isByteArray = this.isByteArray;
output.isString = this.isString;
@@ -269,6 +271,8 @@ public class CodegenParameter {
return false;
if (hasValidation != that.hasValidation)
return false;
+ if (isNullable != that.isNullable)
+ return false;
if (required != that.required)
return false;
if (maximum != null ? !maximum.equals(that.maximum) : that.maximum != null)
@@ -344,6 +348,7 @@ public class CodegenParameter {
result = 31 * result + (mostInnerItems != null ? mostInnerItems.hashCode() : 0);
result = 31 * result + (vendorExtensions != null ? vendorExtensions.hashCode() : 0);
result = 31 * result + (hasValidation ? 13:31);
+ result = 31 * result + (isNullable ? 13:31);
result = 31 * result + (required ? 13:31);
result = 31 * result + (maximum != null ? maximum.hashCode() : 0);
result = 31 * result + (exclusiveMaximum ? 13:31);
@@ -409,6 +414,7 @@ public class CodegenParameter {
", mostInnerItems=" + mostInnerItems +
", vendorExtensions=" + vendorExtensions +
", hasValidation=" + hasValidation +
+ ", isNullable=" + isNullable +
", required=" + required +
", maximum='" + maximum + '\'' +
", exclusiveMaximum=" + exclusiveMaximum +
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 61d1ae8315..c7adcd0b36 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
@@ -24,6 +24,7 @@ import com.samskivert.mustache.Mustache.Compiler;
import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.callbacks.Callback;
import io.swagger.v3.oas.models.examples.Example;
import io.swagger.v3.oas.models.headers.Header;
import io.swagger.v3.oas.models.media.ArraySchema;
@@ -50,6 +51,7 @@ import io.swagger.v3.parser.util.SchemaTypeUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import org.openapitools.codegen.CodegenDiscriminator.MappedModel;
import org.openapitools.codegen.examples.ExampleGenerator;
import org.openapitools.codegen.serializer.SerializerUtils;
@@ -76,6 +78,11 @@ import java.util.TreeSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.openapitools.codegen.utils.StringUtils.camelize;
+import static org.openapitools.codegen.utils.StringUtils.underscore;
+import static org.openapitools.codegen.utils.StringUtils.escape;
public class DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultCodegen.class);
@@ -284,6 +291,8 @@ public class DefaultCodegen implements CodegenConfig {
enumVar.put("isString", isDataTypeString(cm.dataType));
enumVars.add(enumVar);
}
+ // if "x-enum-varnames" defined, update varnames
+ updateEnumVarsWithExtensions(enumVars, cm.getVendorExtensions());
cm.allowableValues.put("enumVars", enumVars);
}
@@ -772,7 +781,7 @@ public class DefaultCodegen implements CodegenConfig {
if (reservedWords.contains(name)) {
return escapeReservedWord(name);
} else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) {
- return escapeSpecialCharacters(name, null, null);
+ return escape(name, specialCharReplacements, null, null);
} else {
return name;
}
@@ -790,7 +799,7 @@ public class DefaultCodegen implements CodegenConfig {
if (reservedWords.contains(name)) {
return escapeReservedWord(name);
} else if (((CharSequence) name).chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character)))) {
- return escapeSpecialCharacters(name, null, null);
+ return escape(name, specialCharReplacements, null, null);
}
return name;
}
@@ -832,27 +841,19 @@ public class DefaultCodegen implements CodegenConfig {
/**
* Return the name with escaped characters.
*
- * @param name the name to be escaped
- * @param charactersToAllow characters that are not escaped
+ * @param name the name to be escaped
+ * @param charactersToAllow characters that are not escaped
* @param appdendixToReplacement String to append to replaced characters.
* @return the escaped word
*
* throws Runtime exception as word is not escaped properly.
+ * @deprecated since version 3.2.3, may be removed with the next major release (4.0)
+ * @see org.openapitools.codegen.utils.StringUtils#escape directly instead
+ *
*/
+ @Deprecated
public String escapeSpecialCharacters(String name, List charactersToAllow, String appdendixToReplacement) {
- String result = (String) ((CharSequence) name).chars().mapToObj(c -> {
- String character = "" + (char) c;
- if (charactersToAllow != null && charactersToAllow.contains(character)) {
- return character;
- } else if (specialCharReplacements.containsKey(character)) {
- return specialCharReplacements.get(character) + (appdendixToReplacement != null ? appdendixToReplacement : "");
- } else {
- return character;
- }
- }).reduce((c1, c2) -> "" + c1 + c2).orElse(null);
-
- if (result != null) return result;
- throw new RuntimeException("Word '" + name + "' could not be escaped.");
+ return escape(name, specialCharReplacements, charactersToAllow, appdendixToReplacement);
}
/**
@@ -1750,7 +1751,7 @@ public class DefaultCodegen implements CodegenConfig {
if (name == null || name.length() == 0) {
return name;
}
- return camelize(toVarName(name));
+ return org.openapitools.codegen.utils.StringUtils.camelize(toVarName(name));
}
/**
@@ -1769,7 +1770,7 @@ public class DefaultCodegen implements CodegenConfig {
CodegenProperty property = CodegenModelFactory.newInstance(CodegenModelType.PROPERTY);
property.name = toVarName(name);
property.baseName = name;
- property.nameInCamelCase = camelize(property.name, false);
+ property.nameInCamelCase = org.openapitools.codegen.utils.StringUtils.camelize(property.name, false);
property.nameInSnakeCase = CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, property.nameInCamelCase);
property.description = escapeText(p.getDescription());
property.unescapedDescription = p.getDescription();
@@ -2228,14 +2229,17 @@ public class DefaultCodegen implements CodegenConfig {
Map schemas,
OpenAPI openAPI) {
LOGGER.debug("fromOperation => operation: " + operation);
+ if (operation == null)
+ throw new RuntimeException("operation cannot be null in fromOperation");
+
CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION);
Set imports = new HashSet();
if (operation.getExtensions() != null && !operation.getExtensions().isEmpty()) {
op.vendorExtensions.putAll(operation.getExtensions());
- }
- if (operation == null)
- throw new RuntimeException("operation cannot be null in fromOperation");
+ Object isCallbackRequest = op.vendorExtensions.remove("x-callback-request");
+ op.isCallbackRequest = Boolean.TRUE.equals(isCallbackRequest);
+ }
// store the original operationId for plug-in
op.operationIdOriginal = operation.getOperationId();
@@ -2249,6 +2253,7 @@ public class DefaultCodegen implements CodegenConfig {
}
}
operationId = removeNonNameElementToCamelCase(operationId);
+
op.path = path;
op.operationId = toOperationId(operationId);
op.summary = escapeText(operation.getSummary());
@@ -2340,6 +2345,15 @@ public class DefaultCodegen implements CodegenConfig {
}
}
+ if (operation.getCallbacks() != null && !operation.getCallbacks().isEmpty()) {
+ operation.getCallbacks().forEach((name, callback) -> {
+ CodegenCallback c = fromCallback(name, callback, schemas, openAPI);
+ c.hasMore = true;
+ op.callbacks.add(c);
+ });
+ op.callbacks.get(op.callbacks.size() - 1).hasMore = false;
+ }
+
List parameters = operation.getParameters();
List allParams = new ArrayList();
List bodyParams = new ArrayList();
@@ -2617,6 +2631,79 @@ public class DefaultCodegen implements CodegenConfig {
return r;
}
+ /**
+ * Convert OAS Callback object to Codegen Callback object
+ *
+ * @param name callback name
+ * @param callback OAS Callback object
+ * @param schemas a map of OAS models
+ * @param openAPI a OAS object representing the spec
+ * @return Codegen Response object
+ */
+ public CodegenCallback fromCallback(String name, Callback callback, Map schemas, OpenAPI openAPI) {
+ CodegenCallback c = new CodegenCallback();
+ c.name = name;
+
+ if (callback.getExtensions() != null && !callback.getExtensions().isEmpty()) {
+ c.vendorExtensions.putAll(callback.getExtensions());
+ }
+
+ callback.forEach((expression, pi) -> {
+ CodegenCallback.Url u = new CodegenCallback.Url();
+ u.expression = expression;
+ u.hasMore = true;
+
+ if (pi.getExtensions() != null && !pi.getExtensions().isEmpty()) {
+ u.vendorExtensions.putAll(pi.getExtensions());
+ }
+
+ Stream.of(
+ Pair.of("get", pi.getGet()),
+ Pair.of("head", pi.getHead()),
+ Pair.of("put", pi.getPut()),
+ Pair.of("post", pi.getPost()),
+ Pair.of("delete", pi.getDelete()),
+ Pair.of("patch", pi.getPatch()),
+ Pair.of("options", pi.getOptions()))
+ .filter(p -> p.getValue() != null)
+ .forEach(p -> {
+ String method = p.getKey();
+ Operation op = p.getValue();
+
+ boolean genId = op.getOperationId() == null;
+ if (genId) {
+ op.setOperationId(getOrGenerateOperationId(op, c.name+"_"+expression.replaceAll("\\{\\$.*}", ""), method));
+ }
+
+ if (op.getExtensions() == null) {
+ op.setExtensions(new HashMap<>());
+ }
+ // This extension will be removed later by `fromOperation()` as it is only needed here to
+ // distinguish between normal operations and callback requests
+ op.getExtensions().put("x-callback-request", true);
+
+ CodegenOperation co = fromOperation(expression, method, op, schemas, openAPI);
+ if (genId) {
+ co.operationIdOriginal = null;
+ // legacy (see `fromOperation()`)
+ co.nickname = co.operationId;
+ }
+ u.requests.add(co);
+ });
+
+ if (!u.requests.isEmpty()) {
+ u.requests.get(u.requests.size() - 1).hasMore = false;
+ }
+ c.urls.add(u);
+ });
+
+ if (!c.urls.isEmpty()) {
+ c.urls.get(c.urls.size() - 1).hasMore = false;
+ }
+
+ return c;
+ }
+
/**
* Convert OAS Parameter object to Codegen Parameter object
*
@@ -2649,6 +2736,11 @@ public class DefaultCodegen implements CodegenConfig {
LOGGER.warn("warning! Schema not found for parameter \"" + parameter.getName() + "\", using String");
parameterSchema = new StringSchema().description("//TODO automatically added by openapi-generator due to missing type definition.");
}
+
+ if (Boolean.TRUE.equals(parameterSchema.getNullable())) { // use nullable defined in the spec
+ codegenParameter.isNullable = true;
+ }
+
// set default value
if (parameterSchema.getDefault() != null) {
codegenParameter.defaultValue = toDefaultValue(parameterSchema);
@@ -3139,8 +3231,8 @@ public class DefaultCodegen implements CodegenConfig {
}
co.operationId = uniqueName;
co.operationIdLowerCase = uniqueName.toLowerCase(Locale.ROOT);
- co.operationIdCamelCase = DefaultCodegen.camelize(uniqueName);
- co.operationIdSnakeCase = DefaultCodegen.underscore(uniqueName);
+ co.operationIdCamelCase = org.openapitools.codegen.utils.StringUtils.camelize(uniqueName);
+ co.operationIdSnakeCase = org.openapitools.codegen.utils.StringUtils.underscore(uniqueName);
opList.add(co);
co.baseName = tag;
}
@@ -3169,23 +3261,12 @@ public class DefaultCodegen implements CodegenConfig {
*
* @param word The word
* @return The underscored version of the word
+ * @deprecated since version 3.2.3, may be removed with the next major release (4.0)
+ * @see org.openapitools.codegen.utils.StringUtils#underscore
*/
+ @Deprecated
public static String underscore(String word) {
- String firstPattern = "([A-Z]+)([A-Z][a-z])";
- String secondPattern = "([a-z\\d])([A-Z])";
- String replacementPattern = "$1_$2";
- // Replace package separator with slash.
- word = word.replaceAll("\\.", "/"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
- // Replace $ with two underscores for inner classes.
- word = word.replaceAll("\\$", "__");
- // Replace capital letter with _ plus lowercase letter.
- word = word.replaceAll(firstPattern, replacementPattern);
- word = word.replaceAll(secondPattern, replacementPattern);
- word = word.replace('-', '_');
- // replace space with underscore
- word = word.replace(' ', '_');
- word = word.toLowerCase(Locale.ROOT);
- return word;
+ return org.openapitools.codegen.utils.StringUtils.underscore(word);
}
/**
@@ -3193,10 +3274,13 @@ public class DefaultCodegen implements CodegenConfig {
*
* @param word The word
* @return The dashized version of the word, e.g. "my-name"
+ * @deprecated since version 3.2.3, may be removed with the next major release (4.0)
+ * @see org.openapitools.codegen.utils.StringUtils#dashize
*/
@SuppressWarnings("static-method")
+ @Deprecated
protected String dashize(String word) {
- return underscore(word).replaceAll("[_ ]", "-");
+ return org.openapitools.codegen.utils.StringUtils.dashize(word);
}
/**
@@ -3396,6 +3480,7 @@ public class DefaultCodegen implements CodegenConfig {
return result;
}
+
/**
* Camelize name (parameter, property, method, etc) with upper case for first letter
* copied from Twitter elephant bird
@@ -3403,9 +3488,12 @@ public class DefaultCodegen implements CodegenConfig {
*
* @param word string to be camelize
* @return camelized string
+ * @deprecated since version 3.2.3, may be removed with the next major release (4.0)
+ * @see org.openapitools.codegen.utils.StringUtils#camelize(String)
*/
+ @Deprecated
public static String camelize(String word) {
- return camelize(word, false);
+ return org.openapitools.codegen.utils.StringUtils.camelize(word);
}
/**
@@ -3414,80 +3502,15 @@ public class DefaultCodegen implements CodegenConfig {
* @param word string to be camelize
* @param lowercaseFirstLetter lower case for first letter if set to true
* @return camelized string
+ * @deprecated since version 3.2.3, may be removed with the next major release (4.0)
+ * @see org.openapitools.codegen.utils.StringUtils#camelize(String, boolean)
*/
+ @Deprecated
public static String camelize(String word, boolean lowercaseFirstLetter) {
- // Replace all slashes with dots (package separator)
- Pattern p = Pattern.compile("\\/(.?)");
- Matcher m = p.matcher(word);
- while (m.find()) {
- word = m.replaceFirst("." + m.group(1)/*.toUpperCase(Locale.ROOT)*/); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
- m = p.matcher(word);
- }
-
- // case out dots
- String[] parts = word.split("\\.");
- StringBuilder f = new StringBuilder();
- for (String z : parts) {
- if (z.length() > 0) {
- f.append(Character.toUpperCase(z.charAt(0))).append(z.substring(1));
- }
- }
- word = f.toString();
-
- m = p.matcher(word);
- while (m.find()) {
- word = m.replaceFirst("" + Character.toUpperCase(m.group(1).charAt(0)) + m.group(1).substring(1)/*.toUpperCase(Locale.ROOT)*/);
- m = p.matcher(word);
- }
-
- // Uppercase the class name.
- p = Pattern.compile("(\\.?)(\\w)([^\\.]*)$");
- m = p.matcher(word);
- if (m.find()) {
- String rep = m.group(1) + m.group(2).toUpperCase(Locale.ROOT) + m.group(3);
- rep = rep.replaceAll("\\$", "\\\\\\$");
- word = m.replaceAll(rep);
- }
-
- // Remove all underscores (underscore_case to camelCase)
- p = Pattern.compile("(_)(.)");
- m = p.matcher(word);
- while (m.find()) {
- String original = m.group(2);
- String upperCase = original.toUpperCase(Locale.ROOT);
- if (original.equals(upperCase)) {
- word = word.replaceFirst("_", "");
- } else {
- word = m.replaceFirst(upperCase);
- }
- m = p.matcher(word);
- }
-
- // Remove all hyphens (hyphen-case to camelCase)
- p = Pattern.compile("(-)(.)");
- m = p.matcher(word);
- while (m.find()) {
- word = m.replaceFirst(m.group(2).toUpperCase(Locale.ROOT));
- m = p.matcher(word);
- }
-
- if (lowercaseFirstLetter && word.length() > 0) {
- int i = 0;
- char charAt = word.charAt(i);
- while (i + 1 < word.length() && !((charAt >= 'a' && charAt <= 'z') || (charAt >= 'A' && charAt <= 'Z'))) {
- i = i + 1;
- charAt = word.charAt(i);
- }
- i = i + 1;
- word = word.substring(0, i).toLowerCase(Locale.ROOT) + word.substring(i);
- }
-
- // remove all underscore
- word = word.replaceAll("_", "");
-
- return word;
+ return org.openapitools.codegen.utils.StringUtils.camelize(word, lowercaseFirstLetter);
}
+
public String apiFilename(String templateName, String tag) {
String suffix = apiTemplateFiles().get(templateName);
return apiFileFolder() + File.separator + toApiFilename(tag) + suffix;
@@ -3902,6 +3925,8 @@ public class DefaultCodegen implements CodegenConfig {
enumVar.put("isString", isDataTypeString(dataType));
enumVars.add(enumVar);
}
+ // if "x-enum-varnames" defined, update varnames
+ updateEnumVarsWithExtensions(enumVars, var.getVendorExtensions());
allowableValues.put("enumVars", enumVars);
// handle default value for enum, e.g. available => StatusEnum.AVAILABLE
@@ -3919,6 +3944,16 @@ public class DefaultCodegen implements CodegenConfig {
}
}
+ private void updateEnumVarsWithExtensions(List> enumVars, Map vendorExtensions) {
+ if (vendorExtensions != null && vendorExtensions.containsKey("x-enum-varnames")) {
+ List alias = (List) vendorExtensions.get("x-enum-varnames");
+ int size = Math.min(enumVars.size(), alias.size());
+ for (int i = 0; i < size; i++) {
+ enumVars.get(i).put("name", alias.get(i));
+ }
+ }
+ }
+
/**
* If the pattern misses the delimiter, add "/" to the beginning and end
* Otherwise, return the original pattern
@@ -4265,6 +4300,9 @@ public class DefaultCodegen implements CodegenConfig {
// default to csv:
codegenParameter.collectionFormat = StringUtils.isEmpty(collectionFormat) ? "csv" : collectionFormat;
+ // set nullable
+ setParameterNullable(codegenParameter, codegenProperty);
+
// recursively add import
while (codegenProperty != null) {
imports.add(codegenProperty.baseType);
@@ -4293,7 +4331,7 @@ public class DefaultCodegen implements CodegenConfig {
public CodegenParameter fromFormProperty(String name, Schema propertySchema, Set imports) {
CodegenParameter codegenParameter = CodegenModelFactory.newInstance(CodegenModelType.PARAMETER);
- LOGGER.debug("Debugging fromFormProperty: " + name);
+ LOGGER.debug("Debugging fromFormProperty {}: {}", name, propertySchema);
CodegenProperty codegenProperty = fromProperty(name, propertySchema);
codegenParameter.isFormParam = Boolean.TRUE;
@@ -4307,7 +4345,6 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.jsonSchema = Json.pretty(propertySchema);
codegenParameter.defaultValue = codegenProperty.getDefaultValue();
-
if (codegenProperty.getVendorExtensions() != null && !codegenProperty.getVendorExtensions().isEmpty()) {
codegenParameter.vendorExtensions = codegenProperty.getVendorExtensions();
}
@@ -4366,6 +4403,8 @@ public class DefaultCodegen implements CodegenConfig {
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
setParameterExampleValue(codegenParameter);
+ // set nullable
+ setParameterNullable(codegenParameter, codegenProperty);
//TODO collectionFormat for form parameter not yet supported
//codegenParameter.collectionFormat = getCollectionFormat(propertySchema);
@@ -4415,6 +4454,9 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.isMapContainer = Boolean.TRUE;
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
+
+ // set nullable
+ setParameterNullable(codegenParameter, codegenProperty);
} else if (ModelUtils.isArraySchema(schema)) {
final ArraySchema arraySchema = (ArraySchema) schema;
Schema inner = arraySchema.getItems();
@@ -4454,6 +4496,8 @@ public class DefaultCodegen implements CodegenConfig {
codegenParameter.isListContainer = Boolean.TRUE;
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
+ // set nullable
+ setParameterNullable(codegenParameter, codegenProperty);
while (codegenProperty != null) {
imports.add(codegenProperty.baseType);
@@ -4516,6 +4560,8 @@ public class DefaultCodegen implements CodegenConfig {
}
}
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
+ // set nullable
+ setParameterNullable(codegenParameter, codegenProperty);
}
} else {
@@ -4539,6 +4585,8 @@ public class DefaultCodegen implements CodegenConfig {
}
setParameterBooleanFlagWithCodegenProperty(codegenParameter, codegenProperty);
+ // set nullable
+ setParameterNullable(codegenParameter, codegenProperty);
}
// set the parameter's example value
@@ -4636,4 +4684,8 @@ public class DefaultCodegen implements CodegenConfig {
}
return codegenServerVariables;
}
+
+ private void setParameterNullable(CodegenParameter parameter, CodegenProperty property) {
+ parameter.isNullable = property.isNullable;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
index d15b57315d..b395b739ad 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractAdaCodegen.java
@@ -44,6 +44,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+
abstract public class AbstractAdaCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAdaCodegen.class);
@@ -619,7 +620,7 @@ abstract public class AbstractAdaCodegen extends DefaultCodegen implements Codeg
}
}
}
- authMethod.name = camelize(sanitizeName(authMethod.name), true);
+ authMethod.name = org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(authMethod.name), true);
}
}
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
index 3968eaaca5..54abf6168e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
@@ -36,6 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
public abstract class AbstractApexCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractApexCodegen.class);
@@ -112,7 +113,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name, true);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -159,7 +160,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
// camelize the model name
// phone_number => PhoneNumber
- final String camelizedName = camelize(nameWithPrefixSuffix);
+ final String camelizedName = org.openapitools.codegen.utils.StringUtils.camelize(nameWithPrefixSuffix);
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(camelizedName)) {
@@ -422,11 +423,11 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId), true);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = org.openapitools.codegen.utils.StringUtils.camelize("call_" + operationId, true);
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
return newOperationId;
}
@@ -515,7 +516,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
@Override
public String toEnumName(CodegenProperty property) {
- return sanitizeName(camelize(property.name)) + "Enum";
+ return sanitizeName(org.openapitools.codegen.utils.StringUtils.camelize(property.name)) + "Enum";
}
@Override
@@ -669,7 +670,7 @@ public abstract class AbstractApexCodegen extends DefaultCodegen implements Code
@Override
public String sanitizeTag(String tag) {
- return camelize(sanitizeName(tag));
+ return org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(tag));
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index 92c9f53606..2e99417e93 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+
public abstract class AbstractCSharpCodegen extends DefaultCodegen implements CodegenConfig {
protected boolean optionalAssemblyInfoFlag = true;
@@ -600,17 +601,17 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId)));
+ LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName("call_" + operationId)));
operationId = "call_" + operationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId)));
+ LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName("call_" + operationId)));
operationId = "call_" + operationId;
}
- return camelize(sanitizeName(operationId));
+ return org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId));
}
@Override
@@ -625,7 +626,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// camelize the variable name
// pet_id => PetId
- name = camelize(name);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -648,9 +649,9 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
return name;
}
- // camelize(lower) the variable name
+ // org.openapitools.codegen.utils.StringUtils.camelize(lower) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name, true);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -836,19 +837,19 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(name)) {
- LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+ LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize("model_" + name));
name = "model_" + name; // e.g. return => ModelReturn (after camelize)
}
// model name starts with number
if (name.matches("^\\d.*")) {
- LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+ LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize("model_" + name));
name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
}
// camelize the model name
// phone_number => PhoneNumber
- return camelize(name);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name);
}
@Override
@@ -936,7 +937,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
// for symbol, e.g. $, #
if (getSymbolName(name) != null) {
- return camelize(getSymbolName(name));
+ return org.openapitools.codegen.utils.StringUtils.camelize(getSymbolName(name));
}
String enumName = sanitizeName(name);
@@ -944,7 +945,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
enumName = enumName.replaceFirst("^_", "");
enumName = enumName.replaceFirst("_$", "");
- enumName = camelize(enumName) + "Enum";
+ enumName = org.openapitools.codegen.utils.StringUtils.camelize(enumName) + "Enum";
if (enumName.matches("\\d.*")) { // starts with number
return "_" + enumName;
@@ -955,7 +956,7 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
@Override
public String toEnumName(CodegenProperty property) {
- return sanitizeName(camelize(property.name)) + "Enum";
+ return sanitizeName(org.openapitools.codegen.utils.StringUtils.camelize(property.name)) + "Enum";
}
public String testPackageName() {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
index 116a27d1ca..a9ad50d4b6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractEiffelCodegen.java
@@ -17,6 +17,8 @@
package org.openapitools.codegen.languages;
+import static com.google.common.base.Strings.isNullOrEmpty;
+
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import io.swagger.v3.core.util.Json;
@@ -204,7 +206,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
// (after camelize)
}
- return underscore(name);
+ return org.openapitools.codegen.utils.StringUtils.underscore(name);
}
@Override
@@ -215,7 +217,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
// methods parameters as 'final'.
// e.g. PetApi.go => pet_api.go
- return underscore(name) + "_api";
+ return org.openapitools.codegen.utils.StringUtils.underscore(name) + "_api";
}
@Override
@@ -333,7 +335,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(sanitizedOperationId)) {
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to "
- + camelize("call_" + operationId));
+ + org.openapitools.codegen.utils.StringUtils.camelize("call_" + operationId));
sanitizedOperationId = "call_" + sanitizedOperationId;
}
// method name from updateSomething to update_Something.
@@ -351,7 +353,7 @@ public abstract class AbstractEiffelCodegen extends DefaultCodegen implements Co
for (CodegenOperation operation : operations) {
// http method verb conversion (e.g. PUT => Put)
- operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
+ operation.httpMethod = org.openapitools.codegen.utils.StringUtils.camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
}
// remove model imports to avoid error
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index e6d60a99df..3a274341d5 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -134,7 +134,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
if (this.reservedWordsMappings().containsKey(name)) {
return this.reservedWordsMappings().get(name);
}
- return camelize(name) + '_';
+ return org.openapitools.codegen.utils.StringUtils.camelize(name) + '_';
}
@Override
@@ -149,7 +149,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
// camelize (lower first character) the variable name
// pet_id => PetId
- name = camelize(name);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name);
// for reserved word append _
if (isReservedWord(name)) {
@@ -174,7 +174,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
// params should be lowerCamelCase. E.g. "person Person", instead of
// "Person Person".
//
- name = camelize(toVarName(name), true);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(toVarName(name), true);
// REVISIT: Actually, for idiomatic go, the param name should
// really should just be a letter, e.g. "p Person"), but we'll get
@@ -191,7 +191,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
public String toModelName(String name) {
// camelize the model name
// phone_number => PhoneNumber
- return camelize(toModel(name));
+ return org.openapitools.codegen.utils.StringUtils.camelize(toModel(name));
}
@Override
@@ -228,7 +228,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
}
- return underscore(name);
+ return org.openapitools.codegen.utils.StringUtils.underscore(name);
}
@Override
@@ -237,7 +237,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
// e.g. PetApi.go => pet_api.go
- name = "api_" + underscore(name);
+ name = "api_" + org.openapitools.codegen.utils.StringUtils.underscore(name);
if (name.endsWith("_test")) {
LOGGER.warn(name + ".go with `_test.go` suffix (reserved word) cannot be used as filename. Renamed to " + name + "_.go");
name += "_";
@@ -308,17 +308,17 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(sanitizedOperationId)) {
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to "
- + camelize("call_" + sanitizedOperationId));
+ + org.openapitools.codegen.utils.StringUtils.camelize("call_" + sanitizedOperationId));
sanitizedOperationId = "call_" + sanitizedOperationId;
}
// operationId starts with a number
if (sanitizedOperationId.matches("^\\d.*")) {
- LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize("call_" + sanitizedOperationId));
+ LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize("call_" + sanitizedOperationId));
sanitizedOperationId = "call_" + sanitizedOperationId;
}
- return camelize(sanitizedOperationId);
+ return org.openapitools.codegen.utils.StringUtils.camelize(sanitizedOperationId);
}
@Override
@@ -329,7 +329,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
List operations = (List) objectMap.get("operation");
for (CodegenOperation operation : operations) {
// http method verb conversion (e.g. PUT => Put)
- operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
+ operation.httpMethod = org.openapitools.codegen.utils.StringUtils.camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
}
// remove model imports to avoid error
@@ -560,7 +560,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
}
// string
- String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
+ String enumName = sanitizeName(org.openapitools.codegen.utils.StringUtils.underscore(name).toUpperCase(Locale.ROOT));
enumName = enumName.replaceFirst("^_", "");
enumName = enumName.replaceFirst("_$", "");
@@ -575,7 +575,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
@Override
public String toEnumName(CodegenProperty property) {
- String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
+ String enumName = org.openapitools.codegen.utils.StringUtils.underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
// remove [] for array or map of enum
enumName = enumName.replace("[]", "");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index eb0d56a947..ed83be48a3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -53,6 +53,9 @@ import java.util.Locale;
import java.util.Map;
import java.util.regex.Pattern;
+import static org.openapitools.codegen.utils.StringUtils.escape;
+
+
public abstract class AbstractJavaCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractJavaCodegen.class);
@@ -552,7 +555,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
if (name.length() == 0) {
return "DefaultApi";
}
- return camelize(name) + "Api";
+ return org.openapitools.codegen.utils.StringUtils.camelize(name) + "Api";
}
@Override
@@ -587,12 +590,12 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
List allowedCharacters = new ArrayList<>();
allowedCharacters.add("_");
allowedCharacters.add("$");
- name = escapeSpecialCharacters(name, allowedCharacters, "_");
+ name = escape(name, specialCharReplacements, allowedCharacters, "_");
}
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name, true);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -644,7 +647,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
// camelize the model name
// phone_number => PhoneNumber
- final String camelizedName = camelize(nameWithPrefixSuffix);
+ final String camelizedName = org.openapitools.codegen.utils.StringUtils.camelize(nameWithPrefixSuffix);
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(camelizedName)) {
@@ -876,19 +879,19 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId), true);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = org.openapitools.codegen.utils.StringUtils.camelize("call_" + operationId, true);
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
return newOperationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
- operationId = camelize("call_" + operationId, true);
+ LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize("call_" + operationId), true);
+ operationId = org.openapitools.codegen.utils.StringUtils.camelize("call_" + operationId, true);
}
return operationId;
@@ -1039,7 +1042,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
@Override
public String toEnumName(CodegenProperty property) {
- return sanitizeName(camelize(property.name)) + "Enum";
+ return sanitizeName(org.openapitools.codegen.utils.StringUtils.camelize(property.name)) + "Enum";
}
@Override
@@ -1335,7 +1338,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
@Override
public String sanitizeTag(String tag) {
- tag = camelize(underscore(sanitizeName(tag)));
+ tag = org.openapitools.codegen.utils.StringUtils.camelize(org.openapitools.codegen.utils.StringUtils.underscore(sanitizeName(tag)));
// tag starts with numbers
if (tag.matches("^\\d.*")) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
index e24b1e7bd7..b57ca9e244 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java
@@ -40,6 +40,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen implements BeanValidationFeatures {
public static final String SERVER_PORT = "serverPort";
/**
@@ -250,7 +251,7 @@ public abstract class AbstractJavaJAXRSServerCodegen extends AbstractJavaCodegen
return "DefaultApi";
}
computed = sanitizeName(computed);
- return camelize(computed) + "Api";
+ return org.openapitools.codegen.utils.StringUtils.camelize(computed) + "Api";
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 774c96fe33..37c5124c9f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -19,6 +19,7 @@ package org.openapitools.codegen.languages;
import io.swagger.v3.oas.models.media.ArraySchema;
import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
import org.openapitools.codegen.CliOption;
import org.openapitools.codegen.CodegenConfig;
import org.openapitools.codegen.CodegenConstants;
@@ -28,11 +29,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
+
public abstract class AbstractKotlinCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractKotlinCodegen.class);
@@ -55,6 +53,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
languageSpecificPrimitives = new HashSet(Arrays.asList(
"kotlin.Byte",
+ "kotlin.ByteArray",
"kotlin.Short",
"kotlin.Int",
"kotlin.Long",
@@ -139,6 +138,7 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
defaultIncludes = new HashSet(Arrays.asList(
"kotlin.Byte",
+ "kotlin.ByteArray",
"kotlin.Short",
"kotlin.Int",
"kotlin.Long",
@@ -159,21 +159,22 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
typeMapping.put("float", "kotlin.Float");
typeMapping.put("long", "kotlin.Long");
typeMapping.put("double", "kotlin.Double");
+ typeMapping.put("ByteArray", "kotlin.ByteArray");
typeMapping.put("number", "java.math.BigDecimal");
typeMapping.put("date-time", "java.time.LocalDateTime");
typeMapping.put("date", "java.time.LocalDateTime");
typeMapping.put("file", "java.io.File");
typeMapping.put("array", "kotlin.Array");
- typeMapping.put("list", "kotlin.Array");
+ typeMapping.put("list", "kotlin.collections.List");
typeMapping.put("map", "kotlin.collections.Map");
typeMapping.put("object", "kotlin.Any");
typeMapping.put("binary", "kotlin.Array");
typeMapping.put("Date", "java.time.LocalDateTime");
typeMapping.put("DateTime", "java.time.LocalDateTime");
- instantiationTypes.put("array", "arrayOf");
- instantiationTypes.put("list", "arrayOf");
- instantiationTypes.put("map", "mapOf");
+ instantiationTypes.put("array", "kotlin.arrayOf");
+ instantiationTypes.put("list", "kotlin.arrayOf");
+ instantiationTypes.put("map", "kotlin.mapOf");
importMapping = new HashMap();
importMapping.put("BigDecimal", "java.math.BigDecimal");
@@ -400,16 +401,16 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
break;
case camelCase:
// NOTE: Removes hyphens and underscores
- modified = camelize(modified, true);
+ modified = org.openapitools.codegen.utils.StringUtils.camelize(modified, true);
break;
case PascalCase:
// NOTE: Removes hyphens and underscores
- String result = camelize(modified);
+ String result = org.openapitools.codegen.utils.StringUtils.camelize(modified);
modified = titleCase(result);
break;
case snake_case:
// NOTE: Removes hyphens
- modified = underscore(modified);
+ modified = org.openapitools.codegen.utils.StringUtils.underscore(modified);
break;
case UPPERCASE:
modified = modified.toUpperCase(Locale.ROOT);
@@ -471,15 +472,55 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
modifiedName = sanitizeKotlinSpecificNames(modifiedName);
// Camelize name of nested properties
- modifiedName = camelize(modifiedName);
+ modifiedName = org.openapitools.codegen.utils.StringUtils.camelize(modifiedName);
- if (reservedWords.contains(modifiedName)) {
- modifiedName = escapeReservedWord(modifiedName);
+ // model name cannot use reserved keyword, e.g. return
+ if (isReservedWord(modifiedName)) {
+ final String modelName = "Model" + modifiedName;
+ LOGGER.warn(modifiedName + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+ return modelName;
+ }
+
+ // model name starts with number
+ if (modifiedName.matches("^\\d.*")) {
+ final String modelName = "Model" + modifiedName; // e.g. 200Response => Model200Response (after camelize)
+ LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+ return modelName;
}
return titleCase(modifiedName);
}
+ /**
+ * Return the operation ID (method name)
+ *
+ * @param operationId operation ID
+ * @return the sanitized method name
+ */
+ @Override
+ public String toOperationId(String operationId) {
+ // throw exception if method name is empty
+ if (StringUtils.isEmpty(operationId))
+ throw new RuntimeException("Empty method/operation name (operationId) not allowed");
+
+ operationId = camelize(sanitizeName(operationId), true);
+
+ // method name cannot use reserved keyword, e.g. return
+ if (isReservedWord(operationId)) {
+ String newOperationId = camelize("call_" + operationId, true);
+ LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
+ return newOperationId;
+ }
+
+ // operationId starts with a number
+ if (operationId.matches("^\\d.*")) {
+ LOGGER.warn(operationId + " (starting with a number) cannot be used as method sname. Renamed to " + camelize("call_" + operationId), true);
+ operationId = camelize("call_" + operationId, true);
+ }
+
+ return operationId;
+ }
+
@Override
public String toModelFilename(String name) {
// Should be the same as the model name
@@ -577,4 +618,70 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co
public boolean isDataTypeString(final String dataType) {
return "String".equals(dataType) || "kotlin.String".equals(dataType);
}
+
+ @Override
+ public String toParamName(String name) {
+ // to avoid conflicts with 'callback' parameter for async call
+ if ("callback".equals(name)) {
+ return "paramCallback";
+ }
+
+ // should be the same as variable name
+ return toVarName(name);
+ }
+
+ @Override
+ public String toVarName(String name) {
+ // sanitize name
+ name = sanitizeName(name, "\\W-[\\$]");
+
+ if (name.toLowerCase(Locale.ROOT).matches("^_*class$")) {
+ return "propertyClass";
+ }
+
+ if ("_".equals(name)) {
+ name = "_u";
+ }
+
+ // if it's all uppper case, do nothing
+ if (name.matches("^[A-Z_]*$")) {
+ return name;
+ }
+
+ if (startsWithTwoUppercaseLetters(name)) {
+ name = name.substring(0, 2).toLowerCase(Locale.ROOT) + name.substring(2);
+ }
+
+ // If name contains special chars -> replace them.
+ if ((name.chars().anyMatch(character -> specialCharReplacements.keySet().contains("" + ((char) character))))) {
+ List allowedCharacters = new ArrayList<>();
+ allowedCharacters.add("_");
+ allowedCharacters.add("$");
+ name = escapeSpecialCharacters(name, allowedCharacters, "_");
+ }
+
+ // camelize (lower first character) the variable name
+ // pet_id => petId
+ name = camelize(name, true);
+
+ // for reserved word or word starting with number or containing dollar symbol, escape it
+ if (isReservedWord(name) || name.matches("(^\\d.*)|(.*[$].*)")) {
+ name = escapeReservedWord(name);
+ }
+
+ return name;
+ }
+
+ @Override
+ public String toRegularExpression(String pattern) {
+ return escapeText(pattern);
+ }
+
+ private boolean startsWithTwoUppercaseLetters(String name) {
+ boolean startsWithTwoUppercaseLetters = false;
+ if (name.length() > 1) {
+ startsWithTwoUppercaseLetters = name.substring(0, 2).equals(name.substring(0, 2).toUpperCase(Locale.ROOT));
+ }
+ return startsWithTwoUppercaseLetters;
+ }
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
index 98161179c1..2b27fdbae1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPhpCodegen.java
@@ -40,6 +40,12 @@ import java.util.Locale;
import java.util.Map;
import java.util.regex.Matcher;
+import org.apache.commons.lang3.StringUtils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
public abstract class AbstractPhpCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPhpCodegen.class);
@@ -408,11 +414,11 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
if ("camelCase".equals(variableNamingConvention)) {
// return the name in camelCase style
// phone_number => phoneNumber
- name = camelize(name, true);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name, true);
} else { // default to snake case
// return the name in underscore style
// PhoneNumber => phone_number
- name = underscore(name);
+ name = org.openapitools.codegen.utils.StringUtils.underscore(name);
}
// parameter name starting with number won't compile
@@ -443,13 +449,13 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
// model name cannot use reserved keyword
if (isReservedWord(name)) {
- LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + camelize("model_" + name));
+ LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize("model_" + name));
name = "model_" + name; // e.g. return => ModelReturn (after camelize)
}
// model name starts with number
if (name.matches("^\\d.*")) {
- LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + camelize("model_" + name));
+ LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize("model_" + name));
name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
}
@@ -466,7 +472,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
// camelize the model name
// phone_number => PhoneNumber
- return camelize(name);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name);
}
@Override
@@ -490,17 +496,17 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+ LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName("call_" + operationId), true));
operationId = "call_" + operationId;
}
// operationId starts with a number
if (operationId.matches("^\\d.*")) {
- LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + camelize(sanitizeName("call_" + operationId), true));
+ LOGGER.warn(operationId + " (starting with a number) cannot be used as method name. Renamed to " + org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName("call_" + operationId), true));
operationId = "call_" + operationId;
}
- return camelize(sanitizeName(operationId), true);
+ return org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId), true);
}
/**
@@ -638,7 +644,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
}
// string
- String enumName = sanitizeName(underscore(name).toUpperCase(Locale.ROOT));
+ String enumName = sanitizeName(org.openapitools.codegen.utils.StringUtils.underscore(name).toUpperCase(Locale.ROOT));
enumName = enumName.replaceFirst("^_", "");
enumName = enumName.replaceFirst("_$", "");
@@ -651,7 +657,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
@Override
public String toEnumName(CodegenProperty property) {
- String enumName = underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
+ String enumName = org.openapitools.codegen.utils.StringUtils.underscore(toModelName(property.name)).toUpperCase(Locale.ROOT);
// remove [] for array or map of enum
enumName = enumName.replace("[]", "");
@@ -676,7 +682,7 @@ public abstract class AbstractPhpCodegen extends DefaultCodegen implements Codeg
for (CodegenOperation op : operationList) {
// for API test method name
// e.g. public function test{{vendorExtensions.x-testOperationId}}()
- op.vendorExtensions.put("x-testOperationId", camelize(op.operationId));
+ op.vendorExtensions.put("x-testOperationId", org.openapitools.codegen.utils.StringUtils.camelize(op.operationId));
}
return objs;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
index b26a99dd43..c977c7cb89 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractRubyCodegen.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.Locale;
+
abstract class AbstractRubyCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRubyCodegen.class);
@@ -123,7 +124,7 @@ abstract class AbstractRubyCodegen extends DefaultCodegen implements CodegenConf
// camelize (lower first character) the variable name
// petId => pet_id
- name = underscore(name);
+ name = org.openapitools.codegen.utils.StringUtils.underscore(name);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -143,12 +144,12 @@ abstract class AbstractRubyCodegen extends DefaultCodegen implements CodegenConf
public String toOperationId(String operationId) {
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = underscore("call_" + operationId);
+ String newOperationId = org.openapitools.codegen.utils.StringUtils.underscore("call_" + operationId);
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
return newOperationId;
}
- return underscore(operationId);
+ return org.openapitools.codegen.utils.StringUtils.underscore(operationId);
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
index 05b9f4dea4..80528f08ff 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractScalaCodegen.java
@@ -35,6 +35,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
public abstract class AbstractScalaCodegen extends DefaultCodegen {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractScalaCodegen.class);
@@ -273,7 +274,7 @@ public abstract class AbstractScalaCodegen extends DefaultCodegen {
}
protected String formatIdentifier(String name, boolean capitalized) {
- String identifier = camelize(sanitizeName(name), true);
+ String identifier = org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(name), true);
if (capitalized) {
identifier = StringUtils.capitalize(identifier);
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
index 491fdf0b03..313588199f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+
public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractTypeScriptClientCodegen.class);
@@ -191,27 +192,27 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(name)) {
- String modelName = camelize("model_" + name);
+ String modelName = org.openapitools.codegen.utils.StringUtils.camelize("model_" + name);
LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
return modelName;
}
// model name starts with number
if (name.matches("^\\d.*")) {
- String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
+ String modelName = org.openapitools.codegen.utils.StringUtils.camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
return modelName;
}
if (languageSpecificPrimitives.contains(name)) {
- String modelName = camelize("model_" + name);
+ String modelName = org.openapitools.codegen.utils.StringUtils.camelize("model_" + name);
LOGGER.warn(name + " (model name matches existing language type) cannot be used as a model name. Renamed to " + modelName);
return modelName;
}
// camelize the model name
// phone_number => PhoneNumber
- return camelize(name);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name);
}
@Override
@@ -375,10 +376,10 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
// method name cannot use reserved keyword, e.g. return
// append _ at the beginning, e.g. _return
if (isReservedWord(operationId)) {
- return escapeReservedWord(camelize(sanitizeName(operationId), true));
+ return escapeReservedWord(org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId), true));
}
- return camelize(sanitizeName(operationId), true);
+ return org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId), true);
}
public void setModelPropertyNaming(String naming) {
@@ -401,11 +402,11 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name, true);
case PascalCase:
- return camelize(name);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name);
case snake_case:
- return underscore(name);
+ return org.openapitools.codegen.utils.StringUtils.underscore(name);
default:
throw new IllegalArgumentException("Invalid model property naming '" +
name + "'. Must be 'original', 'camelCase', " +
@@ -436,7 +437,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
// for symbol, e.g. $, #
if (getSymbolName(name) != null) {
- return camelize(getSymbolName(name));
+ return org.openapitools.codegen.utils.StringUtils.camelize(getSymbolName(name));
}
// number
@@ -456,7 +457,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
// camelize the enum variable name
// ref: https://basarat.gitbooks.io/typescript/content/docs/enums.html
- enumName = camelize(enumName);
+ enumName = org.openapitools.codegen.utils.StringUtils.camelize(enumName);
if (enumName.matches("\\d.*")) { // starts with number
return "_" + enumName;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
index ea267ac8cb..6c2a10ce57 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AndroidClientCodegen.java
@@ -36,6 +36,7 @@ import java.io.File;
import java.util.Arrays;
import java.util.HashSet;
+
public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(AndroidClientCodegen.class);
public static final String USE_ANDROID_MAVEN_GRADLE_PLUGIN = "useAndroidMavenGradlePlugin";
@@ -228,7 +229,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
// camelize (lower first character) the variable name
// pet_id => petId
- name = camelize(name, true);
+ name = org.openapitools.codegen.utils.StringUtils.camelize(name, true);
// for reserved word or word starting with number, append _
if (isReservedWord(name) || name.matches("^\\d.*")) {
@@ -257,7 +258,7 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
// camelize the model name
// phone_number => PhoneNumber
- name = camelize(sanitizeName(name));
+ name = org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(name));
// model name cannot use reserved keyword, e.g. return
if (isReservedWord(name)) {
@@ -354,11 +355,11 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
throw new RuntimeException("Empty method name (operationId) not allowed");
}
- operationId = camelize(sanitizeName(operationId), true);
+ operationId = org.openapitools.codegen.utils.StringUtils.camelize(sanitizeName(operationId), true);
// method name cannot use reserved keyword, e.g. return
if (isReservedWord(operationId)) {
- String newOperationId = camelize("call_" + operationId, true);
+ String newOperationId = org.openapitools.codegen.utils.StringUtils.camelize("call_" + operationId, true);
LOGGER.warn(operationId + " (reserved word) cannot be used as method name. Renamed to " + newOperationId);
return newOperationId;
}
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
index 66dcb89a52..65e0299062 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.*;
+
public class ApexClientCodegen extends AbstractApexCodegen {
private static final String CLASS_PREFIX = "classPrefix";
@@ -191,7 +192,7 @@ public class ApexClientCodegen extends AbstractApexCodegen {
@Override
public String toApiName(String name) {
- return camelize(classPrefix + super.toApiName(name));
+ return org.openapitools.codegen.utils.StringUtils.camelize(classPrefix + super.toApiName(name));
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
index 470641d928..f17c354de7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java
@@ -17,6 +17,8 @@
package org.openapitools.codegen.languages;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
+
import com.google.common.collect.ImmutableMap;
import com.samskivert.mustache.Mustache;
import io.swagger.v3.oas.models.media.Schema;
@@ -702,7 +704,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
// for symbol, e.g. $, #
if (getSymbolName(value) != null) {
- return camelize(getSymbolName(value));
+ return org.openapitools.codegen.utils.StringUtils.camelize(getSymbolName(value));
}
// number
@@ -718,7 +720,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
// string
String var = value.replaceAll("_", " ");
//var = WordUtils.capitalizeFully(var);
- var = camelize(var);
+ var = org.openapitools.codegen.utils.StringUtils.camelize(var);
var = var.replaceAll("\\W+", "");
if (var.matches("\\d.*")) {
@@ -753,11 +755,11 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
case original:
return name;
case camelCase:
- return camelize(name, true);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name, true);
case PascalCase:
- return camelize(name);
+ return org.openapitools.codegen.utils.StringUtils.camelize(name);
case snake_case:
- return underscore(name);
+ return org.openapitools.codegen.utils.StringUtils.underscore(name);
default:
throw new IllegalArgumentException("Invalid model property naming '" +
name + "'. Must be 'original', 'camelCase', " +
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
index be5147d3da..25106c48ee 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpNancyFXServerCodegen.java
@@ -36,6 +36,7 @@ import org.openapitools.codegen.utils.URLPathUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
@@ -332,7 +333,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
return "Empty";
}
- final String enumName = camelize(
+ final String enumName = org.openapitools.codegen.utils.StringUtils.camelize(
sanitizeName(name)
.replaceFirst("^_", "")
.replaceFirst("_$", "")
@@ -399,7 +400,7 @@ public class CSharpNancyFXServerCodegen extends AbstractCSharpCodegen {
@Override
public String toEnumName(final CodegenProperty property) {
- return sanitizeName(camelize(property.name)) + "Enum";
+ return sanitizeName(org.openapitools.codegen.utils.StringUtils.camelize(property.name)) + "Enum";
}
@Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
index 89309b512d..9bf751e2ac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ClojureClientCodegen.java
@@ -35,6 +35,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+
public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfig {
private static final String PROJECT_NAME = "projectName";
private static final String PROJECT_DESCRIPTION = "projectDescription";
@@ -109,7 +110,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
Info info = openAPI.getInfo();
if (projectName == null && info.getTitle() != null) {
// when projectName is not specified, generate it from info.title
- projectName = dashize(info.getTitle());
+ projectName = org.openapitools.codegen.utils.StringUtils.dashize(info.getTitle());
}
if (projectVersion == null) {
// when projectVersion is not specified, use info.version
@@ -148,7 +149,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
projectDescription = "Client library of " + projectName;
}
if (baseNamespace == null) {
- baseNamespace = dashize(projectName);
+ baseNamespace = org.openapitools.codegen.utils.StringUtils.dashize(projectName);
}
apiPackage = baseNamespace + ".api";
@@ -182,17 +183,17 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
throw new RuntimeException("Empty method/operation name (operationId) not allowed");
}
- return dashize(sanitizeName(operationId));
+ return org.openapitools.codegen.utils.StringUtils.dashize(sanitizeName(operationId));
}
@Override
public String toApiFilename(String name) {
- return underscore(toApiName(name));
+ return org.openapitools.codegen.utils.StringUtils.underscore(toApiName(name));
}
@Override
public String toApiName(String name) {
- return dashize(name);
+ return org.openapitools.codegen.utils.StringUtils.dashize(name);
}
@Override
@@ -203,7 +204,7 @@ public class ClojureClientCodegen extends DefaultCodegen implements CodegenConfi
@Override
public String toVarName(String name) {
name = name.replaceAll("[^a-zA-Z0-9_-]+", ""); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
- name = dashize(name);
+ name = org.openapitools.codegen.utils.StringUtils.dashize(name);
return 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 70ba645a4e..7f7a4e33b8 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
@@ -41,6 +41,7 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
+
public class CppPistacheServerCodegen extends AbstractCppCodegen {
protected String implFolder = "impl";
protected boolean isAddExternalLibs = true;
@@ -198,8 +199,8 @@ public class CppPistacheServerCodegen extends AbstractCppCodegen {
public Map postProcessOperationsWithModels(Map objs, List