[dart] Default value is only available when nullable is not set (#8854)

* Default value is only available when nullable is not set (not false)

* Simplify isNullable mustache syntax
This commit is contained in:
agilob 2021-03-02 10:06:45 +00:00 committed by GitHub
parent a34569f065
commit 83a5c3db1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 37 additions and 37 deletions

View File

@ -50,7 +50,7 @@ class {{{classname}}} {
{{/isEnum}} {{/isEnum}}
{{^isBinary}} {{^isBinary}}
@JsonKey( @JsonKey(
nullable: {{#nullable}}true{{/nullable}}{{^nullable}}false{{/nullable}}, {{#defaultValue}}defaultValue: {{{defaultValue}}},{{/defaultValue}}{{^defaultValue}}nullable: {{isNullable}},{{/defaultValue}}
name: r'{{{baseName}}}', name: r'{{{baseName}}}',
required: {{#required}}true{{/required}}{{^required}}false{{/required}}, required: {{#required}}true{{/required}}{{^required}}false{{/required}},
) )

View File

@ -23,14 +23,14 @@ class AdditionalPropertiesClass {
}); });
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'map_property', name: r'map_property',
required: false, required: false,
) )
Map<String, String> mapProperty; Map<String, String> mapProperty;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'map_of_map_property', name: r'map_of_map_property',
required: false, required: false,
) )

View File

@ -30,7 +30,7 @@ class Animal {
String className; String className;
@JsonKey( @JsonKey(
nullable: false, defaultValue: 'red',
name: r'color', name: r'color',
required: false, required: false,
) )

View File

@ -22,7 +22,7 @@ class ArrayOfArrayOfNumberOnly {
}); });
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'ArrayArrayNumber', name: r'ArrayArrayNumber',
required: false, required: false,
) )

View File

@ -22,7 +22,7 @@ class ArrayOfNumberOnly {
}); });
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'ArrayNumber', name: r'ArrayNumber',
required: false, required: false,
) )

View File

@ -24,21 +24,21 @@ class ArrayTest {
}); });
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_of_string', name: r'array_of_string',
required: false, required: false,
) )
List<String> arrayOfString; List<String> arrayOfString;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_array_of_integer', name: r'array_array_of_integer',
required: false, required: false,
) )
List<List<int>> arrayArrayOfInteger; List<List<int>> arrayArrayOfInteger;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_array_of_model', name: r'array_array_of_model',
required: false, required: false,
) )

View File

@ -31,7 +31,7 @@ class Cat {
String className; String className;
@JsonKey( @JsonKey(
nullable: false, defaultValue: 'red',
name: r'color', name: r'color',
required: false, required: false,
) )

View File

@ -30,7 +30,7 @@ class Category {
int id; int id;
@JsonKey( @JsonKey(
nullable: false, defaultValue: 'default-name',
name: r'name', name: r'name',
required: true, required: true,
) )

View File

@ -31,7 +31,7 @@ class Dog {
String className; String className;
@JsonKey( @JsonKey(
nullable: false, defaultValue: 'red',
name: r'color', name: r'color',
required: false, required: false,
) )

View File

@ -30,7 +30,7 @@ class EnumArrays {
EnumArraysJustSymbolEnum justSymbol; EnumArraysJustSymbolEnum justSymbol;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_enum', name: r'array_enum',
required: false, required: false,
) )

View File

@ -57,7 +57,7 @@ class EnumTest {
EnumTestEnumNumberEnum enumNumber; EnumTestEnumNumberEnum enumNumber;
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'outerEnum', name: r'outerEnum',
required: false, required: false,
) )

View File

@ -30,7 +30,7 @@ class FileSchemaTestClass {
ModelFile file; ModelFile file;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'files', name: r'files',
required: false, required: false,
) )

View File

@ -22,7 +22,7 @@ class Foo {
}); });
@JsonKey( @JsonKey(
nullable: false, defaultValue: 'bar',
name: r'bar', name: r'bar',
required: false, required: false,
) )

View File

@ -22,7 +22,7 @@ class HealthCheckResult {
}); });
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'NullableMessage', name: r'NullableMessage',
required: false, required: false,
) )

View File

@ -25,28 +25,28 @@ class MapTest {
}); });
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'map_map_of_string', name: r'map_map_of_string',
required: false, required: false,
) )
Map<String, Map<String, String>> mapMapOfString; Map<String, Map<String, String>> mapMapOfString;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'map_of_enum_string', name: r'map_of_enum_string',
required: false, required: false,
) )
Map<String, MapTestMapOfEnumStringEnum> mapOfEnumString; Map<String, MapTestMapOfEnumStringEnum> mapOfEnumString;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'direct_map', name: r'direct_map',
required: false, required: false,
) )
Map<String, bool> directMap; Map<String, bool> directMap;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'indirect_map', name: r'indirect_map',
required: false, required: false,
) )

View File

@ -38,7 +38,7 @@ class MixedPropertiesAndAdditionalPropertiesClass {
DateTime dateTime; DateTime dateTime;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'map', name: r'map',
required: false, required: false,
) )

View File

@ -33,84 +33,84 @@ class NullableClass {
}); });
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'integer_prop', name: r'integer_prop',
required: false, required: false,
) )
int integerProp; int integerProp;
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'number_prop', name: r'number_prop',
required: false, required: false,
) )
num numberProp; num numberProp;
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'boolean_prop', name: r'boolean_prop',
required: false, required: false,
) )
bool booleanProp; bool booleanProp;
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'string_prop', name: r'string_prop',
required: false, required: false,
) )
String stringProp; String stringProp;
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'date_prop', name: r'date_prop',
required: false, required: false,
) )
DateTime dateProp; DateTime dateProp;
@JsonKey( @JsonKey(
nullable: false, nullable: true,
name: r'datetime_prop', name: r'datetime_prop',
required: false, required: false,
) )
DateTime datetimeProp; DateTime datetimeProp;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_nullable_prop', name: r'array_nullable_prop',
required: false, required: false,
) )
List<Object> arrayNullableProp; List<Object> arrayNullableProp;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_and_items_nullable_prop', name: r'array_and_items_nullable_prop',
required: false, required: false,
) )
List<Object> arrayAndItemsNullableProp; List<Object> arrayAndItemsNullableProp;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'array_items_nullable', name: r'array_items_nullable',
required: false, required: false,
) )
List<Object> arrayItemsNullable; List<Object> arrayItemsNullable;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'object_nullable_prop', name: r'object_nullable_prop',
required: false, required: false,
) )
Map<String, Object> objectNullableProp; Map<String, Object> objectNullableProp;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'object_and_items_nullable_prop', name: r'object_and_items_nullable_prop',
required: false, required: false,
) )
Map<String, Object> objectAndItemsNullableProp; Map<String, Object> objectAndItemsNullableProp;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'object_items_nullable', name: r'object_items_nullable',
required: false, required: false,
) )

View File

@ -63,7 +63,7 @@ class Order {
OrderStatusEnum status; OrderStatusEnum status;
@JsonKey( @JsonKey(
nullable: false, defaultValue: false,
name: r'complete', name: r'complete',
required: false, required: false,
) )

View File

@ -48,14 +48,14 @@ class Pet {
String name; String name;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const {},
name: r'photoUrls', name: r'photoUrls',
required: true, required: true,
) )
Set<String> photoUrls; Set<String> photoUrls;
@JsonKey( @JsonKey(
nullable: false, defaultValue: const [],
name: r'tags', name: r'tags',
required: false, required: false,
) )