From f0fd2cbb22ccbb14467f29f1798ea0d03ae84e2d Mon Sep 17 00:00:00 2001
From: sbu <64100880+sbu-WBT@users.noreply.github.com>
Date: Fri, 21 Aug 2020 04:23:44 +0200
Subject: [PATCH] Date format dart (#6389)

* Correct date format of date formatted strings

* Update petstore

* Regenerate samples on linux

* Remove final for letting the user configure custom date formats

Co-authored-by: SimonIT <simonit.orig@gmail.com>
---
 .../src/main/resources/dart2/api_helper.mustache                | 1 +
 .../openapi-generator/src/main/resources/dart2/apilib.mustache  | 1 +
 .../openapi-generator/src/main/resources/dart2/class.mustache   | 2 +-
 .../openapi-generator/src/main/resources/dart2/pubspec.mustache | 1 +
 samples/client/petstore/dart2/petstore_client_lib/lib/api.dart  | 1 +
 .../petstore/dart2/petstore_client_lib/lib/api_helper.dart      | 1 +
 samples/client/petstore/dart2/petstore_client_lib/pubspec.yaml  | 1 +
 7 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache b/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
index 7027f30a5b6..1b1f309018d 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
@@ -1,6 +1,7 @@
 part of {{pubName}}.api;
 
 const _delimiters = const {'csv': ',', 'ssv': ' ', 'tsv': '\t', 'pipes': '|'};
+var _dateFormatter = DateFormat('yyyy-MM-dd');
 
 // port from Java version
 Iterable<QueryParam> _convertParametersForCollectionFormat(
diff --git a/modules/openapi-generator/src/main/resources/dart2/apilib.mustache b/modules/openapi-generator/src/main/resources/dart2/apilib.mustache
index 14c674c97de..00bdc428551 100644
--- a/modules/openapi-generator/src/main/resources/dart2/apilib.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/apilib.mustache
@@ -3,6 +3,7 @@ library {{pubName}}.api;
 import 'dart:async';
 import 'dart:convert';
 import 'package:http/http.dart';
+import 'package:intl/intl.dart';
 import 'package:meta/meta.dart';
 
 part 'api_client.dart';
diff --git a/modules/openapi-generator/src/main/resources/dart2/class.mustache b/modules/openapi-generator/src/main/resources/dart2/class.mustache
index 5fb4f82cfb1..a7ddbb4ae17 100644
--- a/modules/openapi-generator/src/main/resources/dart2/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/class.mustache
@@ -120,7 +120,7 @@ class {{classname}} {
       json['{{baseName}}'] = {{name}} == null ? null : {{name}}.toUtc().toIso8601String();
       {{/isDateTime}}
       {{#isDate}}
-      json['{{baseName}}'] = {{name}} == null ? null : {{name}}.toUtc().toIso8601String();
+      json['{{baseName}}'] = {{name}} == null ? null : _dateFormatter.format({{name}}.toUtc());
       {{/isDate}}
       {{^isDateTime}}
       {{^isDate}}
diff --git a/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache
index ab082fe34d8..88c70e22709 100644
--- a/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache
@@ -8,6 +8,7 @@ environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
   http: '>=0.12.0 <0.13.0'
+  intl: ^0.16.1
   meta: ^1.1.8
 dev_dependencies:
   test: ^1.3.0
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api.dart
index c13c8922431..baf59a69c13 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api.dart
@@ -3,6 +3,7 @@ library openapi.api;
 import 'dart:async';
 import 'dart:convert';
 import 'package:http/http.dart';
+import 'package:intl/intl.dart';
 import 'package:meta/meta.dart';
 
 part 'api_client.dart';
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api_helper.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api_helper.dart
index c57b111ca87..919e442caf1 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api_helper.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api_helper.dart
@@ -1,6 +1,7 @@
 part of openapi.api;
 
 const _delimiters = const {'csv': ',', 'ssv': ' ', 'tsv': '\t', 'pipes': '|'};
+var _dateFormatter = DateFormat('yyyy-MM-dd');
 
 // port from Java version
 Iterable<QueryParam> _convertParametersForCollectionFormat(
diff --git a/samples/client/petstore/dart2/petstore_client_lib/pubspec.yaml b/samples/client/petstore/dart2/petstore_client_lib/pubspec.yaml
index 023b0822fdf..49a6c58c4e7 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/pubspec.yaml
+++ b/samples/client/petstore/dart2/petstore_client_lib/pubspec.yaml
@@ -8,6 +8,7 @@ environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
   http: '>=0.12.0 <0.13.0'
+  intl: ^0.16.1
   meta: ^1.1.8
 dev_dependencies:
   test: ^1.3.0