DRY regex patterns

Author: Picazsoo

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

@@ -249,43 +249,67 @@ apiTemplateFiles are for API outputs only (controllers/handlers).
     protected final static Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)application/json(;.*)?");
     protected final static Pattern JSON_VENDOR_MIME_PATTERN = Pattern.compile("(?i)application/vnd.(.*)+json(;.*)?");
     private static final Pattern COMMON_PREFIX_ENUM_NAME = Pattern.compile("[a-zA-Z0-9]+\\z");
-    /** Matches a trailing run of digits at the end of a name, used by {@link #generateNextName}. */
+    /**
+     * Matches a trailing run of digits at the end of a name, used by {@link #generateNextName}.
+     */
     protected static final Pattern TRAILING_DIGITS = Pattern.compile("\\d+\\z");
-    /** Matches one or more non-word characters; used in {@link #toEnumVarName} and {@link #sanitizeName}. */
+    /**
+     * Matches one or more non-word characters; used in {@link #toEnumVarName} and {@link #sanitizeName}.
+     */
     protected static final Pattern NON_WORD_PLUS = Pattern.compile("\\W+");
     protected static final Pattern LEADING_UNDERSCORES = Pattern.compile("^_*");
     protected static final Pattern MULTI_UNDERSCORES = Pattern.compile("_+");
     protected static final Pattern MULTI_TRAILING_UNDERSCORES = Pattern.compile("_+$");
+    protected static final Pattern MULTI_LEADING_UNDERSCORES = Pattern.compile("^_+");
     protected static final Pattern FIRST_LEADING_UNDERSCORE = Pattern.compile("^_");
     protected static final Pattern LAST_TRAILING_UNDERSCORE = Pattern.compile("_$");
+    protected static final Pattern NEWLINE = Pattern.compile("\n");
+    protected static final Pattern TRAILING_NEWLINE = Pattern.compile("\n$");
+    protected static final Pattern LEFT_CURLY_BRACE = Pattern.compile("\\{");
+    protected static final Pattern RIGHT_CURLY_BRACE = Pattern.compile("}");
 
 
     protected static final Pattern WHITESPACE = Pattern.compile("\\s+");
 
     protected static final Pattern STARTS_WITH_SLASH = Pattern.compile("^/.*");
 
     protected static final Pattern UNESCAPED_SLASH = Pattern.compile("(?<!\\\\)/");
+    protected static final Pattern TRAILING_BACKSLASHES = Pattern.compile("\\\\+$");
+    protected static final Pattern ENCLOSING_QUOTES = Pattern.compile("^\"|\"$");
 
-    /** Matches a string that starts with a digit (anchored); used across language generators. */
+
+    /**
+     * Matches a string that starts with a digit (anchored); used across language generators.
+     */
     protected static final Pattern STARTS_WITH_DIGIT = Pattern.compile("^\\d.*");
 
 
-    /** Matches a string consisting entirely of uppercase letters and underscores. */
+    /**
+     * Matches a string consisting entirely of uppercase letters and underscores.
+     */
     protected static final Pattern ALL_UPPER_UNDERSCORE = Pattern.compile("^[A-Z_]*$");
+    protected static final Pattern NON_WORD_CHAR = Pattern.compile("[^a-zA-Z0-9_]");
+    protected static final Pattern DASH_UNDERSCORE_SPACE_COLON_PARENTHESES = Pattern.compile("[-_ :()]");
 
     protected static final Pattern MINUS = Pattern.compile("-");
     protected static final Pattern PLUS = Pattern.compile("\\+");
     protected static final Pattern DOT = Pattern.compile("\\.");
 
-    protected static final Pattern PATH_PARAMETER = Pattern.compile("\\{(.*?)}");
+    protected static final Pattern PATH_PARAMETER = Pattern.compile("\\{([^}]+)}");
 
-    /** Matches a string consisting entirely of uppercase letters and underscores and digits. */
+    /**
+     * Matches a string consisting entirely of uppercase letters and underscores and digits.
+     */
     protected static final Pattern ALL_UPPER_UNDERSCORE_DIGITS = Pattern.compile("^[A-Z0-9_]*$");
-    /** Matches tab, newline, or carriage-return; used in {@link #escapeText}. */
+    /**
+     * Matches tab, newline, or carriage-return; used in {@link #escapeText}.
+     */
     protected static final Pattern CONTROL_WHITESPACE = Pattern.compile("[\\t\\n\\r]");
 
     protected static final Pattern MULTILINE_STRING = Pattern.compile("\r\n|\r|\n");
-    /** Matches a callback path-expression parameter like {@code {$request.body#/id}}. */
+    /**
+     * Matches a callback path-expression parameter like {@code {$request.body#/id}}.
+     */
     private static final Pattern CALLBACK_EXPRESSION_PARAM = Pattern.compile("\\{\\$.*}");
     // Dynamic patterns keyed by user-supplied removeCharRegEx strings are cached via PatternCache.
 

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

@@ -1435,7 +1435,7 @@ protected File processTemplateToFile(Map<String, Object> templateData, String te
     private final Set<String> seenFilesLower = new HashSet<>();
 
     private File processTemplateToFile(Map<String, Object> templateData, String templateName, String outputFilename, boolean shouldGenerate, String skippedByOption, String intendedOutputDir) throws IOException {
-        String adjustedOutputFilename = outputFilename.replaceAll("//", "/").replace('/', File.separatorChar);
+        String adjustedOutputFilename = outputFilename.replace("//", "/").replace('/', File.separatorChar);
         File target = new File(adjustedOutputFilename);
         if (ignoreProcessor.allowsFile(target)) {
             if (shouldGenerate) {

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

@@ -125,7 +125,7 @@ public void processOpts() {
         additionalProperties.put("httpClientGprName", httpClientPackageName.toLowerCase(Locale.ROOT));
         additionalProperties.put(CodegenConstants.PROJECT_NAME, projectName);
 
-        String[] names = this.modelPackage.split("\\.");
+        String[] names = DOT.split(this.modelPackage);
         String pkgName = names[0];
         additionalProperties.put("packageLevel1", pkgName);
         supportingFiles.add(new SupportingFile("package-spec-level1.mustache", "src",
@@ -146,8 +146,8 @@ public void processOpts() {
             @Override
             public void execute(Template.Fragment fragment, Writer writer) throws IOException {
                 String content = fragment.execute();
-                content = content.trim().replaceAll("\n$", "");
-                writer.write(content.replaceAll("\n", "\n   --  "));
+                content = TRAILING_NEWLINE.matcher(content.trim()).replaceAll("");
+                writer.write(NEWLINE.matcher(content).replaceAll("\n   --  "));
             }
         });
     }

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

@@ -131,7 +131,7 @@ public void processOpts() {
         additionalProperties.put("httpClientGprName", httpClientPackageName.toLowerCase(Locale.ROOT));
         additionalProperties.put(CodegenConstants.PROJECT_NAME, projectName);
 
-        String names[] = this.modelPackage.split("\\.");
+        String names[] = DOT.split(this.modelPackage);
         String pkgName = names[0];
         additionalProperties.put("packageLevel1", pkgName);
         supportingFiles.add(new SupportingFile("package-spec-level1.mustache", "src",
@@ -152,8 +152,8 @@ public void processOpts() {
             @Override
             public void execute(Template.Fragment fragment, Writer writer) throws IOException {
                 String content = fragment.execute();
-                content = content.trim().replaceAll("\n$", "");
-                writer.write(content.replaceAll("\n", "\n   --  "));
+                content = TRAILING_NEWLINE.matcher(content.trim()).replaceAll("");
+                writer.write(NEWLINE.matcher(content).replaceAll("\n   --  "));
             }
         });
     }

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

@@ -260,7 +260,7 @@ public String toVarName(String name) {
         name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        name = MINUS.matcher(name).replaceAll("_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // if it's all upper case, do nothing
         if (ALL_UPPER_UNDERSCORE.matcher(name).matches()) {

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

@@ -98,7 +98,7 @@ public void execute(final Template.Fragment frag, final Writer out) throws IOExc
         }
 
         private String escapeCurlyBrackets(String relativeFileName) {
-            return relativeFileName.replaceAll("\\{", "\\\\{").replaceAll("\\}", "\\\\}");
+            return RIGHT_CURLY_BRACE.matcher(LEFT_CURLY_BRACE.matcher(relativeFileName).replaceAll("\\\\{")).replaceAll("\\\\}");
         }
     }
 

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

@@ -252,7 +252,7 @@ protected List<Map<String, Object>> buildEnumVars(List<Object> values, String da
      */
     private String sanitizeEnumValue(String value) {
         // Replace any non-alphanumeric characters with an underscore
-        String sanitizedValue = value.replaceAll("[^A-Za-z0-9_]", "_");
+        String sanitizedValue = NON_WORD_CHAR.matcher(value).replaceAll("_");
         // If the enum starts with a number, prefix it with an underscore
         sanitizedValue = sanitizedValue.replaceAll("^([0-9])", "_$1");
         return sanitizedValue;

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

@@ -630,7 +630,7 @@ public String toParamName(String name) {
         if (isReservedWord(name) || STARTS_WITH_DIGIT.matcher(name).matches()) {
             name = escapeReservedWord(name);
         }
-        name = name.replaceAll("-", "_");
+        name = MINUS.matcher(name).replaceAll("_");
         return name;
     }
 
@@ -683,7 +683,7 @@ public String toModelDocFilename(String name) {
     @Override
     public String toApiFilename(String name) {
         // replace - with _ e.g. created-at => created_at
-        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        name = MINUS.matcher(name).replaceAll("_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
         // e.g. PhoneNumberApi.rb => phone_number_api.rb
         return camelize(name) + "API";
@@ -715,7 +715,7 @@ public String toApiName(String name) {
 
     @Override
     public String toEnumValue(String value, String datatype) {
-        value = value.replaceAll("-", "_");
+        value = MINUS.matcher(value).replaceAll("_");
         if (isReservedWord(value)) {
             value = escapeReservedWord(value);
         }

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

@@ -1323,7 +1323,7 @@ public String toEnumVarName(String value, String datatype) {
         }
 
         // string
-        String var = value.replaceAll(" ", "_");
+        String var = value.replace(" ", "_");
         var = camelize(var);
         var = NON_WORD_PLUS.matcher(var).replaceAll("");
 

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

@@ -847,7 +847,7 @@ public String toEnumVarName(String value, String datatype) {
         }
 
         // string
-        String var = value.replaceAll(" ", "_");
+        String var = value.replace(" ", "_");
         var = camelize(var);
         var = NON_WORD_PLUS.matcher(var).replaceAll("");