Merge pull request #1 from AAkira/dart-dio/json-serializer-date

Dart dio/json serializer date

Author: AAkira

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java

@@ -301,6 +301,12 @@ private void configureDateLibrary(String srcFolder) {
                     importMapping.put("Date", "package:" + pubName + "/" + sourceFolder + "/" + modelPackage() + "/date.dart");
                     supportingFiles.add(new SupportingFile("serialization/built_value/date.mustache", srcFolder + File.separator + modelPackage(), "date.dart"));
                     supportingFiles.add(new SupportingFile("serialization/built_value/date_serializer.mustache", srcFolder, "date_serializer.dart"));
+                } else if (SERIALIZATION_LIBRARY_JSON_SERIALIZABLE.equals(library)) {
+                    typeMapping.put("date", "Date");
+                    typeMapping.put("Date", "Date");
+                    importMapping.put("Date", "package:" + pubName + "/" + sourceFolder + "/" + modelPackage() + "/date.dart");
+                    supportingFiles.add(new SupportingFile("serialization/json_serializable/date.mustache", srcFolder + File.separator + modelPackage(), "date.dart"));
+                    supportingFiles.add(new SupportingFile("serialization/json_serializable/date_serializer.mustache", srcFolder + File.separator + modelPackage(), "date_serializer.dart"));
                 }
                 break;
         }

modules/openapi-generator/src/main/resources/dart/libraries/dio/lib.mustache

@@ -3,8 +3,8 @@ export 'package:{{pubName}}/{{sourceFolder}}/api.dart';
 export 'package:{{pubName}}/{{sourceFolder}}/auth/api_key_auth.dart';
 export 'package:{{pubName}}/{{sourceFolder}}/auth/basic_auth.dart';
 export 'package:{{pubName}}/{{sourceFolder}}/auth/oauth.dart';
-{{#useBuiltValue}}export 'package:{{pubName}}/{{sourceFolder}}/serializers.dart';
-{{#useDateLibCore}}export 'package:{{pubName}}/{{sourceFolder}}/{{modelPackage}}/date.dart';{{/useDateLibCore}}{{/useBuiltValue}}
+{{#useBuiltValue}}export 'package:{{pubName}}/{{sourceFolder}}/serializers.dart';{{/useBuiltValue}}
+{{#useDateLibCore}}export 'package:{{pubName}}/{{sourceFolder}}/{{modelPackage}}/date.dart';{{/useDateLibCore}}
 
 {{#apiInfo}}{{#apis}}export 'package:{{pubName}}/{{sourceFolder}}/{{apiPackage}}/{{classFilename}}.dart';
 {{/apis}}{{/apiInfo}}

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache

@@ -1,4 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
+{{#useDateLibCore}}import 'package:{{pubName}}/{{sourceFolder}}/{{modelPackage}}/date_serializer.dart';{{/useDateLibCore}}
 
 part '{{classFilename}}.g.dart';
 
@@ -50,6 +51,9 @@ class {{{classname}}} {
   @JsonKey(ignore: true)
   {{/isBinary}}
 
+  {{#isDate}}
+  @DateSerializer()
+  {{/isDate}}
 
   {{#required}}
   {{#finalProperties}}final {{/finalProperties}}{{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}} {{{name}}};

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/date.mustache

@@ -0,0 +1,40 @@
+/// A gregorian calendar date generated by
+/// OpenAPI generator to differentiate
+/// between [DateTime] and [Date] formats.
+import 'package:json_annotation/json_annotation.dart';
+
+part 'date.g.dart';
+
+@JsonSerializable(
+  checked: true,
+  createToJson: true,
+  disallowUnrecognizedKeys: false,
+  explicitToJson: true,
+)
+class Date {
+
+  const Date({
+    required this.year,
+    required this.month,
+    required this.day,
+  });
+
+  factory Date.fromJson(Map<String, dynamic> json) => _$DateFromJson(json);
+
+  final int year;
+
+  final int month;
+
+  final int day;
+
+  Map<String, dynamic> toJson() => _$DateToJson(this);
+
+  @override
+  String toString() {
+    final yyyy = year.toString();
+    final mm = month.toString().padLeft(2, '0');
+    final dd = day.toString().padLeft(2, '0');
+
+    return '$yyyy-$mm-$dd';
+  }
+}

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/date_serializer.mustache

@@ -0,0 +1,15 @@
+import 'package:json_annotation/json_annotation.dart';
+import 'package:{{pubName}}/src/model/date.dart';
+
+class DateSerializer implements JsonConverter<Date, String> {
+  const DateSerializer();
+
+  @override
+  Date fromJson(String json) {
+    final parsed = DateTime.parse(json);
+    return Date(year: parsed.year, month: parsed.month, day: parsed.day);
+  }
+
+  @override
+  String toJson(Date object) => object.toString();
+}

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/.openapi-generator/FILES

@@ -84,6 +84,8 @@ lib/src/model/cat.dart
 lib/src/model/cat_all_of.dart
 lib/src/model/category.dart
 lib/src/model/class_model.dart
+lib/src/model/date.dart
+lib/src/model/date_serializer.dart
 lib/src/model/deprecated_object.dart
 lib/src/model/dog.dart
 lib/src/model/dog_all_of.dart

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FakeApi.md

@@ -521,7 +521,7 @@ final int int64 = 789; // int | None
 final double float = 3.4; // double | None
 final String string = string_example; // String | None
 final MultipartFile binary = BINARY_DATA_HERE; // MultipartFile | None
-final DateTime date = 2013-10-20; // DateTime | None
+final Date date = 2013-10-20; // Date | None
 final DateTime dateTime = 2013-10-20T19:20:30+01:00; // DateTime | None
 final String password = password_example; // String | None
 final String callback = callback_example; // String | None
@@ -547,7 +547,7 @@ Name | Type | Description  | Notes
  **float** | **double**| None | [optional] 
  **string** | **String**| None | [optional] 
  **binary** | **MultipartFile**| None | [optional] 
- **date** | **DateTime**| None | [optional] 
+ **date** | **Date**| None | [optional] 
  **dateTime** | **DateTime**| None | [optional] 
  **password** | **String**| None | [optional] 
  **callback** | **String**| None | [optional] 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/FormatTest.md

@@ -18,7 +18,7 @@ Name | Type | Description | Notes
 **string** | **String** |  | [optional] 
 **byte** | **String** |  | 
 **binary** | [**MultipartFile**](MultipartFile.md) |  | [optional] 
-**date** | [**DateTime**](DateTime.md) |  | 
+**date** | [**Date**](Date.md) |  | 
 **dateTime** | [**DateTime**](DateTime.md) |  | [optional] 
 **uuid** | **String** |  | [optional] 
 **password** | **String** |  | 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/doc/NullableClass.md

@@ -12,7 +12,7 @@ Name | Type | Description | Notes
 **numberProp** | **num** |  | [optional] 
 **booleanProp** | **bool** |  | [optional] 
 **stringProp** | **String** |  | [optional] 
-**dateProp** | [**DateTime**](DateTime.md) |  | [optional] 
+**dateProp** | [**Date**](Date.md) |  | [optional] 
 **datetimeProp** | [**DateTime**](DateTime.md) |  | [optional] 
 **arrayNullableProp** | **List<Object>** |  | [optional] 
 **arrayAndItemsNullableProp** | **List<Object>** |  | [optional] 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/openapi.dart

@@ -7,6 +7,7 @@ export 'package:openapi/src/auth/api_key_auth.dart';
 export 'package:openapi/src/auth/basic_auth.dart';
 export 'package:openapi/src/auth/oauth.dart';
 
+export 'package:openapi/src/model/date.dart';
 
 export 'package:openapi/src/api/another_fake_api.dart';
 export 'package:openapi/src/api/default_api.dart';