Skip to content

Commit 7dcaece

Browse files
vasilich6107vasilich6107
authored
[BUGFIX][dart-dio] add unknownEnumValue to JsonKey (#19416)
* [BUGFIX][dart-dio] add unknownEnumValue to JsonKey * review fix --------- Co-authored-by: Vasiliy Ditsyak <[email protected]>
1 parent abf9416 commit 7dcaece

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+156
-134
lines changed

‎modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ class {{{classname}}} {
4646
{{#defaultValue}}defaultValue: {{{defaultValue}}},{{/defaultValue}}
4747
name: r'{{{baseName}}}',
4848
required: {{#required}}true{{/required}}{{^required}}false{{/required}},
49-
includeIfNull: {{#required}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/required}}{{^required}}false{{/required}}
49+
includeIfNull: {{#required}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/required}}{{^required}}false{{/required}},
50+
{{#isEnumOrRef}}
51+
{{#enumUnknownDefaultCase}}
52+
unknownEnumValue: {{{datatypeWithEnum}}}.unknownDefaultOpenApi,
53+
{{/enumUnknownDefaultCase}}
54+
{{/isEnumOrRef}}
5055
)
5156
{{/isBinary}}
5257
{{#isBinary}}

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/additional_properties_class.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AdditionalPropertiesClass {
2727

2828
name: r'map_property',
2929
required: false,
30-
includeIfNull: false
30+
includeIfNull: false,
3131
)
3232

3333

@@ -39,7 +39,7 @@ class AdditionalPropertiesClass {
3939

4040
name: r'map_of_map_property',
4141
required: false,
42-
includeIfNull: false
42+
includeIfNull: false,
4343
)
4444

4545

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class AllOfWithSingleRef {
2828

2929
name: r'username',
3030
required: false,
31-
includeIfNull: false
31+
includeIfNull: false,
3232
)
3333

3434

@@ -40,7 +40,8 @@ class AllOfWithSingleRef {
4040

4141
name: r'SingleRefType',
4242
required: false,
43-
includeIfNull: false
43+
includeIfNull: false,
44+
unknownEnumValue: SingleRefType.unknownDefaultOpenApi,
4445
)
4546

4647

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/animal.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Animal {
2727

2828
name: r'className',
2929
required: true,
30-
includeIfNull: false
30+
includeIfNull: false,
3131
)
3232

3333

@@ -39,7 +39,7 @@ class Animal {
3939
defaultValue: 'red',
4040
name: r'color',
4141
required: false,
42-
includeIfNull: false
42+
includeIfNull: false,
4343
)
4444

4545

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/api_response.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ApiResponse {
2929

3030
name: r'code',
3131
required: false,
32-
includeIfNull: false
32+
includeIfNull: false,
3333
)
3434

3535

@@ -41,7 +41,7 @@ class ApiResponse {
4141

4242
name: r'type',
4343
required: false,
44-
includeIfNull: false
44+
includeIfNull: false,
4545
)
4646

4747

@@ -53,7 +53,7 @@ class ApiResponse {
5353

5454
name: r'message',
5555
required: false,
56-
includeIfNull: false
56+
includeIfNull: false,
5757
)
5858

5959

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_array_of_number_only.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ArrayOfArrayOfNumberOnly {
2525

2626
name: r'ArrayArrayNumber',
2727
required: false,
28-
includeIfNull: false
28+
includeIfNull: false,
2929
)
3030

3131

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_number_only.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ArrayOfNumberOnly {
2525

2626
name: r'ArrayNumber',
2727
required: false,
28-
includeIfNull: false
28+
includeIfNull: false,
2929
)
3030

3131

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ArrayTest {
3030

3131
name: r'array_of_string',
3232
required: false,
33-
includeIfNull: false
33+
includeIfNull: false,
3434
)
3535

3636

@@ -42,7 +42,7 @@ class ArrayTest {
4242

4343
name: r'array_array_of_integer',
4444
required: false,
45-
includeIfNull: false
45+
includeIfNull: false,
4646
)
4747

4848

@@ -54,7 +54,7 @@ class ArrayTest {
5454

5555
name: r'array_array_of_model',
5656
required: false,
57-
includeIfNull: false
57+
includeIfNull: false,
5858
)
5959

6060

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/capitalization.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Capitalization {
3535

3636
name: r'smallCamel',
3737
required: false,
38-
includeIfNull: false
38+
includeIfNull: false,
3939
)
4040

4141

@@ -47,7 +47,7 @@ class Capitalization {
4747

4848
name: r'CapitalCamel',
4949
required: false,
50-
includeIfNull: false
50+
includeIfNull: false,
5151
)
5252

5353

@@ -59,7 +59,7 @@ class Capitalization {
5959

6060
name: r'small_Snake',
6161
required: false,
62-
includeIfNull: false
62+
includeIfNull: false,
6363
)
6464

6565

@@ -71,7 +71,7 @@ class Capitalization {
7171

7272
name: r'Capital_Snake',
7373
required: false,
74-
includeIfNull: false
74+
includeIfNull: false,
7575
)
7676

7777

@@ -83,7 +83,7 @@ class Capitalization {
8383

8484
name: r'SCA_ETH_Flow_Points',
8585
required: false,
86-
includeIfNull: false
86+
includeIfNull: false,
8787
)
8888

8989

@@ -96,7 +96,7 @@ class Capitalization {
9696

9797
name: r'ATT_NAME',
9898
required: false,
99-
includeIfNull: false
99+
includeIfNull: false,
100100
)
101101

102102

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/cat.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Cat {
3232

3333
name: r'className',
3434
required: true,
35-
includeIfNull: false
35+
includeIfNull: false,
3636
)
3737

3838

@@ -44,7 +44,7 @@ class Cat {
4444
defaultValue: 'red',
4545
name: r'color',
4646
required: false,
47-
includeIfNull: false
47+
includeIfNull: false,
4848
)
4949

5050

@@ -56,7 +56,7 @@ class Cat {
5656

5757
name: r'declawed',
5858
required: false,
59-
includeIfNull: false
59+
includeIfNull: false,
6060
)
6161

6262

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/category.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Category {
2727

2828
name: r'id',
2929
required: false,
30-
includeIfNull: false
30+
includeIfNull: false,
3131
)
3232

3333

@@ -39,7 +39,7 @@ class Category {
3939
defaultValue: 'default-name',
4040
name: r'name',
4141
required: true,
42-
includeIfNull: false
42+
includeIfNull: false,
4343
)
4444

4545

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class ChildWithNullable {
3232

3333
name: r'type',
3434
required: false,
35-
includeIfNull: false
35+
includeIfNull: false,
36+
unknownEnumValue: ChildWithNullableTypeEnum.unknownDefaultOpenApi,
3637
)
3738

3839

@@ -44,7 +45,7 @@ class ChildWithNullable {
4445

4546
name: r'nullableProperty',
4647
required: false,
47-
includeIfNull: false
48+
includeIfNull: false,
4849
)
4950

5051

@@ -56,7 +57,7 @@ class ChildWithNullable {
5657

5758
name: r'otherProperty',
5859
required: false,
59-
includeIfNull: false
60+
includeIfNull: false,
6061
)
6162

6263

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/class_model.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class ClassModel {
2525

2626
name: r'_class',
2727
required: false,
28-
includeIfNull: false
28+
includeIfNull: false,
2929
)
3030

3131

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/deprecated_object.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class DeprecatedObject {
2626

2727
name: r'name',
2828
required: false,
29-
includeIfNull: false
29+
includeIfNull: false,
3030
)
3131

3232

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/dog.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Dog {
3232

3333
name: r'className',
3434
required: true,
35-
includeIfNull: false
35+
includeIfNull: false,
3636
)
3737

3838

@@ -44,7 +44,7 @@ class Dog {
4444
defaultValue: 'red',
4545
name: r'color',
4646
required: false,
47-
includeIfNull: false
47+
includeIfNull: false,
4848
)
4949

5050

@@ -56,7 +56,7 @@ class Dog {
5656

5757
name: r'breed',
5858
required: false,
59-
includeIfNull: false
59+
includeIfNull: false,
6060
)
6161

6262

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ class EnumArrays {
2727

2828
name: r'just_symbol',
2929
required: false,
30-
includeIfNull: false
30+
includeIfNull: false,
31+
unknownEnumValue: EnumArraysJustSymbolEnum.unknownDefaultOpenApi,
3132
)
3233

3334

@@ -39,7 +40,8 @@ class EnumArrays {
3940

4041
name: r'array_enum',
4142
required: false,
42-
includeIfNull: false
43+
includeIfNull: false,
44+
unknownEnumValue: List<EnumArraysArrayEnumEnum>.unknownDefaultOpenApi,
4345
)
4446

4547

0 commit comments

Comments
 (0)