Adds tow regex tests

Author: spacether

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -2497,7 +2497,7 @@ private List<Object> getPatternAndModifiers(String pattern) {
 
         json schema test cases omit the leading and trailing /s, so make sure that the regex allows that
          */
-        Pattern valueExtractor = Pattern.compile("^/?(.+?)/?([sim]?)$");
+        Pattern valueExtractor = Pattern.compile("^/?(.+?)/?([simu]{0,4})$");
         Matcher m = valueExtractor.matcher(pattern);
         if (m.find()) {
             int groupCount = m.groupCount();
@@ -2511,13 +2511,13 @@ private List<Object> getPatternAndModifiers(String pattern) {
                 String isolatedPattern = m.group(1);
                 String flags = m.group(2);
                 if (flags.contains("s")) {
-                    modifiers.add("DOTALL");
+                    modifiers.add("s");
                 }
                 if (flags.contains("i")) {
-                    modifiers.add("IGNORECASE");
+                    modifiers.add("i");
                 }
                 if (flags.contains("m")) {
-                    modifiers.add("MULTILINE");
+                    modifiers.add("m");
                 }
                 return Arrays.asList(isolatedPattern, modifiers);
             }

modules/openapi-json-schema-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java

@@ -32,6 +32,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -164,4 +165,36 @@ public void testApisNotGenerated() throws Exception {
         Assert.assertFalse(Files.isDirectory(pathThatShouldNotExist));
         output.deleteOnExit();
     }
+
+    @Test
+    public void testRegexWithoutTrailingSlashWorks() {
+        OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/11_regex.yaml");
+        PythonClientCodegen codegen = new PythonClientCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        String modelName = "UUID";
+        Schema schema = openAPI.getComponents().getSchemas().get(modelName);
+
+        CodegenModel cm = codegen.fromModel(modelName, schema);
+        String expectedRegexPattern = "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}";
+        Assert.assertEquals(cm.getPattern(), expectedRegexPattern);
+        Assert.assertEquals(cm.vendorExtensions.get("x-regex"), expectedRegexPattern);
+        Assert.assertFalse(cm.vendorExtensions.containsKey("x-modifiers"));
+    }
+
+    @Test
+    public void testRegexWithMultipleFlagsWorks() {
+        OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/11_regex.yaml");
+        PythonClientCodegen codegen = new PythonClientCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        String modelName = "StringWithRegexWithThreeFlags";
+        Schema schema = openAPI.getComponents().getSchemas().get(modelName);
+
+        CodegenModel cm = codegen.fromModel(modelName, schema);
+        String expectedRegexPattern = "a.";
+        Assert.assertEquals(cm.getPattern(), expectedRegexPattern);
+        Assert.assertEquals(cm.vendorExtensions.get("x-regex"), expectedRegexPattern);
+        Assert.assertEquals(cm.vendorExtensions.get("x-modifiers"), Arrays.asList("s", "i", "m"));
+    }
 }

modules/openapi-json-schema-generator/src/test/resources/3_0/11_regex.yaml

@@ -0,0 +1,27 @@
+openapi: 3.0.3
+info:
+  title: Test
+  version: 1.0.0-SNAPSHOT
+paths:
+  /test:
+    get:
+      tags:
+        - Test Resource
+      parameters:
+        - name: uuid
+          in: query
+          schema:
+            $ref: '#/components/schemas/UUID'
+      responses:
+        "200":
+          description: OK
+components:
+  schemas:
+    UUID:
+      format: uuid
+      pattern: "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"
+      type: string
+    StringWithRegexWithThreeFlags:
+      format: uuid
+      pattern: "/a./sim"
+      type: string