Fix cast exception in uuid default value (haskell-http-client) (#16439)

* fix cast exception in uuid default value (haskell-http-client)

* better code format
This commit is contained in:
William Cheng 2023-08-29 18:42:27 +08:00 committed by GitHub
parent b5867ebf2b
commit 9b6e6b3e49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -367,11 +367,17 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
}
}
public void setDateTimeFormat(String value) { setStringProp(PROP_DATETIME_FORMAT, value); }
public void setDateTimeFormat(String value) {
setStringProp(PROP_DATETIME_FORMAT, value);
}
public void setDateTimeParseFormat(String value) { setStringProp(PROP_DATETIME_PARSE_FORMAT, value); }
public void setDateTimeParseFormat(String value) {
setStringProp(PROP_DATETIME_PARSE_FORMAT, value);
}
public void setDateFormat(String value) { setStringProp(PROP_DATE_FORMAT, value); }
public void setDateFormat(String value) {
setStringProp(PROP_DATE_FORMAT, value);
}
public void setCabalPackage(String value) {
setStringProp(PROP_CABAL_PACKAGE, value);
@ -406,7 +412,9 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
this.useKatip = value;
}
public void setCustomTestInstanceModule(String value) { setStringProp(PROP_CUSTOM_TEST_INSTANCE_MODULE, value); }
public void setCustomTestInstanceModule(String value) {
setStringProp(PROP_CUSTOM_TEST_INSTANCE_MODULE, value);
}
private void setStringProp(String key, String value) {
if (StringUtils.isBlank(value)) {
@ -1260,7 +1268,7 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
public String toDefaultValue(Schema p) {
if (ModelUtils.isStringSchema(p)) {
if (p.getDefault() != null) {
return "\"" + escapeText((String) p.getDefault()) + "\"";
return "\"" + escapeText((String.valueOf(p.getDefault()))) + "\"";
}
} else if (ModelUtils.isBooleanSchema(p)) {
if (p.getDefault() != null) {
@ -1436,8 +1444,8 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
// finally escalate characters avoiding code injection
return escapeUnsafeCharacters(
StringEscapeUtils.unescapeJava(
StringEscapeUtils.escapeJava(input)
.replace("\\/", "/"))
StringEscapeUtils.escapeJava(input)
.replace("\\/", "/"))
.replaceAll("[\\t\\n\\r]", " ")
.replace("\\", "\\\\")
.replace("\"", "\\\""));
@ -1471,10 +1479,13 @@ public class HaskellHttpClientCodegen extends DefaultCodegen implements CodegenC
}
}
}
static boolean ContainsJsonMimeType(String mime) {
return mime != null && CONTAINS_JSON_MIME_PATTERN.matcher(mime).matches();
return mime != null && CONTAINS_JSON_MIME_PATTERN.matcher(mime).matches();
}
@Override
public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.HASKELL; }
public GeneratorLanguage generatorLanguage() {
return GeneratorLanguage.HASKELL;
}
}