Fix cast exception when handling example/default of UUID/Long type (#16450)

wing328 · web-flow · commit a0350c653377 · 2023-08-31T09:42:38.000+08:00
* fix cast exception when handling uuid example/default

* more cast exception fix

* better fix in example generator

* better code format

* better code format
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java
@@ -287,10 +287,8 @@ private Object resolvePropertyToExample(String propertyName, String mediaType, S
             return "https://openapi-generator.tech";
         } else if (ModelUtils.isStringSchema(property)) {
             LOGGER.debug("String property");
-            String defaultValue = (String) property.getDefault();
-            if (defaultValue != null && !defaultValue.isEmpty()) {
-                LOGGER.debug("Default value found: '{}'", defaultValue);
-                return defaultValue;
+            if (property.getDefault() != null) {
+                return String.valueOf(property.getDefault());
             }
             List<String> enumValues = property.getEnum();
             if (enumValues != null && !enumValues.isEmpty()) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractApexCodegen.java
@@ -262,7 +262,7 @@ public String toDefaultValue(Schema p) {
             return "null";
         } else if (ModelUtils.isStringSchema(p)) {
             if (p.getDefault() != null) {
-                String _default = (String) p.getDefault();
+                String _default = String.valueOf(p.getDefault());
                 if (p.getEnum() == null) {
                     return "\"" + escapeText(_default) + "\"";
                 } else {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
@@ -795,7 +795,7 @@ public String toDefaultValue(Schema p) {
             }
         } else if (ModelUtils.isStringSchema(p)) {
             if (p.getDefault() != null) {
-                String _default = (String) p.getDefault();
+                String _default = String.valueOf(p.getDefault());
                 if (p.getEnum() == null) {
                     return "\"" + _default + "\"";
                 } else {
@@ -1133,5 +1133,7 @@ public void postProcessFile(File file, String fileType) {
     }
 
     @Override
-    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.F_SHARP; }
+    public GeneratorLanguage generatorLanguage() {
+        return GeneratorLanguage.F_SHARP;
+    }
 }
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
@@ -353,7 +353,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem
 
         // correct "&#39;"s into "'"s after toString()
         if (ModelUtils.isStringSchema(schema) && schema.getDefault() != null && !ModelUtils.isDateSchema(schema) && !ModelUtils.isDateTimeSchema(schema)) {
-            example = (String) schema.getDefault();
+            example = String.valueOf(schema.getDefault());
         }
 
         if (StringUtils.isNotBlank(example) && !"null".equals(example)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ApexClientCodegen.java
@@ -233,8 +233,10 @@ public String toDefaultValue(Schema p) {
             // true => "true", false => "false", null => "null"
             out = String.valueOf(p.getDefault());
         } else if (ModelUtils.isLongSchema(p)) {
-            Long def = (Long) p.getDefault();
-            out = def == null ? out : def + "L";
+            if (p.getDefault() != null) {
+                Long def = Long.parseLong(String.valueOf(p.getDefault()));
+                out = def == null ? out : def + "L";
+            }
         } else if (ModelUtils.isMapSchema(p)) {
             Schema inner = ModelUtils.getAdditionalProperties(p);
             String s = inner == null ? "Object" : getTypeDeclaration(inner);
@@ -313,7 +315,7 @@ private void generateAntSupportingFiles() {
         supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
 
         supportingFiles.add(new SupportingFile("README_ant.mustache", "README.md")
-            .doNotOverwrite());
+                .doNotOverwrite());
 
     }
 
@@ -323,10 +325,12 @@ private void generateSfdxSupportingFiles() {
         supportingFiles.add(new SupportingFile("sfdx-project.json.mustache", "sfdx-project.json"));
 
         supportingFiles.add(new SupportingFile("README_sfdx.mustache", "README.md")
-            .doNotOverwrite());
+                .doNotOverwrite());
 
     }
 
     @Override
-    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.APEX; }
+    public GeneratorLanguage generatorLanguage() {
+        return GeneratorLanguage.APEX;
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CLibcurlClientCodegen.java
@@ -939,5 +939,7 @@ public void postProcess() {
     }
 
     @Override
-    public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.C; }
+    public GeneratorLanguage generatorLanguage() {
+        return GeneratorLanguage.C;
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ProtobufSchemaCodegen.java
@@ -235,9 +235,9 @@ public void addEnumValuesPrefix(Map<String, Object> allowableValues, String pref
         }
 
         if (allowableValues.containsKey("values")) {
-            List<String> values = (List<String>) allowableValues.get("values");
-            for (String value : values) {
-                value = prefix + "_" + value;
+            List<Object> values = (List<Object>) allowableValues.get("values");
+            for (Object value : values) {
+                value = prefix + "_" + String.valueOf(value);
             }
         }
     }
@@ -435,7 +435,7 @@ public String toDefaultValue(Schema p) {
             }
         } else if (ModelUtils.isStringSchema(p)) {
             if (p.getDefault() != null) {
-                if (Pattern.compile("\r\n|\r|\n").matcher((String) p.getDefault()).find())
+                if (Pattern.compile("\r\n|\r|\n").matcher(String.valueOf(p.getDefault())).find())
                     return "'''" + p.getDefault() + "'''";
                 else
                     return "'" + p.getDefault() + "'";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
@@ -1236,7 +1236,7 @@ else if (ModelUtils.isBooleanSchema(p)) {
             }
         } else if (ModelUtils.isStringSchema(p)) {
             if (p.getDefault() != null) {
-                defaultValue = "\"" + (String) p.getDefault() + "\".to_string()";
+                defaultValue = "\"" + String.valueOf(p.getDefault()) + "\".to_string()";
             }
         }
         if ((defaultValue != null) && (ModelUtils.isNullable(p)))
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SwiftCombineClientCodegen.java
@@ -396,9 +396,9 @@ public String toDefaultValue(Schema p) {
         if (p.getEnum() != null && !p.getEnum().isEmpty()) {
             if (p.getDefault() != null) {
                 if (ModelUtils.isStringSchema(p)) {
-                    return "." + toEnumVarName(escapeText((String) p.getDefault()), p.getType());
+                    return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
                 } else {
-                    return "." + toEnumVarName(escapeText(p.getDefault().toString()), p.getType());
+                    return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());
                 }
             }
         }
@@ -412,9 +412,9 @@ public String toDefaultValue(Schema p) {
                 long epochMicro = TimeUnit.SECONDS.toMicros(instant.getEpochSecond()) + (instant.get(ChronoField.MICRO_OF_SECOND));
                 return "Date(timeIntervalSince1970: " + String.valueOf(epochMicro) + ".0 / 1_000_000)";
             } else if (ModelUtils.isUUIDSchema(p)) {
-                return "\"" + escapeText(p.getDefault().toString()) + "\"";
+                return "\"" + escapeText(String.valueOf(p.getDefault())) + "\"";
             } else if (ModelUtils.isStringSchema(p)) {
-                return "\"" + escapeText((String) p.getDefault()) + "\"";
+                return "\"" + escapeText(String.valueOf(p.getDefault())) + "\"";
             }
             // TODO: Handle more cases from `ModelUtils`, such as Date
         }

Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,7 @@ public String toDefaultValue(Schema p) {`
`795`	`795`	`}`
`796`	`796`	`} else if (ModelUtils.isStringSchema(p)) {`
`797`	`797`	`if (p.getDefault() != null) {`
`798`		`- String _default = (String) p.getDefault();`
	`798`	`+ String _default = String.valueOf(p.getDefault());`
`799`	`799`	`if (p.getEnum() == null) {`
`800`	`800`	`return "\"" + _default + "\"";`
`801`	`801`	`} else {`
`@@ -1133,5 +1133,7 @@ public void postProcessFile(File file, String fileType) {`
`1133`	`1133`	`}`
`1134`	`1134`
`1135`	`1135`	`@Override`
`1136`		`- public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.F_SHARP; }`
	`1136`	`+ public GeneratorLanguage generatorLanguage() {`
	`1137`	`+ return GeneratorLanguage.F_SHARP;`
	`1138`	`+ }`
`1137`	`1139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ private String toExampleValueRecursive(Schema schema, List<Schema> includedSchem`
`353`	`353`
`354`	`354`	`// correct "'"s into "'"s after toString()`
`355`	`355`	`if (ModelUtils.isStringSchema(schema) && schema.getDefault() != null && !ModelUtils.isDateSchema(schema) && !ModelUtils.isDateTimeSchema(schema)) {`
`356`		`- example = (String) schema.getDefault();`
	`356`	`+ example = String.valueOf(schema.getDefault());`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`if (StringUtils.isNotBlank(example) && !"null".equals(example)) {`
Original file line number	Diff line number	Diff line change
`@@ -939,5 +939,7 @@ public void postProcess() {`
`939`	`939`	`}`
`940`	`940`
`941`	`941`	`@Override`
`942`		`- public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.C; }`
	`942`	`+ public GeneratorLanguage generatorLanguage() {`
	`943`	`+ return GeneratorLanguage.C;`
	`944`	`+ }`
`943`	`945`	`}`
Original file line number	Diff line number	Diff line change
`@@ -235,9 +235,9 @@ public void addEnumValuesPrefix(Map<String, Object> allowableValues, String pref`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`if (allowableValues.containsKey("values")) {`
`238`		`- List<String> values = (List<String>) allowableValues.get("values");`
`239`		`- for (String value : values) {`
`240`		`- value = prefix + "_" + value;`
	`238`	`+ List<Object> values = (List<Object>) allowableValues.get("values");`
	`239`	`+ for (Object value : values) {`
	`240`	`+ value = prefix + "_" + String.valueOf(value);`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`	`}`
`@@ -435,7 +435,7 @@ public String toDefaultValue(Schema p) {`
`435`	`435`	`}`
`436`	`436`	`} else if (ModelUtils.isStringSchema(p)) {`
`437`	`437`	`if (p.getDefault() != null) {`
`438`		`- if (Pattern.compile("\r\n\|\r\|\n").matcher((String) p.getDefault()).find())`
	`438`	`+ if (Pattern.compile("\r\n\|\r\|\n").matcher(String.valueOf(p.getDefault())).find())`
`439`	`439`	`return "'''" + p.getDefault() + "'''";`
`440`	`440`	`else`
`441`	`441`	`return "'" + p.getDefault() + "'";`
Original file line number	Diff line number	Diff line change
`@@ -1236,7 +1236,7 @@ else if (ModelUtils.isBooleanSchema(p)) {`
`1236`	`1236`	`}`
`1237`	`1237`	`} else if (ModelUtils.isStringSchema(p)) {`
`1238`	`1238`	`if (p.getDefault() != null) {`
`1239`		`- defaultValue = "\"" + (String) p.getDefault() + "\".to_string()";`
	`1239`	`+ defaultValue = "\"" + String.valueOf(p.getDefault()) + "\".to_string()";`
`1240`	`1240`	`}`
`1241`	`1241`	`}`
`1242`	`1242`	`if ((defaultValue != null) && (ModelUtils.isNullable(p)))`
Original file line number	Diff line number	Diff line change
`@@ -396,9 +396,9 @@ public String toDefaultValue(Schema p) {`
`396`	`396`	`if (p.getEnum() != null && !p.getEnum().isEmpty()) {`
`397`	`397`	`if (p.getDefault() != null) {`
`398`	`398`	`if (ModelUtils.isStringSchema(p)) {`
`399`		`- return "." + toEnumVarName(escapeText((String) p.getDefault()), p.getType());`
	`399`	`+ return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());`
`400`	`400`	`} else {`
`401`		`- return "." + toEnumVarName(escapeText(p.getDefault().toString()), p.getType());`
	`401`	`+ return "." + toEnumVarName(escapeText(String.valueOf(p.getDefault())), p.getType());`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`	`}`
`@@ -412,9 +412,9 @@ public String toDefaultValue(Schema p) {`
`412`	`412`	`long epochMicro = TimeUnit.SECONDS.toMicros(instant.getEpochSecond()) + (instant.get(ChronoField.MICRO_OF_SECOND));`
`413`	`413`	`return "Date(timeIntervalSince1970: " + String.valueOf(epochMicro) + ".0 / 1_000_000)";`
`414`	`414`	`} else if (ModelUtils.isUUIDSchema(p)) {`
`415`		`- return "\"" + escapeText(p.getDefault().toString()) + "\"";`
	`415`	`+ return "\"" + escapeText(String.valueOf(p.getDefault())) + "\"";`
`416`	`416`	`} else if (ModelUtils.isStringSchema(p)) {`
`417`		`- return "\"" + escapeText((String) p.getDefault()) + "\"";`
	`417`	`+ return "\"" + escapeText(String.valueOf(p.getDefault())) + "\"";`
`418`	`418`	`}`
`419`	`419`	// TODO: Handle more cases from `ModelUtils`, such as Date
`420`	`420`	`}`