From 8cc6279c01a08ce57c40d5c0c446350dba5ae721 Mon Sep 17 00:00:00 2001 From: Vasiliy Ditsyak Date: Mon, 2 Sep 2024 11:28:32 +0200 Subject: [PATCH 1/3] [BUGFIX][dart-dio] Align `enum` and `enum_inline` generation result --- .../json_serializable/enum_inline.mustache | 16 +++- .../lib/src/model/child_with_nullable.dart | 15 +++- .../lib/src/model/enum_arrays.dart | 38 ++++++--- .../lib/src/model/enum_test.dart | 84 ++++++++++++------- .../lib/src/model/map_test.dart | 19 +++-- .../lib/src/model/order.dart | 27 ++++-- .../lib/src/model/parent_with_nullable.dart | 15 +++- .../lib/src/model/pet.dart | 27 ++++-- 8 files changed, 169 insertions(+), 72 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache index 53cd77098740..3b441c237c90 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache @@ -6,9 +6,21 @@ enum {{{ enumName }}} { {{#allowableValues}} {{#enumVars}} - @JsonValue({{#isString}}r{{/isString}}{{{value}}}) - {{{name}}}, +{{^isNull}} +{{#description}} + /// {{{.}}} +{{/description}} +@JsonValue({{#isString}}r{{/isString}}{{{value}}}) +{{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} +{{/isNull}} {{/enumVars}} {{/allowableValues}} + +const {{{enumName}}}(this.value); + +final String value; + +@override +String toString() => value; } {{/enumName}} \ No newline at end of file diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart index 22b9df5c55a4..61faa249bc45 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart @@ -91,10 +91,17 @@ class ChildWithNullable { enum ChildWithNullableTypeEnum { - @JsonValue(r'ChildWithNullable') - childWithNullable, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'ChildWithNullable') +childWithNullable(r'ChildWithNullable'), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const ChildWithNullableTypeEnum(this.value); + +final String value; + +@override +String toString() => value; } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart index 46959e7ccd72..6e2c199d3845 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart @@ -72,23 +72,37 @@ class EnumArrays { enum EnumArraysJustSymbolEnum { - @JsonValue(r'>=') - greaterThanEqual, - @JsonValue(r'$') - dollar, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'>=') +greaterThanEqual(r'>='), +@JsonValue(r'$') +dollar(r'$'), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const EnumArraysJustSymbolEnum(this.value); + +final String value; + +@override +String toString() => value; } enum EnumArraysArrayEnumEnum { - @JsonValue(r'fish') - fish, - @JsonValue(r'crab') - crab, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'fish') +fish(r'fish'), +@JsonValue(r'crab') +crab(r'crab'), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const EnumArraysArrayEnumEnum(this.value); + +final String value; + +@override +String toString() => value; } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart index 687e674d211a..7aa72fe0559c 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart @@ -172,49 +172,77 @@ class EnumTest { enum EnumTestEnumStringEnum { - @JsonValue(r'UPPER') - UPPER, - @JsonValue(r'lower') - lower, - @JsonValue(r'') - empty, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'UPPER') +UPPER(r'UPPER'), +@JsonValue(r'lower') +lower(r'lower'), +@JsonValue(r'') +empty(r''), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const EnumTestEnumStringEnum(this.value); + +final String value; + +@override +String toString() => value; } enum EnumTestEnumStringRequiredEnum { - @JsonValue(r'UPPER') - UPPER, - @JsonValue(r'lower') - lower, - @JsonValue(r'') - empty, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'UPPER') +UPPER(r'UPPER'), +@JsonValue(r'lower') +lower(r'lower'), +@JsonValue(r'') +empty(r''), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const EnumTestEnumStringRequiredEnum(this.value); + +final String value; + +@override +String toString() => value; } enum EnumTestEnumIntegerEnum { - @JsonValue(1) - number1, - @JsonValue(-1) - numberNegative1, - @JsonValue(11184809) - unknownDefaultOpenApi, +@JsonValue(1) +number1('1'), +@JsonValue(-1) +numberNegative1('-1'), +@JsonValue(11184809) +unknownDefaultOpenApi('11184809'); + +const EnumTestEnumIntegerEnum(this.value); + +final String value; + +@override +String toString() => value; } enum EnumTestEnumNumberEnum { - @JsonValue('1.1') - number1Period1, - @JsonValue('-1.2') - numberNegative1Period2, - @JsonValue('11184809') - unknownDefaultOpenApi, +@JsonValue('1.1') +number1Period1(''1.1''), +@JsonValue('-1.2') +numberNegative1Period2(''-1.2''), +@JsonValue('11184809') +unknownDefaultOpenApi(''11184809''); + +const EnumTestEnumNumberEnum(this.value); + +final String value; + +@override +String toString() => value; } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart index beb4547b7702..13cf820e0c9e 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart @@ -104,12 +104,19 @@ class MapTest { enum MapTestMapOfEnumStringEnum { - @JsonValue(r'UPPER') - UPPER, - @JsonValue(r'lower') - lower, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'UPPER') +UPPER(r'UPPER'), +@JsonValue(r'lower') +lower(r'lower'), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const MapTestMapOfEnumStringEnum(this.value); + +final String value; + +@override +String toString() => value; } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart index 00b4e62e0a14..9d745c6dd9a1 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart @@ -137,14 +137,25 @@ class Order { /// Order Status enum OrderStatusEnum { - @JsonValue(r'placed') - placed, - @JsonValue(r'approved') - approved, - @JsonValue(r'delivered') - delivered, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, + /// Order Status +@JsonValue(r'placed') +placed(r'placed'), + /// Order Status +@JsonValue(r'approved') +approved(r'approved'), + /// Order Status +@JsonValue(r'delivered') +delivered(r'delivered'), + /// Order Status +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const OrderStatusEnum(this.value); + +final String value; + +@override +String toString() => value; } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart index 880c2c33cec1..3496af6f6c3a 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart @@ -72,10 +72,17 @@ class ParentWithNullable { enum ParentWithNullableTypeEnum { - @JsonValue(r'ChildWithNullable') - childWithNullable, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, +@JsonValue(r'ChildWithNullable') +childWithNullable(r'ChildWithNullable'), +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const ParentWithNullableTypeEnum(this.value); + +final String value; + +@override +String toString() => value; } diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart index 1e7a108b7600..8a7ac6ad6354 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart @@ -139,14 +139,25 @@ class Pet { /// pet status in the store enum PetStatusEnum { - @JsonValue(r'available') - available, - @JsonValue(r'pending') - pending, - @JsonValue(r'sold') - sold, - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi, + /// pet status in the store +@JsonValue(r'available') +available(r'available'), + /// pet status in the store +@JsonValue(r'pending') +pending(r'pending'), + /// pet status in the store +@JsonValue(r'sold') +sold(r'sold'), + /// pet status in the store +@JsonValue(r'unknown_default_open_api') +unknownDefaultOpenApi(r'unknown_default_open_api'); + +const PetStatusEnum(this.value); + +final String value; + +@override +String toString() => value; } From 9d0b263f5cffdc5c2856bb2ec45f6f0a263f4ee4 Mon Sep 17 00:00:00 2001 From: Vasiliy Ditsyak Date: Mon, 2 Sep 2024 23:10:53 +0200 Subject: [PATCH 2/3] review fixes --- .../json_serializable/enum.mustache | 12 +++++------- .../json_serializable/enum_inline.mustache | 2 -- .../lib/src/model/model_enum_class.dart | 16 ++++++++-------- .../lib/src/model/outer_enum.dart | 16 ++++++++-------- .../lib/src/model/outer_enum_default_value.dart | 16 ++++++++-------- .../lib/src/model/outer_enum_integer.dart | 16 ++++++++-------- .../model/outer_enum_integer_default_value.dart | 16 ++++++++-------- .../lib/src/model/single_ref_type.dart | 12 ++++++------ 8 files changed, 51 insertions(+), 55 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache index 6446c73972fa..66bd77045fbb 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache @@ -7,13 +7,11 @@ import 'package:json_annotation/json_annotation.dart'; enum {{{classname}}} { {{#allowableValues}} {{#enumVars}} - {{^isNull}} - {{#description}} - /// {{{.}}} - {{/description}} - @JsonValue({{#isString}}r{{/isString}}{{{value}}}) - {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} - {{/isNull}} + {{#description}} + /// {{{.}}} + {{/description}} + @JsonValue({{#isString}}r{{/isString}}{{{value}}}) + {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache index 3b441c237c90..d8e62c16936e 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache @@ -6,13 +6,11 @@ enum {{{ enumName }}} { {{#allowableValues}} {{#enumVars}} -{{^isNull}} {{#description}} /// {{{.}}} {{/description}} @JsonValue({{#isString}}r{{/isString}}{{{value}}}) {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} -{{/isNull}} {{/enumVars}} {{/allowableValues}} diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart index 7ff6301e9edf..2cecd3b9c72c 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum ModelEnumClass { - @JsonValue(r'_abc') - abc(r'_abc'), - @JsonValue(r'-efg') - efg(r'-efg'), - @JsonValue(r'(xyz)') - leftParenthesisXyzRightParenthesis(r'(xyz)'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'_abc') + abc(r'_abc'), + @JsonValue(r'-efg') + efg(r'-efg'), + @JsonValue(r'(xyz)') + leftParenthesisXyzRightParenthesis(r'(xyz)'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const ModelEnumClass(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart index e7687f47c55b..c3ba7b26a6b6 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnum { - @JsonValue(r'placed') - placed(r'placed'), - @JsonValue(r'approved') - approved(r'approved'), - @JsonValue(r'delivered') - delivered(r'delivered'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'placed') + placed(r'placed'), + @JsonValue(r'approved') + approved(r'approved'), + @JsonValue(r'delivered') + delivered(r'delivered'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const OuterEnum(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart index e232c230492f..955683b929b3 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnumDefaultValue { - @JsonValue(r'placed') - placed(r'placed'), - @JsonValue(r'approved') - approved(r'approved'), - @JsonValue(r'delivered') - delivered(r'delivered'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'placed') + placed(r'placed'), + @JsonValue(r'approved') + approved(r'approved'), + @JsonValue(r'delivered') + delivered(r'delivered'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const OuterEnumDefaultValue(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart index 304ecf5f51ff..b1464c0dda3c 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnumInteger { - @JsonValue(0) - number0('0'), - @JsonValue(1) - number1('1'), - @JsonValue(2) - number2('2'), - @JsonValue(11184809) - unknownDefaultOpenApi('11184809'); + @JsonValue(0) + number0('0'), + @JsonValue(1) + number1('1'), + @JsonValue(2) + number2('2'), + @JsonValue(11184809) + unknownDefaultOpenApi('11184809'); const OuterEnumInteger(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart index 6483e0b837fe..64c416abec7c 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnumIntegerDefaultValue { - @JsonValue(0) - number0('0'), - @JsonValue(1) - number1('1'), - @JsonValue(2) - number2('2'), - @JsonValue(11184809) - unknownDefaultOpenApi('11184809'); + @JsonValue(0) + number0('0'), + @JsonValue(1) + number1('1'), + @JsonValue(2) + number2('2'), + @JsonValue(11184809) + unknownDefaultOpenApi('11184809'); const OuterEnumIntegerDefaultValue(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart index 3ea636c76a1e..9ee2644bf813 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart @@ -7,12 +7,12 @@ import 'package:json_annotation/json_annotation.dart'; enum SingleRefType { - @JsonValue(r'admin') - admin(r'admin'), - @JsonValue(r'user') - user(r'user'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'admin') + admin(r'admin'), + @JsonValue(r'user') + user(r'user'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const SingleRefType(this.value); From 134bbdfad607527d93ca23e789e2b78c57525b29 Mon Sep 17 00:00:00 2001 From: Vasiliy Ditsyak Date: Mon, 2 Sep 2024 23:54:24 +0200 Subject: [PATCH 3/3] Revert "review fixes" This reverts commit 9d0b263f5cffdc5c2856bb2ec45f6f0a263f4ee4. --- .../json_serializable/enum.mustache | 12 +++++++----- .../json_serializable/enum_inline.mustache | 2 ++ .../lib/src/model/model_enum_class.dart | 16 ++++++++-------- .../lib/src/model/outer_enum.dart | 16 ++++++++-------- .../lib/src/model/outer_enum_default_value.dart | 16 ++++++++-------- .../lib/src/model/outer_enum_integer.dart | 16 ++++++++-------- .../model/outer_enum_integer_default_value.dart | 16 ++++++++-------- .../lib/src/model/single_ref_type.dart | 12 ++++++------ 8 files changed, 55 insertions(+), 51 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache index 66bd77045fbb..6446c73972fa 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache @@ -7,11 +7,13 @@ import 'package:json_annotation/json_annotation.dart'; enum {{{classname}}} { {{#allowableValues}} {{#enumVars}} - {{#description}} - /// {{{.}}} - {{/description}} - @JsonValue({{#isString}}r{{/isString}}{{{value}}}) - {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} + {{^isNull}} + {{#description}} + /// {{{.}}} + {{/description}} + @JsonValue({{#isString}}r{{/isString}}{{{value}}}) + {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} + {{/isNull}} {{/enumVars}} {{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache index d8e62c16936e..3b441c237c90 100644 --- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache +++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum_inline.mustache @@ -6,11 +6,13 @@ enum {{{ enumName }}} { {{#allowableValues}} {{#enumVars}} +{{^isNull}} {{#description}} /// {{{.}}} {{/description}} @JsonValue({{#isString}}r{{/isString}}{{{value}}}) {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}} +{{/isNull}} {{/enumVars}} {{/allowableValues}} diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart index 2cecd3b9c72c..7ff6301e9edf 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum ModelEnumClass { - @JsonValue(r'_abc') - abc(r'_abc'), - @JsonValue(r'-efg') - efg(r'-efg'), - @JsonValue(r'(xyz)') - leftParenthesisXyzRightParenthesis(r'(xyz)'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'_abc') + abc(r'_abc'), + @JsonValue(r'-efg') + efg(r'-efg'), + @JsonValue(r'(xyz)') + leftParenthesisXyzRightParenthesis(r'(xyz)'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const ModelEnumClass(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart index c3ba7b26a6b6..e7687f47c55b 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnum { - @JsonValue(r'placed') - placed(r'placed'), - @JsonValue(r'approved') - approved(r'approved'), - @JsonValue(r'delivered') - delivered(r'delivered'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'placed') + placed(r'placed'), + @JsonValue(r'approved') + approved(r'approved'), + @JsonValue(r'delivered') + delivered(r'delivered'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const OuterEnum(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart index 955683b929b3..e232c230492f 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnumDefaultValue { - @JsonValue(r'placed') - placed(r'placed'), - @JsonValue(r'approved') - approved(r'approved'), - @JsonValue(r'delivered') - delivered(r'delivered'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'placed') + placed(r'placed'), + @JsonValue(r'approved') + approved(r'approved'), + @JsonValue(r'delivered') + delivered(r'delivered'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const OuterEnumDefaultValue(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart index b1464c0dda3c..304ecf5f51ff 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnumInteger { - @JsonValue(0) - number0('0'), - @JsonValue(1) - number1('1'), - @JsonValue(2) - number2('2'), - @JsonValue(11184809) - unknownDefaultOpenApi('11184809'); + @JsonValue(0) + number0('0'), + @JsonValue(1) + number1('1'), + @JsonValue(2) + number2('2'), + @JsonValue(11184809) + unknownDefaultOpenApi('11184809'); const OuterEnumInteger(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart index 64c416abec7c..6483e0b837fe 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart @@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart'; enum OuterEnumIntegerDefaultValue { - @JsonValue(0) - number0('0'), - @JsonValue(1) - number1('1'), - @JsonValue(2) - number2('2'), - @JsonValue(11184809) - unknownDefaultOpenApi('11184809'); + @JsonValue(0) + number0('0'), + @JsonValue(1) + number1('1'), + @JsonValue(2) + number2('2'), + @JsonValue(11184809) + unknownDefaultOpenApi('11184809'); const OuterEnumIntegerDefaultValue(this.value); diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart index 9ee2644bf813..3ea636c76a1e 100644 --- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart +++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart @@ -7,12 +7,12 @@ import 'package:json_annotation/json_annotation.dart'; enum SingleRefType { - @JsonValue(r'admin') - admin(r'admin'), - @JsonValue(r'user') - user(r'user'), - @JsonValue(r'unknown_default_open_api') - unknownDefaultOpenApi(r'unknown_default_open_api'); + @JsonValue(r'admin') + admin(r'admin'), + @JsonValue(r'user') + user(r'user'), + @JsonValue(r'unknown_default_open_api') + unknownDefaultOpenApi(r'unknown_default_open_api'); const SingleRefType(this.value);