Skip to content

Commit ca0d4ea

Browse files
Marcel JacekMarcel Jacek
authored andcommitted
fix: extend check for default values of integer and number schema
1 parent 57752d1 commit ca0d4ea

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,20 +1359,20 @@ public String toDefaultValue(CodegenProperty cp, Schema schema) {
13591359

13601360
return String.format(Locale.ROOT, "new %s<>()",
13611361
instantiationTypes().getOrDefault("map", "HashMap"));
1362-
} else if (ModelUtils.isIntegerSchema(schema)) {
1362+
} else if (ModelUtils.isIntegerSchema(schema) || cp.isInteger || cp.isLong) {
13631363
if (schema.getDefault() != null) {
1364-
if (SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) {
1364+
if (SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat()) || cp.isLong) {
13651365
return schema.getDefault().toString() + "l";
13661366
} else {
13671367
return schema.getDefault().toString();
13681368
}
13691369
}
13701370
return null;
1371-
} else if (ModelUtils.isNumberSchema(schema)) {
1371+
} else if (ModelUtils.isNumberSchema(schema) || cp.isFloat || cp.isDouble) {
13721372
if (schema.getDefault() != null) {
1373-
if (SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat())) {
1373+
if (SchemaTypeUtil.FLOAT_FORMAT.equals(schema.getFormat()) || cp.isFloat) {
13741374
return schema.getDefault().toString() + "f";
1375-
} else if (SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat())) {
1375+
} else if (SchemaTypeUtil.DOUBLE_FORMAT.equals(schema.getFormat()) || cp.isDouble) {
13761376
return schema.getDefault().toString() + "d";
13771377
} else {
13781378
return "new BigDecimal(\"" + schema.getDefault().toString() + "\")";

0 commit comments

Comments
 (0)