Skip to content

[Dart2] Fix bugs with maps could not be deserialized #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 14, 2018
Merged

[Dart2] Fix bugs with maps could not be deserialized #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f01bb3b
fix[dart2]: due to stronger type checking in dart 2, maps could not b…
ircecho Sep 10, 2018
c165ee3
rebuild dart2 petstore
ircecho Sep 10, 2018
1b5a3dd
Merge remote-tracking branch 'origin/master' into typefix
ircecho Sep 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/dart2/class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 2 additions & 3 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/api_response.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/category.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/pet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/tag.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/user.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 2 additions & 3 deletions samples/client/petstore/dart2/openapi-browser-client/lib/model/api_response.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions samples/client/petstore/dart2/openapi-browser-client/lib/model/category.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions samples/client/petstore/dart2/openapi-browser-client/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/openapi-browser-client/lib/model/pet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/openapi-browser-client/lib/model/tag.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/openapi-browser-client/lib/model/user.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
5 changes: 2 additions & 3 deletions samples/client/petstore/dart2/openapi/lib/model/api_response.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 2 additions & 3 deletions samples/client/petstore/dart2/openapi/lib/model/category.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 3 additions & 4 deletions samples/client/petstore/dart2/openapi/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/openapi/lib/model/pet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/openapi/lib/model/tag.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions samples/client/petstore/dart2/openapi/lib/model/user.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down