Skip to content

[Dart] send dates in ISO8601 format #4159

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
wing328 merged 1 commit into from
Nov 9, 2016
Merged

[Dart] send dates in ISO8601 format #4159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions modules/swagger-codegen/src/main/resources/dart/api_client.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class ApiClient {

final dson = new Dartson.JSON()
..addTransformer(new DateTimeParser(), DateTime);
final DateFormat _dateFormatter = new DateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");

final _RegList = new RegExp(r'^List<(.*)>$');
final _RegMap = new RegExp(r'^Map<String,(.*)>$');
Expand All @@ -33,24 +32,6 @@ class ApiClient {
_defaultHeaderMap[key] = value;
}

/// Format the given Date object into string.
String formatDate(DateTime date) {
return _dateFormatter.format(date);
}

/// Format the given parameter object into string.
String parameterToString(Object param) {
if (param == null) {
return '';
} else if (param is DateTime) {
return formatDate(param);
} else if (param is List) {
return (param).join(',');
} else {
return param.toString();
}
}

dynamic _deserialize(dynamic value, String targetType) {
try {
switch (targetType) {
Expand Down
17 changes: 14 additions & 3 deletions modules/swagger-codegen/src/main/resources/dart/api_helper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Iterable<QueryParam> _convertParametersForCollectionFormat(
if (name == null || name.isEmpty || value == null) return params;

if (value is! List) {
params.add(new QueryParam(name, '$value'));
params.add(new QueryParam(name, _parameterToString(value)));
return params;
}

Expand All @@ -23,11 +23,22 @@ Iterable<QueryParam> _convertParametersForCollectionFormat(
: collectionFormat; // default: csv

if (collectionFormat == "multi") {
return values.map((v) => new QueryParam(name, '$v'));
return values.map((v) => new QueryParam(name, _parameterToString(v)));
}

String delimiter = _delimiters[collectionFormat] ?? ",";

params.add(new QueryParam(name, values.join(delimiter)));
params.add(new QueryParam(name, values.map((v)=>_parameterToString(v)).join(delimiter)));
return params;
}

/// Format the given parameter object into string.
String _parameterToString(dynamic value) {
if (value == null) {
return '';
} else if (value is DateTime) {
return value.toUtc().toIso8601String();
} else {
return value.toString();
}
}
1 change: 0 additions & 1 deletion modules/swagger-codegen/src/main/resources/dart/apilib.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:http/browser_client.dart';{{/browserClient}}
import 'package:http/http.dart';
import 'package:dartson/dartson.dart';
import 'package:dartson/transformers/date_time.dart';
import 'package:intl/intl.dart';

part 'api_client.dart';
part 'api_helper.dart';
Expand Down
1 change: 0 additions & 1 deletion modules/swagger-codegen/src/main/resources/dart/pubspec.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ description: {{pubDescription}}
dependencies:
http: '>=0.11.1 <0.12.0'
dartson: "^0.2.4"
intl: ">=0.12.4"

dev_dependencies:
guinness: '^0.1.17'
Expand Down
1 change: 0 additions & 1 deletion samples/client/petstore/dart/swagger/lib/api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:http/browser_client.dart';
import 'package:http/http.dart';
import 'package:dartson/dartson.dart';
import 'package:dartson/transformers/date_time.dart';
import 'package:intl/intl.dart';

part 'api_client.dart';
part 'api_helper.dart';
Expand Down
19 changes: 0 additions & 19 deletions samples/client/petstore/dart/swagger/lib/api_client.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class ApiClient {

final dson = new Dartson.JSON()
..addTransformer(new DateTimeParser(), DateTime);
final DateFormat _dateFormatter = new DateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ");

final _RegList = new RegExp(r'^List<(.*)>$');
final _RegMap = new RegExp(r'^Map<String,(.*)>$');
Expand All @@ -32,24 +31,6 @@ class ApiClient {
_defaultHeaderMap[key] = value;
}

/// Format the given Date object into string.
String formatDate(DateTime date) {
return _dateFormatter.format(date);
}

/// Format the given parameter object into string.
String parameterToString(Object param) {
if (param == null) {
return '';
} else if (param is DateTime) {
return formatDate(param);
} else if (param is List) {
return (param).join(',');
} else {
return param.toString();
}
}

dynamic _deserialize(dynamic value, String targetType) {
try {
switch (targetType) {
Expand Down
17 changes: 14 additions & 3 deletions samples/client/petstore/dart/swagger/lib/api_helper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Iterable<QueryParam> _convertParametersForCollectionFormat(
if (name == null || name.isEmpty || value == null) return params;

if (value is! List) {
params.add(new QueryParam(name, '$value'));
params.add(new QueryParam(name, _parameterToString(value)));
return params;
}

Expand All @@ -23,11 +23,22 @@ Iterable<QueryParam> _convertParametersForCollectionFormat(
: collectionFormat; // default: csv

if (collectionFormat == "multi") {
return values.map((v) => new QueryParam(name, '$v'));
return values.map((v) => new QueryParam(name, _parameterToString(v)));
}

String delimiter = _delimiters[collectionFormat] ?? ",";

params.add(new QueryParam(name, values.join(delimiter)));
params.add(new QueryParam(name, values.map((v)=>_parameterToString(v)).join(delimiter)));
return params;
}

/// Format the given parameter object into string.
String _parameterToString(dynamic value) {
if (value == null) {
return '';
} else if (value is DateTime) {
return value.toUtc().toIso8601String();
} else {
return value.toString();
}
}
1 change: 0 additions & 1 deletion samples/client/petstore/dart/swagger/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ description: Swagger API client
dependencies:
http: '>=0.11.1 <0.12.0'
dartson: "^0.2.4"
intl: ">=0.12.4"

dev_dependencies:
guinness: '^0.1.17'
Expand Down