[dart] fix some compilation issues and added casts for analyzer implicit-casts flag

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

@@ -64,6 +64,7 @@ public void processOpts() {
 
         final String libFolder = sourceFolder + File.separator + "lib";
         supportingFiles.add(new SupportingFile("pubspec.mustache", "", "pubspec.yaml"));
+        supportingFiles.add(new SupportingFile("analysis_options.mustache", "", "analysis_options.yaml"));
         supportingFiles.add(new SupportingFile("api_client.mustache", libFolder, "api_client.dart"));
         supportingFiles.add(new SupportingFile("api_exception.mustache", libFolder, "api_exception.dart"));
         supportingFiles.add(new SupportingFile("api_helper.mustache", libFolder, "api_helper.dart"));

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

@@ -0,0 +1,3 @@
+analyzer:
+  strong-mode:
+    implicit-casts: true

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

@@ -65,7 +65,7 @@ class ApiClient {
   Future<Response> invokeAPI(
     String path,
     String method,
-    Iterable<QueryParam> queryParams,
+    List<QueryParam> queryParams,
     Object body,
     Map<String, String> headerParams,
     Map<String, String> formParams,
@@ -177,13 +177,13 @@ class ApiClient {
     List<QueryParam> queryParams,
     Map<String, String> headerParams,
   ) {
-    authNames.forEach((authName) {
+    for(final authName in authNames) {
       final auth = _authentications[authName];
       if (auth == null) {
         throw ArgumentError('Authentication undefined: $authName');
       }
       auth.applyToParams(queryParams, headerParams);
-    });
+    }
   }
 
 {{#native_serialization}}

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

@@ -132,9 +132,19 @@ class {{{classname}}} {
               {{/items.complexType}}
           {{/items.isArray}}
           {{^items.isArray}}
+              {{#items.isMap}}
         {{{name}}}: json[r'{{{baseName}}}'] == null
           ? null
-          : {{{complexType}}}.mapFromJson(json[r'{{{baseName}}}']),
+            {{#items.complexType}}
+          : {{items.complexType}}.mapFromJson(json[r'{{{baseName}}}']),
+            {{/items.complexType}}
+            {{^items.complexType}}
+          : (json[r'{{{baseName}}}'] as Map).cast<String, Map>(),
+            {{/items.complexType}}
+          {{/items.isMap}}
+          {{^items.isMap}}
+            {{{name}}}: json[r'{{{baseName}}}']
+          {{/items.isMap}}
           {{/items.isArray}}
         {{/isMap}}
         {{^isMap}}
@@ -189,22 +199,22 @@ class {{{classname}}} {
   static List<{{{classname}}}> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <{{{classname}}}>[]
-      : json.map((v) => {{{classname}}}.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => {{{classname}}}.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, {{{classname}}}> mapFromJson(Map<String, dynamic> json) {
     final map = <String, {{{classname}}}>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = {{{classname}}}.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = {{{classname}}}.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of {{{classname}}}-objects as value to a dart map
   static Map<String, List<{{{classname}}}>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<{{{classname}}}>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = {{{classname}}}.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = {{{classname}}}.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -1,6 +1,7 @@
 .gitignore
 .travis.yml
 README.md
+analysis_options.yaml
 doc/ApiResponse.md
 doc/Category.md
 doc/Order.md

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

@@ -0,0 +1,3 @@
+analyzer:
+  strong-mode:
+    implicit-casts: true

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

@@ -58,7 +58,7 @@ class ApiClient {
   Future<Response> invokeAPI(
     String path,
     String method,
-    Iterable<QueryParam> queryParams,
+    List<QueryParam> queryParams,
     Object body,
     Map<String, String> headerParams,
     Map<String, String> formParams,
@@ -168,13 +168,13 @@ class ApiClient {
     List<QueryParam> queryParams,
     Map<String, String> headerParams,
   ) {
-    authNames.forEach((authName) {
+    for(final authName in authNames) {
       final auth = _authentications[authName];
       if (auth == null) {
         throw ArgumentError('Authentication undefined: $authName');
       }
       auth.applyToParams(queryParams, headerParams);
-    });
+    }
   }
 
   static dynamic _deserialize(dynamic value, String targetType, {bool growable}) {

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

@@ -65,22 +65,22 @@ class ApiResponse {
   static List<ApiResponse> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <ApiResponse>[]
-      : json.map((v) => ApiResponse.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => ApiResponse.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {
     final map = <String, ApiResponse>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = ApiResponse.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = ApiResponse.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of ApiResponse-objects as value to a dart map
   static Map<String, List<ApiResponse>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<ApiResponse>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = ApiResponse.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = ApiResponse.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -56,22 +56,22 @@ class Category {
   static List<Category> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <Category>[]
-      : json.map((v) => Category.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => Category.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, Category> mapFromJson(Map<String, dynamic> json) {
     final map = <String, Category>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = Category.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = Category.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of Category-objects as value to a dart map
   static Map<String, List<Category>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<Category>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = Category.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = Category.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -95,22 +95,22 @@ class Order {
   static List<Order> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <Order>[]
-      : json.map((v) => Order.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => Order.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, Order> mapFromJson(Map<String, dynamic> json) {
     final map = <String, Order>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = Order.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = Order.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of Order-objects as value to a dart map
   static Map<String, List<Order>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<Order>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = Order.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = Order.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -91,22 +91,22 @@ class Pet {
   static List<Pet> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <Pet>[]
-      : json.map((v) => Pet.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => Pet.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {
     final map = <String, Pet>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = Pet.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = Pet.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of Pet-objects as value to a dart map
   static Map<String, List<Pet>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<Pet>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = Pet.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = Pet.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -56,22 +56,22 @@ class Tag {
   static List<Tag> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <Tag>[]
-      : json.map((v) => Tag.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => Tag.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, Tag> mapFromJson(Map<String, dynamic> json) {
     final map = <String, Tag>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = Tag.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = Tag.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of Tag-objects as value to a dart map
   static Map<String, List<Tag>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<Tag>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = Tag.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = Tag.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -111,22 +111,22 @@ class User {
   static List<User> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <User>[]
-      : json.map((v) => User.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => User.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, User> mapFromJson(Map<String, dynamic> json) {
     final map = <String, User>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = User.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = User.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of User-objects as value to a dart map
   static Map<String, List<User>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<User>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = User.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = User.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES

@@ -1,6 +1,7 @@
 .gitignore
 .travis.yml
 README.md
+analysis_options.yaml
 doc/AdditionalPropertiesClass.md
 doc/Animal.md
 doc/AnotherFakeApi.md

samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/analysis_options.yaml

@@ -0,0 +1,3 @@
+analyzer:
+  strong-mode:
+    implicit-casts: true

samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart

@@ -61,7 +61,7 @@ class ApiClient {
   Future<Response> invokeAPI(
     String path,
     String method,
-    Iterable<QueryParam> queryParams,
+    List<QueryParam> queryParams,
     Object body,
     Map<String, String> headerParams,
     Map<String, String> formParams,
@@ -171,13 +171,13 @@ class ApiClient {
     List<QueryParam> queryParams,
     Map<String, String> headerParams,
   ) {
-    authNames.forEach((authName) {
+    for(final authName in authNames) {
       final auth = _authentications[authName];
       if (auth == null) {
         throw ArgumentError('Authentication undefined: $authName');
       }
       auth.applyToParams(queryParams, headerParams);
-    });
+    }
   }
 
   static dynamic _deserialize(dynamic value, String targetType, {bool growable}) {

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

@@ -54,28 +54,28 @@ class AdditionalPropertiesClass {
           (json[r'map_property'] as Map).cast<String, String>(),
         mapOfMapProperty: json[r'map_of_map_property'] == null
           ? null
-          : Map.mapFromJson(json[r'map_of_map_property']),
+          : (json[r'map_of_map_property'] as Map).cast<String, Map>(),
     );
 
   static List<AdditionalPropertiesClass> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <AdditionalPropertiesClass>[]
-      : json.map((v) => AdditionalPropertiesClass.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => AdditionalPropertiesClass.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, AdditionalPropertiesClass> mapFromJson(Map<String, dynamic> json) {
     final map = <String, AdditionalPropertiesClass>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = AdditionalPropertiesClass.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = AdditionalPropertiesClass.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of AdditionalPropertiesClass-objects as value to a dart map
   static Map<String, List<AdditionalPropertiesClass>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<AdditionalPropertiesClass>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = AdditionalPropertiesClass.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = AdditionalPropertiesClass.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;

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

@@ -54,22 +54,22 @@ class Animal {
   static List<Animal> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
     json == null || json.isEmpty
       ? true == emptyIsNull ? null : <Animal>[]
-      : json.map((v) => Animal.fromJson(v)).toList(growable: true == growable);
+      : json.map((dynamic value) => Animal.fromJson(value)).toList(growable: true == growable);
 
   static Map<String, Animal> mapFromJson(Map<String, dynamic> json) {
     final map = <String, Animal>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = Animal.fromJson(v));
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) => map[key] = Animal.fromJson(value));
     }
     return map;
   }
 
   // maps a json object with a list of Animal-objects as value to a dart map
   static Map<String, List<Animal>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
     final map = <String, List<Animal>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = Animal.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+    if (json?.isNotEmpty == true) {
+      json.forEach((key, value) {
+        map[key] = Animal.listFromJson(value, emptyIsNull: emptyIsNull, growable: growable,);
       });
     }
     return map;