[DART2] Maps could not be deserialized in dart 2 (#1007)

* fix[dart2]: due to stronger type checking in dart 2, maps could not be deserialized

* rebuild dart2 petstore

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

@@ -72,10 +72,10 @@ class {{classname}} {
     return json == null ? new List<{{classname}}>() : json.map((value) => new {{classname}}.fromJson(value)).toList();
   }
 
-  static Map<String, {{classname}}> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, {{classname}}> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, {{classname}}>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) => map[key] = new {{classname}}.fromJson(value));
+      json.forEach((String key, dynamic value) => map[key] = new {{classname}}.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/api_response.dart

@@ -30,11 +30,10 @@ class ApiResponse {
         : json.map((value) => new ApiResponse.fromJson(value)).toList();
   }
 
-  static Map<String, ApiResponse> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, ApiResponse>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
+      json.forEach((String key, dynamic value) =>
           map[key] = new ApiResponse.fromJson(value));
     }
     return map;

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/category.dart

@@ -27,11 +27,10 @@ class Category {
         : json.map((value) => new Category.fromJson(value)).toList();
   }
 
-  static Map<String, Category> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, Category> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Category>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
+      json.forEach((String key, dynamic value) =>
           map[key] = new Category.fromJson(value));
     }
     return map;

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/order.dart

@@ -48,12 +48,11 @@ class Order {
         : json.map((value) => new Order.fromJson(value)).toList();
   }
 
-  static Map<String, Order> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, Order> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Order>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Order.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Order.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/pet.dart

@@ -49,11 +49,11 @@ class Pet {
         : json.map((value) => new Pet.fromJson(value)).toList();
   }
 
-  static Map<String, Pet> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Pet>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Pet.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Pet.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/tag.dart

@@ -27,11 +27,11 @@ class Tag {
         : json.map((value) => new Tag.fromJson(value)).toList();
   }
 
-  static Map<String, Tag> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, Tag> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Tag>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Tag.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Tag.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/user.dart

@@ -54,11 +54,11 @@ class User {
         : json.map((value) => new User.fromJson(value)).toList();
   }
 
-  static Map<String, User> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, User> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, User>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new User.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new User.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi-browser-client/lib/model/api_response.dart

@@ -30,11 +30,10 @@ class ApiResponse {
         : json.map((value) => new ApiResponse.fromJson(value)).toList();
   }
 
-  static Map<String, ApiResponse> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, ApiResponse>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
+      json.forEach((String key, dynamic value) =>
           map[key] = new ApiResponse.fromJson(value));
     }
     return map;

samples/client/petstore/dart2/openapi-browser-client/lib/model/category.dart

@@ -27,11 +27,10 @@ class Category {
         : json.map((value) => new Category.fromJson(value)).toList();
   }
 
-  static Map<String, Category> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, Category> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Category>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
+      json.forEach((String key, dynamic value) =>
           map[key] = new Category.fromJson(value));
     }
     return map;

samples/client/petstore/dart2/openapi-browser-client/lib/model/order.dart

@@ -48,12 +48,11 @@ class Order {
         : json.map((value) => new Order.fromJson(value)).toList();
   }
 
-  static Map<String, Order> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, Order> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Order>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Order.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Order.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi-browser-client/lib/model/pet.dart

@@ -49,11 +49,11 @@ class Pet {
         : json.map((value) => new Pet.fromJson(value)).toList();
   }
 
-  static Map<String, Pet> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Pet>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Pet.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Pet.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi-browser-client/lib/model/tag.dart

@@ -27,11 +27,11 @@ class Tag {
         : json.map((value) => new Tag.fromJson(value)).toList();
   }
 
-  static Map<String, Tag> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, Tag> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Tag>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Tag.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Tag.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi-browser-client/lib/model/user.dart

@@ -54,11 +54,11 @@ class User {
         : json.map((value) => new User.fromJson(value)).toList();
   }
 
-  static Map<String, User> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, User> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, User>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new User.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new User.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi/lib/model/api_response.dart

@@ -30,11 +30,10 @@ class ApiResponse {
         : json.map((value) => new ApiResponse.fromJson(value)).toList();
   }
 
-  static Map<String, ApiResponse> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, ApiResponse>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
+      json.forEach((String key, dynamic value) =>
           map[key] = new ApiResponse.fromJson(value));
     }
     return map;

samples/client/petstore/dart2/openapi/lib/model/category.dart

@@ -27,11 +27,10 @@ class Category {
         : json.map((value) => new Category.fromJson(value)).toList();
   }
 
-  static Map<String, Category> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, Category> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Category>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
+      json.forEach((String key, dynamic value) =>
           map[key] = new Category.fromJson(value));
     }
     return map;

samples/client/petstore/dart2/openapi/lib/model/order.dart

@@ -48,12 +48,11 @@ class Order {
         : json.map((value) => new Order.fromJson(value)).toList();
   }
 
-  static Map<String, Order> mapFromJson(
-      Map<String, Map<String, dynamic>> json) {
+  static Map<String, Order> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Order>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Order.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Order.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi/lib/model/pet.dart

@@ -49,11 +49,11 @@ class Pet {
         : json.map((value) => new Pet.fromJson(value)).toList();
   }
 
-  static Map<String, Pet> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Pet>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Pet.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Pet.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi/lib/model/tag.dart

@@ -27,11 +27,11 @@ class Tag {
         : json.map((value) => new Tag.fromJson(value)).toList();
   }
 
-  static Map<String, Tag> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, Tag> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, Tag>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new Tag.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new Tag.fromJson(value));
     }
     return map;
   }

samples/client/petstore/dart2/openapi/lib/model/user.dart

@@ -54,11 +54,11 @@ class User {
         : json.map((value) => new User.fromJson(value)).toList();
   }
 
-  static Map<String, User> mapFromJson(Map<String, Map<String, dynamic>> json) {
+  static Map<String, User> mapFromJson(Map<String, dynamic> json) {
     var map = new Map<String, User>();
     if (json != null && json.length > 0) {
-      json.forEach((String key, Map<String, dynamic> value) =>
-          map[key] = new User.fromJson(value));
+      json.forEach(
+          (String key, dynamic value) => map[key] = new User.fromJson(value));
     }
     return map;
   }