[python][client] Fix delimiter collision (OpenAPITools#5981)

fullcircle23 · May 27, 2020 · 3fa218f · 3fa218f
1 parent ddcda1e
commit 3fa218f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/...enapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/...enapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -684,7 +684,8 @@ public String toDefaultValue(Schema p) {
                 if (Pattern.compile("\r\n|\r|\n").matcher((String) p.getDefault()).find())
                     return "'''" + p.getDefault() + "'''";
                 else
-                    return "'" + ((String) p.getDefault()).replaceAll("'", "\'") + "'";
+                    // wrap using double quotes to avoid the need to escape any embedded single quotes
+                    return "\"" + p.getDefault() + "\"";
             }
         } else if (ModelUtils.isArraySchema(p)) {
             if (p.getDefault() != null) {
@@ -728,7 +729,8 @@ private String toExampleValueRecursive(Schema schema, List<String> included_sche
 
         if (StringUtils.isNotBlank(example) && !"null".equals(example)) {
             if (ModelUtils.isStringSchema(schema)) {
-                example = "'" + example + "'";
+                // wrap using double quotes to avoid the need to escape any embedded single quotes
+                example = "\"" + example + "\"";
             }
             return example;
         }

diff --git a/...napi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java b/...napi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java
@@ -93,12 +93,21 @@ public void testRegularExpressionOpenAPISchemaVersion3() {
         Assert.assertEquals(op.allParams.get(5).pattern, "/^pattern\\d{3}$/i");
     }
 
-    @Test(description = "test single quotes escape")
-    public void testSingleQuotes() {
+    @Test(description = "test default value with single quotes")
+    public void testSingleQuotesDefaultValue() {
         final PythonClientCodegen codegen = new PythonClientCodegen();
         StringSchema schema = new StringSchema();
         schema.setDefault("Text containing 'single' quote");
         String defaultValue = codegen.toDefaultValue(schema);
-        Assert.assertEquals("'Text containing \'single\' quote'", defaultValue);
+        Assert.assertEquals(defaultValue, "\"Text containing 'single' quote\"");
+    }
+
+    @Test(description = "test example value with single quotes")
+    public void testSingleQuotesExampleValue() {
+        final PythonClientCodegen codegen = new PythonClientCodegen();
+        StringSchema schema = new StringSchema();
+        schema.setExample("Text containing 'single' quote");
+        String exampleValue = codegen.toExampleValue(schema);
+        Assert.assertEquals(exampleValue, "\"Text containing 'single' quote\"");
     }
 }