[PHP/Dart/Python] Correctly escape strings in single quotes (Fixes #17582) (#19529)

JulianVennen · web-flow · commit 6bd3d53eee71 · 2024-11-09T16:50:12.000+08:00
* [PHP/Dart/Python] Correctly escape strings in single quotes (Fixes #17582) * Move escapeTextInSingleQuotes method to DefaultCodegen, add docblock
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
@@ -1122,6 +1122,20 @@ public String escapeText(String input) {
                         .replace("\"", "\\\""));
     }
 
+    /**
+     * This method escapes text to be used in a single quoted string
+     * @param input the input string
+     * @return the escaped string
+     */
+    public String escapeTextInSingleQuotes(String input) {
+        if (input == null) {
+            return null;
+        }
+
+        return escapeText(input).replace("'", "\\'");
+    }
+
+
     /**
      * Escape characters while allowing new lines
      *
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractDartCodegen.java
@@ -753,7 +753,7 @@ public String toEnumValue(String value, String datatype) {
                 "int".equalsIgnoreCase(datatype)) {
             return value;
         } else {
-            return "'" + escapeText(value) + "'";
+            return "'" + escapeTextInSingleQuotes(value) + "'";
         }
     }
 
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
@@ -641,9 +641,10 @@ public void setParameterExampleValue(CodegenParameter p) {
 
         if ("String".equalsIgnoreCase(type) || p.isString) {
             if (example == null) {
-                example = "'" + p.paramName + "_example'";
+                example = "'" +  escapeTextInSingleQuotes(p.paramName) + "_example'";
+            } else {
+                example = escapeText(example);
             }
-            example = escapeText(example);
         } else if ("Integer".equals(type) || "int".equals(type)) {
             if (example == null) {
                 example = "56";
@@ -660,17 +661,17 @@ public void setParameterExampleValue(CodegenParameter p) {
             if (example == null) {
                 example = "/path/to/file.txt";
             }
-            example = "\"" + escapeText(example) + "\"";
+            example = "'" + escapeTextInSingleQuotes(example) + "'";
         } else if ("\\Date".equalsIgnoreCase(type)) {
             if (example == null) {
                 example = "2013-10-20";
             }
-            example = "new \\DateTime(\"" + escapeText(example) + "\")";
+            example = "new \\DateTime('" + escapeTextInSingleQuotes(example) + "')";
         } else if ("\\DateTime".equalsIgnoreCase(type)) {
             if (example == null) {
                 example = "2013-10-20T19:20:30+01:00";
             }
-            example = "new \\DateTime(\"" + escapeText(example) + "\")";
+            example = "new \\DateTime('" + escapeTextInSingleQuotes(example) + "')";
         } else if ("object".equals(type)) {
             example = "new \\stdClass";
         } else if (!languageSpecificPrimitives.contains(type)) {
@@ -718,7 +719,7 @@ public String toEnumValue(String value, String datatype) {
         if ("int".equals(datatype) || "float".equals(datatype)) {
             return value;
         } else {
-            return "\'" + escapeText(value) + "\'";
+            return "'" + escapeTextInSingleQuotes(value) + "'";
         }
     }
 
@@ -830,6 +831,16 @@ public String escapeText(String input) {
         return super.escapeText(input).trim();
     }
 
+    @Override
+    public String escapeTextInSingleQuotes(String input) {
+        if (input == null) {
+            return input;
+        }
+
+        // Unescape double quotes because PHP keeps the backslashes if a character does not need to be escaped
+        return super.escapeTextInSingleQuotes(input).replace("\\\"", "\"");
+    }
+
     public void escapeMediaType(List<CodegenOperation> operationList) {
         for (CodegenOperation op : operationList) {
             if (!op.hasProduces) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java
@@ -412,7 +412,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem
             // Enum case:
             example = schema.getEnum().get(0).toString();
             if (ModelUtils.isStringSchema(schema)) {
-                example = "'" + escapeText(example) + "'";
+                example = "'" + escapeTextInSingleQuotes(example) + "'";
             }
             if (null == example)
                 LOGGER.warn("Empty enum. Cannot built an example!");
@@ -511,7 +511,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem
                 if (additional.getEnum() != null && !additional.getEnum().isEmpty()) {
                     theKey = additional.getEnum().get(0).toString();
                     if (ModelUtils.isStringSchema(additional)) {
-                        theKey = "'" + escapeText(theKey) + "'";
+                        theKey = "'" + escapeTextInSingleQuotes(theKey) + "'";
                     }
                 }
                 example = "{\n" + indentationString + theKey + " : " + toExampleValueRecursive(additional, includedSchemas, indentation + 1) + "\n" + indentationString + "}";
@@ -577,7 +577,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem
         }
 
         if (ModelUtils.isStringSchema(schema)) {
-            example = "'" + escapeText(example) + "'";
+            example = "'" + escapeTextInSingleQuotes(example) + "'";
         }
 
         return example;
@@ -603,7 +603,7 @@ public void setParameterExampleValue(CodegenParameter p) {
             if (example == null) {
                 example = p.paramName + "_example";
             }
-            example = "'" + escapeText(example) + "'";
+            example = "'" + escapeTextInSingleQuotes(example) + "'";
         } else if ("Integer".equals(type) || "int".equals(type)) {
             if (example == null) {
                 example = "56";
@@ -620,17 +620,17 @@ public void setParameterExampleValue(CodegenParameter p) {
             if (example == null) {
                 example = "/path/to/file";
             }
-            example = "'" + escapeText(example) + "'";
+            example = "'" + escapeTextInSingleQuotes(example) + "'";
         } else if ("Date".equalsIgnoreCase(type)) {
             if (example == null) {
                 example = "2013-10-20";
             }
-            example = "'" + escapeText(example) + "'";
+            example = "'" + escapeTextInSingleQuotes(example) + "'";
         } else if ("DateTime".equalsIgnoreCase(type)) {
             if (example == null) {
                 example = "2013-10-20T19:20:30+01:00";
             }
-            example = "'" + escapeText(example) + "'";
+            example = "'" + escapeTextInSingleQuotes(example) + "'";
         } else if (!languageSpecificPrimitives.contains(type)) {
             // type is a model class, e.g. User
             example = this.packageName + "." + type + "()";
@@ -1419,7 +1419,7 @@ public String toEnumValue(String value, String datatype) {
         if ("int".equals(datatype) || "float".equals(datatype)) {
             return value;
         } else {
-            return "\'" + escapeText(value) + "\'";
+            return "'" + escapeTextInSingleQuotes(value) + "'";
         }
     }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
@@ -231,15 +231,6 @@ public String controllerFileFolder() {
         return (outputFolder + File.separator + toSrcPath(controllerPackage, srcBasePath));
     }
 
-    @Override
-    public String escapeText(String input) {
-        if (input != null) {
-            // Trim the string to avoid leading and trailing spaces.
-            return super.escapeText(input).trim();
-        }
-        return input;
-    }
-
     @Override
     public CodegenType getTag() {
         return CodegenType.SERVER;
@@ -577,15 +568,6 @@ public String toModelImport(String name) {
         }
     }
 
-    @Override
-    public String toEnumValue(String value, String datatype) {
-        if ("int".equals(datatype) || "float".equals(datatype)) {
-            return value;
-        } else {
-            return "\"" + escapeText(value) + "\"";
-        }
-    }
-
     /**
      * Return the regular expression/JSON schema pattern (http://json-schema.org/latest/json-schema-validation.html#anchor33)
      *
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientCodegenTest.java
@@ -85,4 +85,15 @@ public void testKeywords() throws Exception {
         }
     }
 
+
+    @Test(description = "Enum value with quotes (#17582)")
+    public void testEnumPropertyWithQuotes() {
+        final DartClientCodegen codegen = new DartClientCodegen();
+
+        Assert.assertEquals(codegen.toEnumValue("enum-value", "string"), "'enum-value'");
+        Assert.assertEquals(codegen.toEnumValue("won't fix", "string"), "'won\\'t fix'");
+        Assert.assertEquals(codegen.toEnumValue("\"", "string"), "'\\\"'");
+        Assert.assertEquals(codegen.toEnumValue("1.0", "number"), "1.0");
+        Assert.assertEquals(codegen.toEnumValue("1", "int"), "1");
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/AbstractPhpCodegenTest.java
@@ -176,4 +176,13 @@ public void testEnumPropertyWithDefaultValue() {
         CodegenProperty cp1 = cm1.vars.get(0);
         Assert.assertEquals(cp1.getDefaultValue(), "'VALUE'");
     }
+
+    @Test(description = "Enum value with quotes (#17582)")
+    public void testEnumPropertyWithQuotes() {
+        Assert.assertEquals(codegen.toEnumValue("enum-value", "string"), "'enum-value'");
+        Assert.assertEquals(codegen.toEnumValue("won't fix", "string"), "'won\\'t fix'");
+        Assert.assertEquals(codegen.toEnumValue("\"", "string"), "'\"'");
+        Assert.assertEquals(codegen.toEnumValue("1.0", "float"), "1.0");
+        Assert.assertEquals(codegen.toEnumValue("1", "int"), "1");
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientCodegenTest.java
@@ -530,4 +530,15 @@ public void testHandleConstantParams() throws IOException {
         assertFileContains(apiFile.toPath(), "_header_params['X-CUSTOM_CONSTANT_HEADER'] = 'CONSTANT_VALUE'");
         assertFileContains(apiFile.toPath(), "_query_params.append(('CONSTANT_QUERY_STRING_KEY', 'CONSTANT_QUERY_STRING_VALUE'))");
     }
+
+    @Test(description = "Enum value with quotes (#17582)")
+    public void testEnumPropertyWithQuotes() {
+        final PythonClientCodegen codegen = new PythonClientCodegen();
+
+        Assert.assertEquals(codegen.toEnumValue("enum-value", "string"), "'enum-value'");
+        Assert.assertEquals(codegen.toEnumValue("won't fix", "string"), "'won\\'t fix'");
+        Assert.assertEquals(codegen.toEnumValue("\"", "string"), "'\\\"'");
+        Assert.assertEquals(codegen.toEnumValue("1.0", "float"), "1.0");
+        Assert.assertEquals(codegen.toEnumValue("1", "int"), "1");
+    }
 }
diff --git a/samples/client/echo_api/php-nextgen-streaming/docs/Api/BodyApi.md b/samples/client/echo_api/php-nextgen-streaming/docs/Api/BodyApi.md
@@ -92,7 +92,7 @@ $apiInstance = new OpenAPI\Client\Api\BodyApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = "/path/to/file.txt"; // \Psr\Http\Message\StreamInterface
+$body = '/path/to/file.txt'; // \Psr\Http\Message\StreamInterface
 
 try {
     $result = $apiInstance->testBodyApplicationOctetstreamBinary($body);
@@ -148,7 +148,7 @@ $apiInstance = new OpenAPI\Client\Api\BodyApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$files = array("/path/to/file.txt"); // \Psr\Http\Message\StreamInterface[]
+$files = array('/path/to/file.txt'); // \Psr\Http\Message\StreamInterface[]
 
 try {
     $result = $apiInstance->testBodyMultipartFormdataArrayOfBinary($files);
@@ -204,7 +204,7 @@ $apiInstance = new OpenAPI\Client\Api\BodyApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$my_file = "/path/to/file.txt"; // \Psr\Http\Message\StreamInterface
+$my_file = '/path/to/file.txt'; // \Psr\Http\Message\StreamInterface
 
 try {
     $result = $apiInstance->testBodyMultipartFormdataSingleBinary($my_file);
diff --git a/samples/client/echo_api/php-nextgen-streaming/docs/Api/QueryApi.md b/samples/client/echo_api/php-nextgen-streaming/docs/Api/QueryApi.md
@@ -97,8 +97,8 @@ $apiInstance = new OpenAPI\Client\Api\QueryApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$datetime_query = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime
-$date_query = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime
+$datetime_query = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime
+$date_query = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime
 $string_query = 'string_query_example'; // string
 
 try {
diff --git a/samples/client/echo_api/php-nextgen/docs/Api/BodyApi.md b/samples/client/echo_api/php-nextgen/docs/Api/BodyApi.md
@@ -92,7 +92,7 @@ $apiInstance = new OpenAPI\Client\Api\BodyApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = "/path/to/file.txt"; // \SplFileObject
+$body = '/path/to/file.txt'; // \SplFileObject
 
 try {
     $result = $apiInstance->testBodyApplicationOctetstreamBinary($body);
@@ -148,7 +148,7 @@ $apiInstance = new OpenAPI\Client\Api\BodyApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$files = array("/path/to/file.txt"); // \SplFileObject[]
+$files = array('/path/to/file.txt'); // \SplFileObject[]
 
 try {
     $result = $apiInstance->testBodyMultipartFormdataArrayOfBinary($files);
@@ -204,7 +204,7 @@ $apiInstance = new OpenAPI\Client\Api\BodyApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$my_file = "/path/to/file.txt"; // \SplFileObject
+$my_file = '/path/to/file.txt'; // \SplFileObject
 
 try {
     $result = $apiInstance->testBodyMultipartFormdataSingleBinary($my_file);
diff --git a/samples/client/echo_api/php-nextgen/docs/Api/QueryApi.md b/samples/client/echo_api/php-nextgen/docs/Api/QueryApi.md
@@ -97,8 +97,8 @@ $apiInstance = new OpenAPI\Client\Api\QueryApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$datetime_query = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime
-$date_query = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime
+$datetime_query = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime
+$date_query = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime
 $string_query = 'string_query_example'; // string
 
 try {
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php-nextgen/OpenAPIClient-php/docs/Api/FakeApi.md
@@ -608,7 +608,7 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = "/path/to/file.txt"; // \SplFileObject | image to upload
+$body = '/path/to/file.txt'; // \SplFileObject | image to upload
 
 try {
     $apiInstance->testBodyWithBinary($body);
@@ -844,9 +844,9 @@ $int32 = 56; // int | None
 $int64 = 56; // int | None
 $float = 3.4; // float | None
 $string = 'string_example'; // string | None
-$binary = "/path/to/file.txt"; // \SplFileObject | None
-$date = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime | None
-$date_time = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime | None
+$binary = '/path/to/file.txt'; // \SplFileObject | None
+$date = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime | None
+$date_time = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime | None
 $password = 'password_example'; // string | None
 $callback = 'callback_example'; // string | None
 
diff --git a/samples/client/petstore/php-nextgen/OpenAPIClient-php/docs/Api/PetApi.md b/samples/client/petstore/php-nextgen/OpenAPIClient-php/docs/Api/PetApi.md
@@ -514,7 +514,7 @@ $apiInstance = new OpenAPI\Client\Api\PetApi(
 );
 $pet_id = 56; // int | ID of pet to update
 $additional_metadata = 'additional_metadata_example'; // string | Additional data to pass to server
-$file = "/path/to/file.txt"; // \SplFileObject | file to upload
+$file = '/path/to/file.txt'; // \SplFileObject | file to upload
 
 try {
     $result = $apiInstance->uploadFile($pet_id, $additional_metadata, $file);
@@ -577,7 +577,7 @@ $apiInstance = new OpenAPI\Client\Api\PetApi(
     $config
 );
 $pet_id = 56; // int | ID of pet to update
-$required_file = "/path/to/file.txt"; // \SplFileObject | file to upload
+$required_file = '/path/to/file.txt'; // \SplFileObject | file to upload
 $additional_metadata = 'additional_metadata_example'; // string | Additional data to pass to server
 
 try {
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
@@ -669,7 +669,7 @@ $apiInstance = new OpenAPI\Client\Api\FakeApi(
     // This is optional, `GuzzleHttp\Client` will be used as default.
     new GuzzleHttp\Client()
 );
-$body = "/path/to/file.txt"; // \SplFileObject | image to upload
+$body = '/path/to/file.txt'; // \SplFileObject | image to upload
 
 try {
     $apiInstance->testBodyWithBinary($body);
@@ -905,9 +905,9 @@ $int32 = 56; // int | None
 $int64 = 56; // int | None
 $float = 3.4; // float | None
 $string = 'string_example'; // string | None
-$binary = "/path/to/file.txt"; // \SplFileObject | None
-$date = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime | None
-$date_time = new \DateTime("2013-10-20T19:20:30+01:00"); // \DateTime | None
+$binary = '/path/to/file.txt'; // \SplFileObject | None
+$date = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime | None
+$date_time = new \DateTime('2013-10-20T19:20:30+01:00'); // \DateTime | None
 $password = 'password_example'; // string | None
 $callback = 'callback_example'; // string | None
 
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/PetApi.md
@@ -514,7 +514,7 @@ $apiInstance = new OpenAPI\Client\Api\PetApi(
 );
 $pet_id = 56; // int | ID of pet to update
 $additional_metadata = 'additional_metadata_example'; // string | Additional data to pass to server
-$file = "/path/to/file.txt"; // \SplFileObject | file to upload
+$file = '/path/to/file.txt'; // \SplFileObject | file to upload
 
 try {
     $result = $apiInstance->uploadFile($pet_id, $additional_metadata, $file);
@@ -577,7 +577,7 @@ $apiInstance = new OpenAPI\Client\Api\PetApi(
     $config
 );
 $pet_id = 56; // int | ID of pet to update
-$required_file = "/path/to/file.txt"; // \SplFileObject | file to upload
+$required_file = '/path/to/file.txt'; // \SplFileObject | file to upload
 $additional_metadata = 'additional_metadata_example'; // string | Additional data to pass to server
 
 try {
diff --git a/samples/client/petstore/php/psr-18/docs/Api/FakeApi.md b/samples/client/petstore/php/psr-18/docs/Api/FakeApi.md
diff --git a/samples/client/petstore/php/psr-18/docs/Api/PetApi.md b/samples/client/petstore/php/psr-18/docs/Api/PetApi.md
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Controller/PetController.php
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/EnumStringModel.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/EnumStringModel.php
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Order.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Order.php
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php

Original file line number	Diff line number	Diff line change
`@@ -753,7 +753,7 @@ public String toEnumValue(String value, String datatype) {`
`753`	`753`	`"int".equalsIgnoreCase(datatype)) {`
`754`	`754`	`return value;`
`755`	`755`	`} else {`
`756`		`- return "'" + escapeText(value) + "'";`
	`756`	`+ return "'" + escapeTextInSingleQuotes(value) + "'";`
`757`	`757`	`}`
`758`	`758`	`}`
`759`	`759`
Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem`
`412`	`412`	`// Enum case:`
`413`	`413`	`example = schema.getEnum().get(0).toString();`
`414`	`414`	`if (ModelUtils.isStringSchema(schema)) {`
`415`		`- example = "'" + escapeText(example) + "'";`
	`415`	`+ example = "'" + escapeTextInSingleQuotes(example) + "'";`
`416`	`416`	`}`
`417`	`417`	`if (null == example)`
`418`	`418`	`LOGGER.warn("Empty enum. Cannot built an example!");`
`@@ -511,7 +511,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem`
`511`	`511`	`if (additional.getEnum() != null && !additional.getEnum().isEmpty()) {`
`512`	`512`	`theKey = additional.getEnum().get(0).toString();`
`513`	`513`	`if (ModelUtils.isStringSchema(additional)) {`
`514`		`- theKey = "'" + escapeText(theKey) + "'";`
	`514`	`+ theKey = "'" + escapeTextInSingleQuotes(theKey) + "'";`
`515`	`515`	`}`
`516`	`516`	`}`
`517`	`517`	`example = "{\n" + indentationString + theKey + " : " + toExampleValueRecursive(additional, includedSchemas, indentation + 1) + "\n" + indentationString + "}";`
`@@ -577,7 +577,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`if (ModelUtils.isStringSchema(schema)) {`
`580`		`- example = "'" + escapeText(example) + "'";`
	`580`	`+ example = "'" + escapeTextInSingleQuotes(example) + "'";`
`581`	`581`	`}`
`582`	`582`
`583`	`583`	`return example;`
`@@ -603,7 +603,7 @@ public void setParameterExampleValue(CodegenParameter p) {`
`603`	`603`	`if (example == null) {`
`604`	`604`	`example = p.paramName + "_example";`
`605`	`605`	`}`
`606`		`- example = "'" + escapeText(example) + "'";`
	`606`	`+ example = "'" + escapeTextInSingleQuotes(example) + "'";`
`607`	`607`	`} else if ("Integer".equals(type) \|\| "int".equals(type)) {`
`608`	`608`	`if (example == null) {`
`609`	`609`	`example = "56";`
`@@ -620,17 +620,17 @@ public void setParameterExampleValue(CodegenParameter p) {`
`620`	`620`	`if (example == null) {`
`621`	`621`	`example = "/path/to/file";`
`622`	`622`	`}`
`623`		`- example = "'" + escapeText(example) + "'";`
	`623`	`+ example = "'" + escapeTextInSingleQuotes(example) + "'";`
`624`	`624`	`} else if ("Date".equalsIgnoreCase(type)) {`
`625`	`625`	`if (example == null) {`
`626`	`626`	`example = "2013-10-20";`
`627`	`627`	`}`
`628`		`- example = "'" + escapeText(example) + "'";`
	`628`	`+ example = "'" + escapeTextInSingleQuotes(example) + "'";`
`629`	`629`	`} else if ("DateTime".equalsIgnoreCase(type)) {`
`630`	`630`	`if (example == null) {`
`631`	`631`	`example = "2013-10-20T19:20:30+01:00";`
`632`	`632`	`}`
`633`		`- example = "'" + escapeText(example) + "'";`
	`633`	`+ example = "'" + escapeTextInSingleQuotes(example) + "'";`
`634`	`634`	`} else if (!languageSpecificPrimitives.contains(type)) {`
`635`	`635`	`// type is a model class, e.g. User`
`636`	`636`	`example = this.packageName + "." + type + "()";`
`@@ -1419,7 +1419,7 @@ public String toEnumValue(String value, String datatype) {`
`1419`	`1419`	`if ("int".equals(datatype) \|\| "float".equals(datatype)) {`
`1420`	`1420`	`return value;`
`1421`	`1421`	`} else {`
`1422`		`- return "\'" + escapeText(value) + "\'";`
	`1422`	`+ return "'" + escapeTextInSingleQuotes(value) + "'";`
`1423`	`1423`	`}`
`1424`	`1424`	`}`
`1425`	`1425`
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,15 @@ public void testKeywords() throws Exception {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
	`88`	`+`
	`89`	`+ @Test(description = "Enum value with quotes (#17582)")`
	`90`	`+ public void testEnumPropertyWithQuotes() {`
	`91`	`+ final DartClientCodegen codegen = new DartClientCodegen();`
	`92`	`+`
	`93`	`+ Assert.assertEquals(codegen.toEnumValue("enum-value", "string"), "'enum-value'");`
	`94`	`+ Assert.assertEquals(codegen.toEnumValue("won't fix", "string"), "'won\\'t fix'");`
	`95`	`+ Assert.assertEquals(codegen.toEnumValue("\"", "string"), "'\\\"'");`
	`96`	`+ Assert.assertEquals(codegen.toEnumValue("1.0", "number"), "1.0");`
	`97`	`+ Assert.assertEquals(codegen.toEnumValue("1", "int"), "1");`
	`98`	`+ }`
`88`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,4 +176,13 @@ public void testEnumPropertyWithDefaultValue() {`
`176`	`176`	`CodegenProperty cp1 = cm1.vars.get(0);`
`177`	`177`	`Assert.assertEquals(cp1.getDefaultValue(), "'VALUE'");`
`178`	`178`	`}`
	`179`	`+`
	`180`	`+ @Test(description = "Enum value with quotes (#17582)")`
	`181`	`+ public void testEnumPropertyWithQuotes() {`
	`182`	`+ Assert.assertEquals(codegen.toEnumValue("enum-value", "string"), "'enum-value'");`
	`183`	`+ Assert.assertEquals(codegen.toEnumValue("won't fix", "string"), "'won\\'t fix'");`
	`184`	`+ Assert.assertEquals(codegen.toEnumValue("\"", "string"), "'\"'");`
	`185`	`+ Assert.assertEquals(codegen.toEnumValue("1.0", "float"), "1.0");`
	`186`	`+ Assert.assertEquals(codegen.toEnumValue("1", "int"), "1");`
	`187`	`+ }`
`179`	`188`	`}`