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

[Dart] Fix array of array nullable and non-nullable value generation (#13461)

Browse Source 
* [Dart] Added non-invalid defaults for non nullable array of arrays (#13460)

* [Dart] Update samples
This commit is contained in:
0xNF 2022-12-28 01:01:08 +09:00 committed by GitHub
parent efdc94b113
commit 341a8535c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -139,15 +139,15 @@ class {{{classname}}} {
{{#isArray}} {{#isArray}}
{{#items.isArray}} {{#items.isArray}}
{{{name}}}: json[r'{{{baseName}}}'] is List {{{name}}}: json[r'{{{baseName}}}'] is List
? (json[r'{{{baseName}}}'] as List).map( ? (json[r'{{{baseName}}}'] as List).map((e) =>
{{#items.complexType}} {{#items.complexType}}
{{items.complexType}}.listFromJson(json[r'{{{baseName}}}']) {{items.complexType}}.listFromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}
{{/items.complexType}} {{/items.complexType}}
{{^items.complexType}} {{^items.complexType}}
(e) => e == null ? null : (e as List).cast<{{items.items.dataType}}>() e == null ? {{#items.isNullable}}null{{/items.isNullable}}{{^items.isNullable}}const <{{items.items.dataType}}>[]{{/items.isNullable}} : (e as List).cast<{{items.items.dataType}}>()
{{/items.complexType}} {{/items.complexType}}
).toList() ).toList()
: null, : {{#isNullable}}null{{/isNullable}}{{^isNullable}}const []{{/isNullable}},
{{/items.isArray}} {{/items.isArray}}
{{^items.isArray}} {{^items.isArray}}
{{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}}, {{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},

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

@ -56,10 +56,10 @@ class ArrayOfArrayOfNumberOnly {
return ArrayOfArrayOfNumberOnly( return ArrayOfArrayOfNumberOnly(
arrayArrayNumber: json[r'ArrayArrayNumber'] is List arrayArrayNumber: json[r'ArrayArrayNumber'] is List
? (json[r'ArrayArrayNumber'] as List).map( ? (json[r'ArrayArrayNumber'] as List).map((e) =>
(e) => e == null ? null : (e as List).cast<num>() e == null ? const <num>[] : (e as List).cast<num>()
).toList() ).toList()
: null, : const [],
); );
} }
return null; return null;

12
samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/array_test.dart
View File

@ -71,15 +71,15 @@ class ArrayTest {
? (json[r'array_of_string'] as List).cast<String>() ? (json[r'array_of_string'] as List).cast<String>()
: const [], : const [],
arrayArrayOfInteger: json[r'array_array_of_integer'] is List arrayArrayOfInteger: json[r'array_array_of_integer'] is List
? (json[r'array_array_of_integer'] as List).map( ? (json[r'array_array_of_integer'] as List).map((e) =>
(e) => e == null ? null : (e as List).cast<int>() e == null ? const <int>[] : (e as List).cast<int>()
).toList() ).toList()
: null, : const [],
arrayArrayOfModel: json[r'array_array_of_model'] is List arrayArrayOfModel: json[r'array_array_of_model'] is List
? (json[r'array_array_of_model'] as List).map( ? (json[r'array_array_of_model'] as List).map((e) =>
ReadOnlyFirst.listFromJson(json[r'array_array_of_model']) ReadOnlyFirst.listFromJson(json[r'array_array_of_model']) ?? const []
).toList() ).toList()
: null, : const [],
); );
} }
return null; return null;