Skip to content
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

Jump to bottom

Fix epoch deserialization and parsing numbers #15948

Merged
merged 2 commits into from
Jun 29, 2023
Merged

Fix epoch deserialization and parsing numbers #15948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81f80d3
Fix 2 bugs with epoch deserialization and parsing numbers.
noordawod Jun 29, 2023
b6d5150
Generate samples.
noordawod Jun 29, 2023
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ DateTime? mapDateTime(dynamic map, String key, [String? pattern]) {
if (value is int) {
millis = value;
} else if (value is String) {
if (pattern == _dateEpochMarker) {
if (_isEpochMarker(pattern)) {
millis = int.tryParse(value);
} else {
return DateTime.tryParse(value);
Expand Down
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/dart2/apilib.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ final _regSet = RegExp(r'^Set<(.*)>$');
final _regMap = RegExp(r'^Map<String,(.*)>$');

ApiClient defaultApiClient = ApiClient();

bool _isEpochMarker(String? pattern) => pattern == _dateEpochMarker || pattern == '/$_dateEpochMarker/';
12 changes: 6 additions & 6 deletions ...les/openapi-generator/src/main/resources/dart2/serialization/native/native_class.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class {{{classname}}} {
{{/isNullable}}
{{#isDateTime}}
{{#pattern}}
json[r'{{{baseName}}}'] = _dateEpochMarker == '{{{pattern}}}'
json[r'{{{baseName}}}'] = _isEpochMarker(r'{{{pattern}}}')
? this.{{{name}}}{{#isNullable}}!{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}!{{/defaultValue}}{{/required}}{{/isNullable}}.millisecondsSinceEpoch
: this.{{{name}}}{{#isNullable}}!{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}!{{/defaultValue}}{{/required}}{{/isNullable}}.toUtc().toIso8601String();
{{/pattern}}
Expand All @@ -76,7 +76,7 @@ class {{{classname}}} {
{{/isDateTime}}
{{#isDate}}
{{#pattern}}
json[r'{{{baseName}}}'] = _dateEpochMarker == '{{{pattern}}}'
json[r'{{{baseName}}}'] = _isEpochMarker(r'{{{pattern}}}')
? this.{{{name}}}{{#isNullable}}!{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}!{{/defaultValue}}{{/required}}{{/isNullable}}.millisecondsSinceEpoch
: _dateFormatter.format(this.{{{name}}}{{#isNullable}}!{{/isNullable}}{{^isNullable}}{{^required}}{{^defaultValue}}!{{/defaultValue}}{{/required}}{{/isNullable}}.toUtc());
{{/pattern}}
Expand Down Expand Up @@ -128,10 +128,10 @@ class {{{classname}}} {
return {{{classname}}}(
{{#vars}}
{{#isDateTime}}
{{{name}}}: mapDateTime(json, r'{{{baseName}}}', '{{{pattern}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
{{{name}}}: mapDateTime(json, r'{{{baseName}}}', r'{{{pattern}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
{{/isDateTime}}
{{#isDate}}
{{{name}}}: mapDateTime(json, r'{{{baseName}}}', '{{{pattern}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
{{{name}}}: mapDateTime(json, r'{{{baseName}}}', r'{{{pattern}}}'){{#required}}{{^isNullable}}!{{/isNullable}}{{/required}}{{^required}}{{#defaultValue}} ?? {{{.}}}{{/defaultValue}}{{/required}},
{{/isDate}}
{{^isDateTime}}
{{^isDate}}
Expand Down Expand Up @@ -211,9 +211,9 @@ class {{{classname}}} {
{{/isMap}}
{{^isMap}}
{{#isNumber}}
{{{name}}}: json[r'{{{baseName}}}'] == null
{{{name}}}: {{#isNullable}}json[r'{{{baseName}}}'] == null
? {{#defaultValue}}{{{.}}}{{/defaultValue}}{{^defaultValue}}null{{/defaultValue}}
: {{{datatypeWithEnum}}}.parse(json[r'{{{baseName}}}'].toString()),
: {{/isNullable}}{{{datatypeWithEnum}}}.parse('${json[r'{{{baseName}}}']}'),
{{/isNumber}}
{{^isNumber}}
{{^isEnum}}
Expand Down
2 changes: 2 additions & 0 deletions samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ final _regSet = RegExp(r'^Set<(.*)>$');
final _regMap = RegExp(r'^Map<String,(.*)>$');

ApiClient defaultApiClient = ApiClient();

bool _isEpochMarker(String? pattern) => pattern == _dateEpochMarker || pattern == '/$_dateEpochMarker/';
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ DateTime? mapDateTime(dynamic map, String key, [String? pattern]) {
if (value is int) {
millis = value;
} else if (value is String) {
if (pattern == _dateEpochMarker) {
if (_isEpochMarker(pattern)) {
millis = int.tryParse(value);
} else {
return DateTime.tryParse(value);
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class Order {
id: mapValueOfType<int>(json, r'id'),
petId: mapValueOfType<int>(json, r'petId'),
quantity: mapValueOfType<int>(json, r'quantity'),
shipDate: mapDateTime(json, r'shipDate', ''),
shipDate: mapDateTime(json, r'shipDate', r''),
status: OrderStatusEnum.fromJson(json[r'status']),
complete: mapValueOfType<bool>(json, r'complete') ?? false,
);
Expand Down
2 changes: 2 additions & 0 deletions samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,5 @@ final _regSet = RegExp(r'^Set<(.*)>$');
final _regMap = RegExp(r'^Map<String,(.*)>$');

ApiClient defaultApiClient = ApiClient();

bool _isEpochMarker(String? pattern) => pattern == _dateEpochMarker || pattern == '/$_dateEpochMarker/';
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ DateTime? mapDateTime(dynamic map, String key, [String? pattern]) {
if (value is int) {
millis = value;
} else if (value is String) {
if (pattern == _dateEpochMarker) {
if (_isEpochMarker(pattern)) {
millis = int.tryParse(value);
} else {
return DateTime.tryParse(value);
Expand Down
4 changes: 1 addition & 3 deletions ...t/petstore/dart2/petstore_client_lib_fake/lib/model/fake_big_decimal_map200_response.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,7 @@ class FakeBigDecimalMap200Response {
}());

return FakeBigDecimalMap200Response(
someId: json[r'someId'] == null
? null
: num.parse(json[r'someId'].toString()),
someId: num.parse('${json[r'someId']}'),
someMap: mapCastOfType<String, num>(json, r'someMap') ?? const {},
);
}
Expand Down
8 changes: 3 additions & 5 deletions samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/format_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,17 +280,15 @@ class FormatTest {
integer: mapValueOfType<int>(json, r'integer'),
int32: mapValueOfType<int>(json, r'int32'),
int64: mapValueOfType<int>(json, r'int64'),
number: json[r'number'] == null
? null
: num.parse(json[r'number'].toString()),
number: num.parse('${json[r'number']}'),
float: mapValueOfType<double>(json, r'float'),
double_: mapValueOfType<double>(json, r'double'),
decimal: mapValueOfType<double>(json, r'decimal'),
string: mapValueOfType<String>(json, r'string'),
byte: mapValueOfType<String>(json, r'byte')!,
binary: null, // No support for decoding binary content from JSON
date: mapDateTime(json, r'date', '')!,
dateTime: mapDateTime(json, r'dateTime', ''),
date: mapDateTime(json, r'date', r'')!,
dateTime: mapDateTime(json, r'dateTime', r''),
uuid: mapValueOfType<String>(json, r'uuid'),
password: mapValueOfType<String>(json, r'password')!,
patternWithDigits: mapValueOfType<String>(json, r'pattern_with_digits'),
Expand Down
2 changes: 1 addition & 1 deletion .../petstore_client_lib_fake/lib/model/mixed_properties_and_additional_properties_class.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class MixedPropertiesAndAdditionalPropertiesClass {

return MixedPropertiesAndAdditionalPropertiesClass(
uuid: mapValueOfType<String>(json, r'uuid'),
dateTime: mapDateTime(json, r'dateTime', ''),
dateTime: mapDateTime(json, r'dateTime', r''),
map: Animal.mapFromJson(json[r'map']),
);
}
Expand Down
6 changes: 3 additions & 3 deletions ...les/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/nullable_class.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ class NullableClass {
integerProp: mapValueOfType<int>(json, r'integer_prop'),
numberProp: json[r'number_prop'] == null
? null
: num.parse(json[r'number_prop'].toString()),
: num.parse('${json[r'number_prop']}'),
booleanProp: mapValueOfType<bool>(json, r'boolean_prop'),
stringProp: mapValueOfType<String>(json, r'string_prop'),
dateProp: mapDateTime(json, r'date_prop', ''),
datetimeProp: mapDateTime(json, r'datetime_prop', ''),
dateProp: mapDateTime(json, r'date_prop', r''),
datetimeProp: mapDateTime(json, r'datetime_prop', r''),
arrayNullableProp: Object.listFromJson(json[r'array_nullable_prop']),
arrayAndItemsNullableProp: Object.listFromJson(json[r'array_and_items_nullable_prop']),
arrayItemsNullable: Object.listFromJson(json[r'array_items_nullable']),
Expand Down
4 changes: 1 addition & 3 deletions samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/number_only.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ class NumberOnly {
}());

return NumberOnly(
justNumber: json[r'JustNumber'] == null
? null
: num.parse(json[r'JustNumber'].toString()),
justNumber: num.parse('${json[r'JustNumber']}'),
);
}
return null;
Expand Down
4 changes: 1 addition & 3 deletions ...ient/petstore/dart2/petstore_client_lib_fake/lib/model/object_with_deprecated_fields.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ class ObjectWithDeprecatedFields {

return ObjectWithDeprecatedFields(
uuid: mapValueOfType<String>(json, r'uuid'),
id: json[r'id'] == null
? null
: num.parse(json[r'id'].toString()),
id: num.parse('${json[r'id']}'),
deprecatedRef: DeprecatedObject.fromJson(json[r'deprecatedRef']),
bars: json[r'bars'] is Iterable
? (json[r'bars'] as Iterable).cast<String>().toList(growable: false)
Expand Down
2 changes: 1 addition & 1 deletion samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class Order {
id: mapValueOfType<int>(json, r'id'),
petId: mapValueOfType<int>(json, r'petId'),
quantity: mapValueOfType<int>(json, r'quantity'),
shipDate: mapDateTime(json, r'shipDate', ''),
shipDate: mapDateTime(json, r'shipDate', r''),
status: OrderStatusEnum.fromJson(json[r'status']),
complete: mapValueOfType<bool>(json, r'complete') ?? false,
);
Expand Down
4 changes: 1 addition & 3 deletions ...es/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/outer_composite.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ class OuterComposite {
}());

return OuterComposite(
myNumber: json[r'my_number'] == null
? null
: num.parse(json[r'my_number'].toString()),
myNumber: num.parse('${json[r'my_number']}'),
myString: mapValueOfType<String>(json, r'my_string'),
myBoolean: mapValueOfType<bool>(json, r'my_boolean'),
);
Expand Down
Loading