Skip to content

Commit 2c9bd4a

Browse files
author
jld3103
authored
Put null values into serialized output in dart2 generator (#12569)
* Put null values into serialized output in dart2 generator * Update samples
1 parent 5245275 commit 2c9bd4a

41 files changed

Lines changed: 234 additions & 0 deletions

Some content is hidden

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

modules/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,15 @@ class {{{classname}}} {
9090
{{/isDate}}
9191
{{/isDateTime}}
9292
{{#isNullable}}
93+
} else {
94+
_json[r'{{{baseName}}}'] = null;
9395
}
9496
{{/isNullable}}
9597
{{^isNullable}}
9698
{{^required}}
9799
{{^defaultValue}}
100+
} else {
101+
_json[r'{{{baseName}}}'] = null;
98102
}
99103
{{/defaultValue}}
100104
{{/required}}

samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/api_response.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,18 @@ class ApiResponse {
6262
final _json = <String, dynamic>{};
6363
if (code != null) {
6464
_json[r'code'] = code;
65+
} else {
66+
_json[r'code'] = null;
6567
}
6668
if (type != null) {
6769
_json[r'type'] = type;
70+
} else {
71+
_json[r'type'] = null;
6872
}
6973
if (message != null) {
7074
_json[r'message'] = message;
75+
} else {
76+
_json[r'message'] = null;
7177
}
7278
return _json;
7379
}

samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/category.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,13 @@ class Category {
5151
final _json = <String, dynamic>{};
5252
if (id != null) {
5353
_json[r'id'] = id;
54+
} else {
55+
_json[r'id'] = null;
5456
}
5557
if (name != null) {
5658
_json[r'name'] = name;
59+
} else {
60+
_json[r'name'] = null;
5761
}
5862
return _json;
5963
}

samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/order.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,28 @@ class Order {
8484
final _json = <String, dynamic>{};
8585
if (id != null) {
8686
_json[r'id'] = id;
87+
} else {
88+
_json[r'id'] = null;
8789
}
8890
if (petId != null) {
8991
_json[r'petId'] = petId;
92+
} else {
93+
_json[r'petId'] = null;
9094
}
9195
if (quantity != null) {
9296
_json[r'quantity'] = quantity;
97+
} else {
98+
_json[r'quantity'] = null;
9399
}
94100
if (shipDate != null) {
95101
_json[r'shipDate'] = shipDate!.toUtc().toIso8601String();
102+
} else {
103+
_json[r'shipDate'] = null;
96104
}
97105
if (status != null) {
98106
_json[r'status'] = status;
107+
} else {
108+
_json[r'status'] = null;
99109
}
100110
_json[r'complete'] = complete;
101111
return _json;

samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/pet.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,21 @@ class Pet {
7272
final _json = <String, dynamic>{};
7373
if (id != null) {
7474
_json[r'id'] = id;
75+
} else {
76+
_json[r'id'] = null;
7577
}
7678
if (category != null) {
7779
_json[r'category'] = category;
80+
} else {
81+
_json[r'category'] = null;
7882
}
7983
_json[r'name'] = name;
8084
_json[r'photoUrls'] = photoUrls;
8185
_json[r'tags'] = tags;
8286
if (status != null) {
8387
_json[r'status'] = status;
88+
} else {
89+
_json[r'status'] = null;
8490
}
8591
return _json;
8692
}

samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/tag.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,13 @@ class Tag {
5151
final _json = <String, dynamic>{};
5252
if (id != null) {
5353
_json[r'id'] = id;
54+
} else {
55+
_json[r'id'] = null;
5456
}
5557
if (name != null) {
5658
_json[r'name'] = name;
59+
} else {
60+
_json[r'name'] = null;
5761
}
5862
return _json;
5963
}

samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/user.dart

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,27 +118,43 @@ class User {
118118
final _json = <String, dynamic>{};
119119
if (id != null) {
120120
_json[r'id'] = id;
121+
} else {
122+
_json[r'id'] = null;
121123
}
122124
if (username != null) {
123125
_json[r'username'] = username;
126+
} else {
127+
_json[r'username'] = null;
124128
}
125129
if (firstName != null) {
126130
_json[r'firstName'] = firstName;
131+
} else {
132+
_json[r'firstName'] = null;
127133
}
128134
if (lastName != null) {
129135
_json[r'lastName'] = lastName;
136+
} else {
137+
_json[r'lastName'] = null;
130138
}
131139
if (email != null) {
132140
_json[r'email'] = email;
141+
} else {
142+
_json[r'email'] = null;
133143
}
134144
if (password != null) {
135145
_json[r'password'] = password;
146+
} else {
147+
_json[r'password'] = null;
136148
}
137149
if (phone != null) {
138150
_json[r'phone'] = phone;
151+
} else {
152+
_json[r'phone'] = null;
139153
}
140154
if (userStatus != null) {
141155
_json[r'userStatus'] = userStatus;
156+
} else {
157+
_json[r'userStatus'] = null;
142158
}
143159
return _json;
144160
}

samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/all_of_with_single_ref.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@ class AllOfWithSingleRef {
4545
final _json = <String, dynamic>{};
4646
if (username != null) {
4747
_json[r'username'] = username;
48+
} else {
49+
_json[r'username'] = null;
4850
}
4951
if (singleRefType != null) {
5052
_json[r'SingleRefType'] = singleRefType;
53+
} else {
54+
_json[r'SingleRefType'] = null;
5155
}
5256
return _json;
5357
}

samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/api_response.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,18 @@ class ApiResponse {
6262
final _json = <String, dynamic>{};
6363
if (code != null) {
6464
_json[r'code'] = code;
65+
} else {
66+
_json[r'code'] = null;
6567
}
6668
if (type != null) {
6769
_json[r'type'] = type;
70+
} else {
71+
_json[r'type'] = null;
6872
}
6973
if (message != null) {
7074
_json[r'message'] = message;
75+
} else {
76+
_json[r'message'] = null;
7177
}
7278
return _json;
7379
}

samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/capitalization.dart

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,21 +96,33 @@ class Capitalization {
9696
final _json = <String, dynamic>{};
9797
if (smallCamel != null) {
9898
_json[r'smallCamel'] = smallCamel;
99+
} else {
100+
_json[r'smallCamel'] = null;
99101
}
100102
if (capitalCamel != null) {
101103
_json[r'CapitalCamel'] = capitalCamel;
104+
} else {
105+
_json[r'CapitalCamel'] = null;
102106
}
103107
if (smallSnake != null) {
104108
_json[r'small_Snake'] = smallSnake;
109+
} else {
110+
_json[r'small_Snake'] = null;
105111
}
106112
if (capitalSnake != null) {
107113
_json[r'Capital_Snake'] = capitalSnake;
114+
} else {
115+
_json[r'Capital_Snake'] = null;
108116
}
109117
if (sCAETHFlowPoints != null) {
110118
_json[r'SCA_ETH_Flow_Points'] = sCAETHFlowPoints;
119+
} else {
120+
_json[r'SCA_ETH_Flow_Points'] = null;
111121
}
112122
if (ATT_NAME != null) {
113123
_json[r'ATT_NAME'] = ATT_NAME;
124+
} else {
125+
_json[r'ATT_NAME'] = null;
114126
}
115127
return _json;
116128
}

0 commit comments

Comments
 (0)