[WIP] Fix Golang pattern validation with regex fails on commas OpenAP…

…ITools#20079
mlebihan · Dec 13, 2024 · bebddac · bebddac
1 parent 9e1afba
commit bebddac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/...openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -787,6 +787,8 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                 }
 
                 if (cp.pattern != null) {
+                    LOGGER.info("Received pattern: {}", cp.pattern);
+
                     // Pattern might be enclosed into /.../ that aren't wished. Remove them.
                     String p = cp.pattern;
 
@@ -797,18 +799,6 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                     String regexp = String.format(Locale.getDefault(), "regexp=%s", p);
                     String validate = String.format(Locale.getDefault(), "validate:\"%s\"", regexp);
 
-                    // Escape single backslash (First!)
-                    if (validate.contains("\\")) {
-                        /* We need to escape \ to \\
-                           except if it is currently present in the string for the quote itself. Regexp:
-                           \\[^"]
-                        */
-                        String BACKSLASH_THAT_ISNT_AN_ESCAPED_QUOTE="\\\\[^\"]";
-                        String ESCAPED_BACKSLASH_INTO_A_STRING_ITSELF = Matcher.quoteReplacement("\\\\");
-
-                        validate = validate.replaceAll(BACKSLASH_THAT_ISNT_AN_ESCAPED_QUOTE, ESCAPED_BACKSLASH_INTO_A_STRING_ITSELF);
-                    }
-
                     // Replace backtick by \\x60, if found
                     if (validate.contains("`")) {
                         validate = validate.replace("`", "\\x60");
@@ -819,6 +809,7 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                         validate = validate.replace(",", "\\\\,");
                     }
 
+                    LOGGER.info("validate clause: {}", validate);
                     cp.vendorExtensions.put(X_GO_CUSTOM_TAG, validate);
                 }
 

diff --git a/...les/openapi-generator/src/test/resources/3_0/issue_20079_go_regex_wrongly_translated.yaml b/...les/openapi-generator/src/test/resources/3_0/issue_20079_go_regex_wrongly_translated.yaml
@@ -28,4 +28,4 @@ components:
 
         name:
           type: string
-          pattern: "^[&#x9;!'&\"()*+,-./0-9:;<=>;?A-Z_a-z[]{}|^@#~]+`$"
+          pattern: "^/0-9$"