loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[Dart] Fix incorrect generation of additionalProperties:true (#12165) (#12426)

Browse Source 
* Update samples

Co-authored-by: 0xNF <0xNF>
This commit is contained in:
0xNF
2022-05-25 12:58:45 +09:00
committed by GitHub
parent 111675b89b
commit 96dd6c5806
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache vendored
View File

@@ -171,7 +171,12 @@ class {{{classname}}} {
{{/items.complexType}}
{{/items.isMap}}
{{^items.isMap}}
{{{name}}}: mapValueOfType<{{{datatypeWithEnum}}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
{{#items.complexType}}
{{{name}}}: {{{items.complexType}}}.mapFromJson(json[r'{{{baseName}}}'{{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}}]) ?? {{{.}}}{{/defaultValue}}{{/required}},
{{/items.complexType}}
{{^items.complexType}}
{{{name}}}: mapCastOfType<String, {{items.dataType}}>(json, r'{{{baseName}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
{{/items.complexType}}
{{/items.isMap}}
{{/items.isArray}}
{{/isMap}}

2
samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/mixed_properties_and_additional_properties_class.dart
View File

@@ -85,7 +85,7 @@ class MixedPropertiesAndAdditionalPropertiesClass {
return MixedPropertiesAndAdditionalPropertiesClass(
uuid: mapValueOfType<String>(json, r'uuid'),
dateTime: mapDateTime(json, r'dateTime', ''),
map: mapValueOfType<Map<String, Animal>>(json, r'map') ?? const {},
map: Animal.mapFromJson(json[r'map']) ?? const {},
);
}
return null;

6
samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/nullable_class.dart
View File

@@ -152,9 +152,9 @@ class NullableClass {
arrayNullableProp: Object.listFromJson(json[r'array_nullable_prop']) ?? const [],
arrayAndItemsNullableProp: Object.listFromJson(json[r'array_and_items_nullable_prop']) ?? const [],
arrayItemsNullable: Object.listFromJson(json[r'array_items_nullable']) ?? const [],
objectNullableProp: mapValueOfType<Map<String, Object>>(json, r'object_nullable_prop') ?? const {},
objectAndItemsNullableProp: mapValueOfType<Map<String, Object>>(json, r'object_and_items_nullable_prop') ?? const {},
objectItemsNullable: mapValueOfType<Map<String, Object>>(json, r'object_items_nullable') ?? const {},
objectNullableProp: mapCastOfType<String, Object>(json, r'object_nullable_prop') ?? const {},
objectAndItemsNullableProp: mapCastOfType<String, Object>(json, r'object_and_items_nullable_prop') ?? const {},
objectItemsNullable: mapCastOfType<String, Object>(json, r'object_items_nullable') ?? const {},
);
}
return null;