Skip to content

Commit a4f8a21

Browse files
GrohdenGrohden
committed
refactor: remove unneeded implicit-casts:false and regenerate sources
1 parent 0dfcd2f commit a4f8a21

File tree

74 files changed

+420
-388
lines changed

Some content is hidden

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

74 files changed

+420
-388
lines changed

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ public void processOpts() {
302302

303303
final String libFolder = sourceFolder + File.separator + "lib";
304304
supportingFiles.add(new SupportingFile("pubspec.mustache", "", "pubspec.yaml"));
305+
supportingFiles.add(new SupportingFile("analysis_options.mustache", "", "analysis_options.yaml"));
305306
supportingFiles.add(new SupportingFile("api_client.mustache", libFolder, "api_client.dart"));
306307
supportingFiles.add(new SupportingFile("api_exception.mustache", libFolder, "api_exception.dart"));
307308
supportingFiles.add(new SupportingFile("api_helper.mustache", libFolder, "api_helper.dart"));

‎modules/openapi-generator/src/main/resources/dart2/analysis_options.mustache

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
analyzer:
2+
strong-mode:
3+
implicit-casts: true

‎modules/openapi-generator/src/main/resources/dart2/api.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class {{{classname}}} {
192192
{{/isArray}}
193193
{{^isArray}}
194194
{{#isMap}}
195-
return {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as Map<dynamic, dynamic>);
195+
return {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}'));
196196
{{/isMap}}
197197
{{^isMap}}
198198
return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}};

‎modules/openapi-generator/src/main/resources/dart2/api_client.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ class ApiClient {
175175
return {{{classname}}}TypeTransformer().decode(value);
176176
{{/isEnum}}
177177
{{^isEnum}}
178-
return {{{classname}}}.fromJson(value as Map<String, dynamic>);
178+
return {{{classname}}}.fromJson(value);
179179
{{/isEnum}}
180180
{{/model}}
181181
{{/models}}

‎modules/openapi-generator/src/main/resources/dart2/class.mustache

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ class {{{classname}}} {
8282
{{#pattern}}
8383
: _dateEpochMarker == '{{{pattern}}}'
8484
? DateTime.fromMillisecondsSinceEpoch(json[r'{{{baseName}}}'] as int, isUtc: true)
85-
: DateTime.parse(json[r'{{{baseName}}}'] as String),
85+
: DateTime.parse(json[r'{{{baseName}}}']),
8686
{{/pattern}}
8787
{{^pattern}}
88-
: DateTime.parse(json[r'{{{baseName}}}'] as String),
88+
: DateTime.parse(json[r'{{{baseName}}}']),
8989
{{/pattern}}
9090
{{/isDateTime}}
9191
{{#isDate}}
@@ -94,10 +94,10 @@ class {{{classname}}} {
9494
{{#pattern}}
9595
: _dateEpochMarker == '{{{pattern}}}'
9696
? DateTime.fromMillisecondsSinceEpoch(json[r'{{{baseName}}}'] as int, isUtc: true)
97-
: DateTime.parse(json[r'{{{baseName}}}'] as String),
97+
: DateTime.parse(json[r'{{{baseName}}}']),
9898
{{/pattern}}
9999
{{^pattern}}
100-
: DateTime.parse(json[r'{{{baseName}}}'] as String),
100+
: DateTime.parse(json[r'{{{baseName}}}']),
101101
{{/pattern}}
102102
{{/isDate}}
103103
{{^isDateTime}}
@@ -109,15 +109,15 @@ class {{{classname}}} {
109109
? null
110110
: (json[r'{{{baseName}}}'] as List).map(
111111
{{#items.complexType}}
112-
{{items.complexType}}.listFromJson(json[r'{{{baseName}}}'] as List<dynamic>)
112+
{{items.complexType}}.listFromJson(json[r'{{{baseName}}}'])
113113
{{/items.complexType}}
114114
{{^items.complexType}}
115115
(e) => e == null ? null : (e as List).cast<{{items.items.dataType}}>()
116116
{{/items.complexType}}
117117
).toList(growable: false),
118118
{{/items.isArray}}
119119
{{^items.isArray}}
120-
{{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}'] as List<dynamic>),
120+
{{{name}}}: {{{complexType}}}.listFromJson(json[r'{{{baseName}}}']),
121121
{{/items.isArray}}
122122
{{/isArray}}
123123
{{^isArray}}
@@ -133,15 +133,27 @@ class {{{classname}}} {
133133
{{/items.complexType}}
134134
{{/items.isArray}}
135135
{{^items.isArray}}
136-
{{{name}}}: json[r'{{{baseName}}}'] as {{{datatype}}},
136+
{{#items.isMap}}
137+
{{{name}}}: json[r'{{{baseName}}}'] == null
138+
? null
139+
{{#items.complexType}}
140+
: {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
141+
{{/items.complexType}}
142+
{{^items.complexType}}
143+
: (json[r'{{{baseName}}}'] as Map).cast<String, Map>(),
144+
{{/items.complexType}}
145+
{{/items.isMap}}
146+
{{^items.isMap}}
147+
{{{name}}}: json[r'{{{baseName}}}']
148+
{{/items.isMap}}
137149
{{/items.isArray}}
138150
{{/isMap}}
139151
{{^isMap}}
140152
{{#isBinary}}
141153
{{{name}}}: null, // No support for decoding binary content from JSON
142154
{{/isBinary}}
143155
{{^isBinary}}
144-
{{{name}}}: {{{complexType}}}.fromJson(json[r'{{{baseName}}}'] as Map<String, dynamic>),
156+
{{{name}}}: {{{complexType}}}.fromJson(json[r'{{{baseName}}}']),
145157
{{/isBinary}}
146158
{{/isMap}}
147159
{{/isArray}}
@@ -167,11 +179,11 @@ class {{{classname}}} {
167179
{{#isNumber}}
168180
{{{name}}}: json[r'{{{baseName}}}'] == null ?
169181
null :
170-
(json[r'{{{baseName}}}'] as num).toDouble(),
182+
json[r'{{{baseName}}}'].toDouble(),
171183
{{/isNumber}}
172184
{{^isNumber}}
173185
{{^isEnum}}
174-
{{{name}}}: json[r'{{{baseName}}}'] as {{datatype}},
186+
{{{name}}}: json[r'{{{baseName}}}'],
175187
{{/isEnum}}
176188
{{#isEnum}}
177189
{{{name}}}: {{{classname}}}{{{enumName}}}.fromJson(json[r'{{{baseName}}}']),
@@ -188,12 +200,12 @@ class {{{classname}}} {
188200
static List<{{{classname}}}> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
189201
json == null || json.isEmpty
190202
? true == emptyIsNull ? null : <{{{classname}}}>[]
191-
: (json as List<Map<String, dynamic>>).map({{{classname}}}.fromJson).toList(growable: true == growable);
203+
: json.map((dynamic value) => {{{classname}}}.fromJson(value)).toList(growable: true == growable);
192204

193205
static Map<String, {{{classname}}}> mapFromJson(Map<String, dynamic> json) {
194206
final map = <String, {{{classname}}}>{};
195207
if (json?.isNotEmpty == true) {
196-
json.forEach((key, value) => map[key] = {{{classname}}}.fromJson(value as Map<String, dynamic>));
208+
json.forEach((key, value) => map[key] = {{{classname}}}.fromJson(value));
197209
}
198210
return map;
199211
}
@@ -203,7 +215,7 @@ class {{{classname}}} {
203215
final map = <String, List<{{{classname}}}>>{};
204216
if (json?.isNotEmpty == true) {
205217
json.forEach((key, value) {
206-
map[key] = {{{classname}}}.listFromJson(value as List<dynamic>, emptyIsNull: emptyIsNull, growable: growable,);
218+
map[key] = {{{classname}}}.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
207219
});
208220
}
209221
return map;

‎modules/openapi-generator/src/main/resources/dart2/enum.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class {{{classname}}}TypeTransformer {
6262
/// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
6363
/// and users are still using an old app with the old code.
6464
{{{classname}}} decode(dynamic data, {bool allowNull}) {
65-
switch (data as {{datatype}}) {
65+
switch (data) {
6666
{{#allowableValues}}
6767
{{#enumVars}}
6868
case {{#isString}}r{{/isString}}{{{value}}}: return {{{classname}}}.{{{name}}};

‎modules/openapi-generator/src/main/resources/dart2/enum_inline.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class {{{classname}}}{{{enumName}}}TypeTransformer {
6262
/// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
6363
/// and users are still using an old app with the old code.
6464
{{{classname}}}{{{enumName}}} decode(dynamic data, {bool allowNull}) {
65-
switch (data as {{datatype}}) {
65+
switch (data) {
6666
{{#allowableValues}}
6767
{{#enumVars}}
6868
case {{#isString}}r{{/isString}}{{{value}}}: return {{{classname}}}{{{enumName}}}.{{{name}}};

‎samples/client/petstore/dart2/petstore_client_lib/.openapi-generator/FILES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.gitignore
22
.travis.yml
33
README.md
4+
analysis_options.yaml
45
doc/ApiResponse.md
56
doc/Category.md
67
doc/Order.md

‎samples/client/petstore/dart2/petstore_client_lib/analysis_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
analyzer:
2+
strong-mode:
3+
implicit-casts: true

‎samples/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class StoreApi {
137137
// At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
138138
// FormatException when trying to decode an empty string.
139139
if (response.body != null && response.statusCode != HttpStatus.noContent) {
140-
return Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>') as Map<dynamic, dynamic>);
140+
return Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
141141
}
142142
return null;
143143
}

‎samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,17 @@ class ApiClient {
162162
case 'double':
163163
return value is double ? value : double.parse('$value');
164164
case 'ApiResponse':
165-
return ApiResponse.fromJson(value as Map<String, dynamic>);
165+
return ApiResponse.fromJson(value);
166166
case 'Category':
167-
return Category.fromJson(value as Map<String, dynamic>);
167+
return Category.fromJson(value);
168168
case 'Order':
169-
return Order.fromJson(value as Map<String, dynamic>);
169+
return Order.fromJson(value);
170170
case 'Pet':
171-
return Pet.fromJson(value as Map<String, dynamic>);
171+
return Pet.fromJson(value);
172172
case 'Tag':
173-
return Tag.fromJson(value as Map<String, dynamic>);
173+
return Tag.fromJson(value);
174174
case 'User':
175-
return User.fromJson(value as Map<String, dynamic>);
175+
return User.fromJson(value);
176176
default:
177177
Match match;
178178
if (value is List && (match = _regList.firstMatch(targetType)) != null) {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,20 @@ class ApiResponse {
5757
static ApiResponse fromJson(Map<String, dynamic> json) => json == null
5858
? null
5959
: ApiResponse(
60-
code: json[r'code'] as int,
61-
type: json[r'type'] as String,
62-
message: json[r'message'] as String,
60+
code: json[r'code'],
61+
type: json[r'type'],
62+
message: json[r'message'],
6363
);
6464

6565
static List<ApiResponse> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
6666
json == null || json.isEmpty
6767
? true == emptyIsNull ? null : <ApiResponse>[]
68-
: (json as List<Map<String, dynamic>>).map(ApiResponse.fromJson).toList(growable: true == growable);
68+
: json.map((dynamic value) => ApiResponse.fromJson(value)).toList(growable: true == growable);
6969

7070
static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {
7171
final map = <String, ApiResponse>{};
7272
if (json?.isNotEmpty == true) {
73-
json.forEach((key, value) => map[key] = ApiResponse.fromJson(value as Map<String, dynamic>));
73+
json.forEach((key, value) => map[key] = ApiResponse.fromJson(value));
7474
}
7575
return map;
7676
}
@@ -80,7 +80,7 @@ class ApiResponse {
8080
final map = <String, List<ApiResponse>>{};
8181
if (json?.isNotEmpty == true) {
8282
json.forEach((key, value) {
83-
map[key] = ApiResponse.listFromJson(value as List<dynamic>, emptyIsNull: emptyIsNull, growable: growable,);
83+
map[key] = ApiResponse.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
8484
});
8585
}
8686
return map;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ class Category {
4949
static Category fromJson(Map<String, dynamic> json) => json == null
5050
? null
5151
: Category(
52-
id: json[r'id'] as int,
53-
name: json[r'name'] as String,
52+
id: json[r'id'],
53+
name: json[r'name'],
5454
);
5555

5656
static List<Category> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
5757
json == null || json.isEmpty
5858
? true == emptyIsNull ? null : <Category>[]
59-
: (json as List<Map<String, dynamic>>).map(Category.fromJson).toList(growable: true == growable);
59+
: json.map((dynamic value) => Category.fromJson(value)).toList(growable: true == growable);
6060

6161
static Map<String, Category> mapFromJson(Map<String, dynamic> json) {
6262
final map = <String, Category>{};
6363
if (json?.isNotEmpty == true) {
64-
json.forEach((key, value) => map[key] = Category.fromJson(value as Map<String, dynamic>));
64+
json.forEach((key, value) => map[key] = Category.fromJson(value));
6565
}
6666
return map;
6767
}
@@ -71,7 +71,7 @@ class Category {
7171
final map = <String, List<Category>>{};
7272
if (json?.isNotEmpty == true) {
7373
json.forEach((key, value) {
74-
map[key] = Category.listFromJson(value as List<dynamic>, emptyIsNull: emptyIsNull, growable: growable,);
74+
map[key] = Category.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
7575
});
7676
}
7777
return map;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,25 +82,25 @@ class Order {
8282
static Order fromJson(Map<String, dynamic> json) => json == null
8383
? null
8484
: Order(
85-
id: json[r'id'] as int,
86-
petId: json[r'petId'] as int,
87-
quantity: json[r'quantity'] as int,
85+
id: json[r'id'],
86+
petId: json[r'petId'],
87+
quantity: json[r'quantity'],
8888
shipDate: json[r'shipDate'] == null
8989
? null
90-
: DateTime.parse(json[r'shipDate'] as String),
90+
: DateTime.parse(json[r'shipDate']),
9191
status: OrderStatusEnum.fromJson(json[r'status']),
92-
complete: json[r'complete'] as bool,
92+
complete: json[r'complete'],
9393
);
9494

9595
static List<Order> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
9696
json == null || json.isEmpty
9797
? true == emptyIsNull ? null : <Order>[]
98-
: (json as List<Map<String, dynamic>>).map(Order.fromJson).toList(growable: true == growable);
98+
: json.map((dynamic value) => Order.fromJson(value)).toList(growable: true == growable);
9999

100100
static Map<String, Order> mapFromJson(Map<String, dynamic> json) {
101101
final map = <String, Order>{};
102102
if (json?.isNotEmpty == true) {
103-
json.forEach((key, value) => map[key] = Order.fromJson(value as Map<String, dynamic>));
103+
json.forEach((key, value) => map[key] = Order.fromJson(value));
104104
}
105105
return map;
106106
}
@@ -110,7 +110,7 @@ class Order {
110110
final map = <String, List<Order>>{};
111111
if (json?.isNotEmpty == true) {
112112
json.forEach((key, value) {
113-
map[key] = Order.listFromJson(value as List<dynamic>, emptyIsNull: emptyIsNull, growable: growable,);
113+
map[key] = Order.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
114114
});
115115
}
116116
return map;
@@ -177,7 +177,7 @@ class OrderStatusEnumTypeTransformer {
177177
/// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
178178
/// and users are still using an old app with the old code.
179179
OrderStatusEnum decode(dynamic data, {bool allowNull}) {
180-
switch (data as String) {
180+
switch (data) {
181181
case r'placed': return OrderStatusEnum.placed;
182182
case r'approved': return OrderStatusEnum.approved;
183183
case r'delivered': return OrderStatusEnum.delivered;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,25 +82,25 @@ class Pet {
8282
static Pet fromJson(Map<String, dynamic> json) => json == null
8383
? null
8484
: Pet(
85-
id: json[r'id'] as int,
86-
category: Category.fromJson(json[r'category'] as Map<String, dynamic>),
87-
name: json[r'name'] as String,
85+
id: json[r'id'],
86+
category: Category.fromJson(json[r'category']),
87+
name: json[r'name'],
8888
photoUrls: json[r'photoUrls'] == null
8989
? null
9090
: (json[r'photoUrls'] as List).cast<String>(),
91-
tags: Tag.listFromJson(json[r'tags'] as List<dynamic>),
91+
tags: Tag.listFromJson(json[r'tags']),
9292
status: PetStatusEnum.fromJson(json[r'status']),
9393
);
9494

9595
static List<Pet> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
9696
json == null || json.isEmpty
9797
? true == emptyIsNull ? null : <Pet>[]
98-
: (json as List<Map<String, dynamic>>).map(Pet.fromJson).toList(growable: true == growable);
98+
: json.map((dynamic value) => Pet.fromJson(value)).toList(growable: true == growable);
9999

100100
static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {
101101
final map = <String, Pet>{};
102102
if (json?.isNotEmpty == true) {
103-
json.forEach((key, value) => map[key] = Pet.fromJson(value as Map<String, dynamic>));
103+
json.forEach((key, value) => map[key] = Pet.fromJson(value));
104104
}
105105
return map;
106106
}
@@ -110,7 +110,7 @@ class Pet {
110110
final map = <String, List<Pet>>{};
111111
if (json?.isNotEmpty == true) {
112112
json.forEach((key, value) {
113-
map[key] = Pet.listFromJson(value as List<dynamic>, emptyIsNull: emptyIsNull, growable: growable,);
113+
map[key] = Pet.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
114114
});
115115
}
116116
return map;
@@ -177,7 +177,7 @@ class PetStatusEnumTypeTransformer {
177177
/// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
178178
/// and users are still using an old app with the old code.
179179
PetStatusEnum decode(dynamic data, {bool allowNull}) {
180-
switch (data as String) {
180+
switch (data) {
181181
case r'available': return PetStatusEnum.available;
182182
case r'pending': return PetStatusEnum.pending;
183183
case r'sold': return PetStatusEnum.sold;

0 commit comments

Comments
 (0)