Skip to content

Commit 2e1add8

Browse files
kuronekomichaelwing328
authored andcommitted
BugFix: Dart-lang template bugs (#567)
* BugFix: [Dart] Cannot get/set data from json when underscore("_") is included in spec.yaml's property name Because the property name is always lowerCamelCase * BugFix: When type is "Date", it is not correctly output
1 parent 2e6bec7 commit 2e1add8

1 file changed

Lines changed: 18 additions & 8 deletions

File tree

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,35 @@ class {{classname}} {
1717
if (json == null) return;
1818
{{#vars}}
1919
{{#isDateTime}}
20-
{{name}} = json['{{name}}'] == null ? null : DateTime.parse(json['{{name}}']);
20+
{{name}} = json['{{baseName}}'] == null ? null : DateTime.parse(json['{{baseName}}']);
2121
{{/isDateTime}}
22+
{{#isDate}}
23+
{{name}} = json['{{baseName}}'] == null ? null : DateTime.parse(json['{{baseName}}']);
24+
{{/isDate}}
2225
{{^isDateTime}}
26+
{{^isDate}}
2327
{{#complexType}}
2428
{{#isListContainer}}
25-
{{name}} = {{complexType}}.listFromJson(json['{{name}}']);
29+
{{name}} = {{complexType}}.listFromJson(json['{{baseName}}']);
2630
{{/isListContainer}}
2731
{{^isListContainer}}
2832
{{#isMapContainer}}
29-
{{name}} = {{complexType}}.mapFromJson(json['{{name}}']);
33+
{{name}} = {{complexType}}.mapFromJson(json['{{baseName}}']);
3034
{{/isMapContainer}}
3135
{{^isMapContainer}}
32-
{{name}} = new {{complexType}}.fromJson(json['{{name}}']);
36+
{{name}} = new {{complexType}}.fromJson(json['{{baseName}}']);
3337
{{/isMapContainer}}
3438
{{/isListContainer}}
3539
{{/complexType}}
3640
{{^complexType}}
3741
{{#isListContainer}}
38-
{{name}} = (json['{{name}}'] as List).map((item) => item as {{items.datatype}}).toList();
42+
{{name}} = (json['{{baseName}}'] as List).map((item) => item as {{items.datatype}}).toList();
3943
{{/isListContainer}}
4044
{{^isListContainer}}
41-
{{name}} = json['{{name}}'];
45+
{{name}} = json['{{baseName}}'];
4246
{{/isListContainer}}
4347
{{/complexType}}
48+
{{/isDate}}
4449
{{/isDateTime}}
4550
{{/vars}}
4651
}
@@ -49,10 +54,15 @@ class {{classname}} {
4954
return {
5055
{{#vars}}
5156
{{#isDateTime}}
52-
'{{name}}': {{name}} == null ? '' : {{name}}.toUtc().toIso8601String(){{^-last}},{{/-last}}
57+
'{{baseName}}': {{name}} == null ? '' : {{name}}.toUtc().toIso8601String(){{^-last}},{{/-last}}
5358
{{/isDateTime}}
59+
{{#isDate}}
60+
'{{baseName}}': {{name}} == null ? '' : {{name}}.toUtc().toIso8601String(){{^-last}},{{/-last}}
61+
{{/isDate}}
5462
{{^isDateTime}}
55-
'{{name}}': {{name}}{{^-last}},{{/-last}}
63+
{{^isDate}}
64+
'{{baseName}}': {{name}}{{^-last}},{{/-last}}
65+
{{/isDate}}
5666
{{/isDateTime}}
5767
{{/vars}}
5868
};

0 commit comments

Comments
 (0)