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

ircecho · wing328 · commit 58e43ceeec29 · 2018-09-14T18:40:37.000+08:00
* fix[dart2]: due to stronger type checking in dart 2, maps could not be deserialized

* rebuild dart2 petstore
diff --git a/modules/openapi-generator/src/main/resources/dart2/class.mustache b/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;
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/api_response.dart b/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;
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/category.dart b/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;
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/order.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/pet.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/tag.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/user.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/model/api_response.dart b/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;
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/model/category.dart b/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;
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/model/order.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/model/pet.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/model/tag.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/model/user.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/model/api_response.dart b/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;
diff --git a/samples/client/petstore/dart2/openapi/lib/model/category.dart b/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;
diff --git a/samples/client/petstore/dart2/openapi/lib/model/order.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/model/pet.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/model/tag.dart b/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;
   }
diff --git a/samples/client/petstore/dart2/openapi/lib/model/user.dart b/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;
   }

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,10 @@ class {{classname}} {`
`72`	`72`	`return json == null ? new List<{{classname}}>() : json.map((value) => new {{classname}}.fromJson(value)).toList();`
`73`	`73`	`}`
`74`	`74`
`75`		`- static Map<String, {{classname}}> mapFromJson(Map<String, Map<String, dynamic>> json) {`
	`75`	`+ static Map<String, {{classname}}> mapFromJson(Map<String, dynamic> json) {`
`76`	`76`	`var map = new Map<String, {{classname}}>();`
`77`	`77`	`if (json != null && json.length > 0) {`
`78`		`- json.forEach((String key, Map<String, dynamic> value) => map[key] = new {{classname}}.fromJson(value));`
	`78`	`+ json.forEach((String key, dynamic value) => map[key] = new {{classname}}.fromJson(value));`
`79`	`79`	`}`
`80`	`80`	`return map;`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,10 @@ class ApiResponse {`
`30`	`30`	`: json.map((value) => new ApiResponse.fromJson(value)).toList();`
`31`	`31`	`}`
`32`	`32`
`33`		`- static Map<String, ApiResponse> mapFromJson(`
`34`		`- Map<String, Map<String, dynamic>> json) {`
	`33`	`+ static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {`
`35`	`34`	`var map = new Map<String, ApiResponse>();`
`36`	`35`	`if (json != null && json.length > 0) {`
`37`		`- json.forEach((String key, Map<String, dynamic> value) =>`
	`36`	`+ json.forEach((String key, dynamic value) =>`
`38`	`37`	`map[key] = new ApiResponse.fromJson(value));`
`39`	`38`	`}`
`40`	`39`	`return map;`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,10 @@ class Category {`
`27`	`27`	`: json.map((value) => new Category.fromJson(value)).toList();`
`28`	`28`	`}`
`29`	`29`
`30`		`- static Map<String, Category> mapFromJson(`
`31`		`- Map<String, Map<String, dynamic>> json) {`
	`30`	`+ static Map<String, Category> mapFromJson(Map<String, dynamic> json) {`
`32`	`31`	`var map = new Map<String, Category>();`
`33`	`32`	`if (json != null && json.length > 0) {`
`34`		`- json.forEach((String key, Map<String, dynamic> value) =>`
	`33`	`+ json.forEach((String key, dynamic value) =>`
`35`	`34`	`map[key] = new Category.fromJson(value));`
`36`	`35`	`}`
`37`	`36`	`return map;`
Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,11 @@ class Order {`
`48`	`48`	`: json.map((value) => new Order.fromJson(value)).toList();`
`49`	`49`	`}`
`50`	`50`
`51`		`- static Map<String, Order> mapFromJson(`
`52`		`- Map<String, Map<String, dynamic>> json) {`
	`51`	`+ static Map<String, Order> mapFromJson(Map<String, dynamic> json) {`
`53`	`52`	`var map = new Map<String, Order>();`
`54`	`53`	`if (json != null && json.length > 0) {`
`55`		`- json.forEach((String key, Map<String, dynamic> value) =>`
`56`		`- map[key] = new Order.fromJson(value));`
	`54`	`+ json.forEach(`
	`55`	`+ (String key, dynamic value) => map[key] = new Order.fromJson(value));`
`57`	`56`	`}`
`58`	`57`	`return map;`
`59`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,11 +49,11 @@ class Pet {`
`49`	`49`	`: json.map((value) => new Pet.fromJson(value)).toList();`
`50`	`50`	`}`
`51`	`51`
`52`		`- static Map<String, Pet> mapFromJson(Map<String, Map<String, dynamic>> json) {`
	`52`	`+ static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {`
`53`	`53`	`var map = new Map<String, Pet>();`
`54`	`54`	`if (json != null && json.length > 0) {`
`55`		`- json.forEach((String key, Map<String, dynamic> value) =>`
`56`		`- map[key] = new Pet.fromJson(value));`
	`55`	`+ json.forEach(`
	`56`	`+ (String key, dynamic value) => map[key] = new Pet.fromJson(value));`
`57`	`57`	`}`
`58`	`58`	`return map;`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,11 @@ class Tag {`
`27`	`27`	`: json.map((value) => new Tag.fromJson(value)).toList();`
`28`	`28`	`}`
`29`	`29`
`30`		`- static Map<String, Tag> mapFromJson(Map<String, Map<String, dynamic>> json) {`
	`30`	`+ static Map<String, Tag> mapFromJson(Map<String, dynamic> json) {`
`31`	`31`	`var map = new Map<String, Tag>();`
`32`	`32`	`if (json != null && json.length > 0) {`
`33`		`- json.forEach((String key, Map<String, dynamic> value) =>`
`34`		`- map[key] = new Tag.fromJson(value));`
	`33`	`+ json.forEach(`
	`34`	`+ (String key, dynamic value) => map[key] = new Tag.fromJson(value));`
`35`	`35`	`}`
`36`	`36`	`return map;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ class User {`
`54`	`54`	`: json.map((value) => new User.fromJson(value)).toList();`
`55`	`55`	`}`
`56`	`56`
`57`		`- static Map<String, User> mapFromJson(Map<String, Map<String, dynamic>> json) {`
	`57`	`+ static Map<String, User> mapFromJson(Map<String, dynamic> json) {`
`58`	`58`	`var map = new Map<String, User>();`
`59`	`59`	`if (json != null && json.length > 0) {`
`60`		`- json.forEach((String key, Map<String, dynamic> value) =>`
`61`		`- map[key] = new User.fromJson(value));`
	`60`	`+ json.forEach(`
	`61`	`+ (String key, dynamic value) => map[key] = new User.fromJson(value));`
`62`	`62`	`}`
`63`	`63`	`return map;`
`64`	`64`	`}`