loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[dart-dio] Adds support for enumUnknownDefaultCase to dart builtvalue enums (#12080)

Browse Source
This commit is contained in:
Josh Burton 2022-04-09 13:35:42 +12:00 committed by GitHub
parent 346dfbc102
commit 97eca73160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/configs/dart-dio-next-petstore-client-lib-fake.yaml
View File

@ -8,3 +8,4 @@ typeMappings:
EnumClass: "ModelEnumClass"
additionalProperties:
hideGenerationTimestamp: "true"
enumUnknownDefaultCase: "true"

1
bin/configs/dart-dio-petstore-client-lib.yaml
View File

@ -4,3 +4,4 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/dart-dio
additionalProperties:
hideGenerationTimestamp: "true"
enumUnknownDefaultCase: "true"

2
modules/openapi-generator/src/main/resources/dart-dio/enum.mustache vendored
View File

@ -11,7 +11,7 @@ class {{classname}} extends EnumClass {
{{#description}}
/// {{{.}}}
{{/description}}
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{^isInteger}}wireName: r{{#lambda.escapeBuiltValueEnum}}{{{value}}}{{/lambda.escapeBuiltValueEnum}}{{/isInteger}})
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{^isInteger}}wireName: r{{#lambda.escapeBuiltValueEnum}}{{{value}}}{{/lambda.escapeBuiltValueEnum}}{{/isInteger}}{{#enumUnknownDefaultCase}}{{#-last}}, fallback: true{{/-last}}{{/enumUnknownDefaultCase}})
static const {{classname}} {{name}} = _${{name}};
{{/enumVars}}
{{/allowableValues}}

2
modules/openapi-generator/src/main/resources/dart-dio/enum_inline.mustache vendored
View File

@ -5,7 +5,7 @@ class {{{enumName}}} extends EnumClass {
{{#description}}
/// {{{.}}}
{{/description}}
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{^isInteger}}wireName: r{{#lambda.escapeBuiltValueEnum}}{{{value}}}{{/lambda.escapeBuiltValueEnum}}{{/isInteger}})
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{^isInteger}}wireName: r{{#lambda.escapeBuiltValueEnum}}{{{value}}}{{/lambda.escapeBuiltValueEnum}}{{/isInteger}}{{#enumUnknownDefaultCase}}{{#-last}}, fallback: true{{/-last}}{{/enumUnknownDefaultCase}})
static const {{{enumName}}} {{name}} = _${{#lambda.camelcase}}{{{enumName}}}{{/lambda.camelcase}}_{{name}};
{{/enumVars}}
{{/allowableValues}}

2
modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum.mustache vendored
View File

@ -11,7 +11,7 @@ class {{classname}} extends EnumClass {
{{#description}}
/// {{{.}}}
{{/description}}
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isLong}}wireNumber: {{{value}}}{{/isLong}}{{^isInteger}}{{^isLong}}wireName: r{{{value}}}{{/isLong}}{{/isInteger}})
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isLong}}wireNumber: {{{value}}}{{/isLong}}{{^isInteger}}{{^isLong}}wireName: r{{{value}}}{{/isLong}}{{/isInteger}}{{#enumUnknownDefaultCase}}{{#-last}}, fallback: true{{/-last}}{{/enumUnknownDefaultCase}})
static const {{classname}} {{name}} = _${{name}};
{{/enumVars}}
{{/allowableValues}}

2
modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/enum_inline.mustache vendored
View File

@ -5,7 +5,7 @@ class {{{enumName}}} extends EnumClass {
{{#description}}
/// {{{.}}}
{{/description}}
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isLong}}wireNumber: {{{value}}}{{/isLong}}{{^isInteger}}{{^isLong}}wireName: r{{{value}}}{{/isLong}}{{/isInteger}})
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isLong}}wireNumber: {{{value}}}{{/isLong}}{{^isInteger}}{{^isLong}}wireName: r{{{value}}}{{/isLong}}{{/isInteger}}{{#enumUnknownDefaultCase}}{{#-last}}, fallback: true{{/-last}}{{/enumUnknownDefaultCase}})
static const {{{enumName}}} {{name}} = _${{#lambda.camelcase}}{{{enumName}}}{{/lambda.camelcase}}_{{name}};
{{/enumVars}}
{{/allowableValues}}

4
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_arrays.dart
View File

@ -93,6 +93,8 @@ class EnumArraysJustSymbolEnum extends EnumClass {
static const EnumArraysJustSymbolEnum greaterThanEqual = _$enumArraysJustSymbolEnum_greaterThanEqual;
@BuiltValueEnumConst(wireName: r'$')
static const EnumArraysJustSymbolEnum dollar = _$enumArraysJustSymbolEnum_dollar;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const EnumArraysJustSymbolEnum unknownDefaultOpenApi = _$enumArraysJustSymbolEnum_unknownDefaultOpenApi;
static Serializer<EnumArraysJustSymbolEnum> get serializer => _$enumArraysJustSymbolEnumSerializer;
@ -108,6 +110,8 @@ class EnumArraysArrayEnumEnum extends EnumClass {
static const EnumArraysArrayEnumEnum fish = _$enumArraysArrayEnumEnum_fish;
@BuiltValueEnumConst(wireName: r'crab')
static const EnumArraysArrayEnumEnum crab = _$enumArraysArrayEnumEnum_crab;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const EnumArraysArrayEnumEnum unknownDefaultOpenApi = _$enumArraysArrayEnumEnum_unknownDefaultOpenApi;
static Serializer<EnumArraysArrayEnumEnum> get serializer => _$enumArraysArrayEnumEnumSerializer;

8
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/enum_test.dart
View File

@ -194,6 +194,8 @@ class EnumTestEnumStringEnum extends EnumClass {
static const EnumTestEnumStringEnum lower = _$enumTestEnumStringEnum_lower;
@BuiltValueEnumConst(wireName: r'')
static const EnumTestEnumStringEnum empty = _$enumTestEnumStringEnum_empty;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const EnumTestEnumStringEnum unknownDefaultOpenApi = _$enumTestEnumStringEnum_unknownDefaultOpenApi;
static Serializer<EnumTestEnumStringEnum> get serializer => _$enumTestEnumStringEnumSerializer;
@ -211,6 +213,8 @@ class EnumTestEnumStringRequiredEnum extends EnumClass {
static const EnumTestEnumStringRequiredEnum lower = _$enumTestEnumStringRequiredEnum_lower;
@BuiltValueEnumConst(wireName: r'')
static const EnumTestEnumStringRequiredEnum empty = _$enumTestEnumStringRequiredEnum_empty;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const EnumTestEnumStringRequiredEnum unknownDefaultOpenApi = _$enumTestEnumStringRequiredEnum_unknownDefaultOpenApi;
static Serializer<EnumTestEnumStringRequiredEnum> get serializer => _$enumTestEnumStringRequiredEnumSerializer;
@ -226,6 +230,8 @@ class EnumTestEnumIntegerEnum extends EnumClass {
static const EnumTestEnumIntegerEnum number1 = _$enumTestEnumIntegerEnum_number1;
@BuiltValueEnumConst(wireNumber: -1)
static const EnumTestEnumIntegerEnum numberNegative1 = _$enumTestEnumIntegerEnum_numberNegative1;
@BuiltValueEnumConst(wireNumber: 11184809, fallback: true)
static const EnumTestEnumIntegerEnum unknownDefaultOpenApi = _$enumTestEnumIntegerEnum_unknownDefaultOpenApi;
static Serializer<EnumTestEnumIntegerEnum> get serializer => _$enumTestEnumIntegerEnumSerializer;
@ -241,6 +247,8 @@ class EnumTestEnumNumberEnum extends EnumClass {
static const EnumTestEnumNumberEnum number1Period1 = _$enumTestEnumNumberEnum_number1Period1;
@BuiltValueEnumConst(wireName: r'-1.2')
static const EnumTestEnumNumberEnum numberNegative1Period2 = _$enumTestEnumNumberEnum_numberNegative1Period2;
@BuiltValueEnumConst(wireName: r'11184809', fallback: true)
static const EnumTestEnumNumberEnum unknownDefaultOpenApi = _$enumTestEnumNumberEnum_unknownDefaultOpenApi;
static Serializer<EnumTestEnumNumberEnum> get serializer => _$enumTestEnumNumberEnumSerializer;

2
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/map_test.dart
View File

@ -122,6 +122,8 @@ class MapTestMapOfEnumStringEnum extends EnumClass {
static const MapTestMapOfEnumStringEnum UPPER = _$mapTestMapOfEnumStringEnum_UPPER;
@BuiltValueEnumConst(wireName: r'lower')
static const MapTestMapOfEnumStringEnum lower = _$mapTestMapOfEnumStringEnum_lower;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const MapTestMapOfEnumStringEnum unknownDefaultOpenApi = _$mapTestMapOfEnumStringEnum_unknownDefaultOpenApi;
static Serializer<MapTestMapOfEnumStringEnum> get serializer => _$mapTestMapOfEnumStringEnumSerializer;

2
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/model_enum_class.dart
View File

@ -16,6 +16,8 @@ class ModelEnumClass extends EnumClass {
static const ModelEnumClass efg = _$efg;
@BuiltValueEnumConst(wireName: r'(xyz)')
static const ModelEnumClass leftParenthesisXyzRightParenthesis = _$leftParenthesisXyzRightParenthesis;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const ModelEnumClass unknownDefaultOpenApi = _$unknownDefaultOpenApi;
static Serializer<ModelEnumClass> get serializer => _$modelEnumClassSerializer;

3
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/order.dart
View File

@ -159,6 +159,9 @@ class OrderStatusEnum extends EnumClass {
/// Order Status
@BuiltValueEnumConst(wireName: r'delivered')
static const OrderStatusEnum delivered = _$orderStatusEnum_delivered;
/// Order Status
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const OrderStatusEnum unknownDefaultOpenApi = _$orderStatusEnum_unknownDefaultOpenApi;
static Serializer<OrderStatusEnum> get serializer => _$orderStatusEnumSerializer;

2
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_enum.dart
View File

@ -16,6 +16,8 @@ class OuterEnum extends EnumClass {
static const OuterEnum approved = _$approved;
@BuiltValueEnumConst(wireName: r'delivered')
static const OuterEnum delivered = _$delivered;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const OuterEnum unknownDefaultOpenApi = _$unknownDefaultOpenApi;
static Serializer<OuterEnum> get serializer => _$outerEnumSerializer;

2
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_enum_default_value.dart
View File

@ -16,6 +16,8 @@ class OuterEnumDefaultValue extends EnumClass {
static const OuterEnumDefaultValue approved = _$approved;
@BuiltValueEnumConst(wireName: r'delivered')
static const OuterEnumDefaultValue delivered = _$delivered;
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const OuterEnumDefaultValue unknownDefaultOpenApi = _$unknownDefaultOpenApi;
static Serializer<OuterEnumDefaultValue> get serializer => _$outerEnumDefaultValueSerializer;

2
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_enum_integer.dart
View File

@ -16,6 +16,8 @@ class OuterEnumInteger extends EnumClass {
static const OuterEnumInteger number1 = _$number1;
@BuiltValueEnumConst(wireNumber: 2)
static const OuterEnumInteger number2 = _$number2;
@BuiltValueEnumConst(wireNumber: 11184809, fallback: true)
static const OuterEnumInteger unknownDefaultOpenApi = _$unknownDefaultOpenApi;
static Serializer<OuterEnumInteger> get serializer => _$outerEnumIntegerSerializer;

2
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/outer_enum_integer_default_value.dart
View File

@ -16,6 +16,8 @@ class OuterEnumIntegerDefaultValue extends EnumClass {
static const OuterEnumIntegerDefaultValue number1 = _$number1;
@BuiltValueEnumConst(wireNumber: 2)
static const OuterEnumIntegerDefaultValue number2 = _$number2;
@BuiltValueEnumConst(wireNumber: 11184809, fallback: true)
static const OuterEnumIntegerDefaultValue unknownDefaultOpenApi = _$unknownDefaultOpenApi;
static Serializer<OuterEnumIntegerDefaultValue> get serializer => _$outerEnumIntegerDefaultValueSerializer;

3
samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/pet.dart
View File

@ -156,6 +156,9 @@ class PetStatusEnum extends EnumClass {
/// pet status in the store
@BuiltValueEnumConst(wireName: r'sold')
static const PetStatusEnum sold = _$petStatusEnum_sold;
/// pet status in the store
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const PetStatusEnum unknownDefaultOpenApi = _$petStatusEnum_unknownDefaultOpenApi;
static Serializer<PetStatusEnum> get serializer => _$petStatusEnumSerializer;

3
samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/order.dart
View File

@ -151,6 +151,9 @@ class OrderStatusEnum extends EnumClass {
/// Order Status
@BuiltValueEnumConst(wireName: r'delivered')
static const OrderStatusEnum delivered = _$orderStatusEnum_delivered;
/// Order Status
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const OrderStatusEnum unknownDefaultOpenApi = _$orderStatusEnum_unknownDefaultOpenApi;
static Serializer<OrderStatusEnum> get serializer => _$orderStatusEnumSerializer;

3
samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/pet.dart
View File

@ -147,6 +147,9 @@ class PetStatusEnum extends EnumClass {
/// pet status in the store
@BuiltValueEnumConst(wireName: r'sold')
static const PetStatusEnum sold = _$petStatusEnum_sold;
/// pet status in the store
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
static const PetStatusEnum unknownDefaultOpenApi = _$petStatusEnum_unknownDefaultOpenApi;
static Serializer<PetStatusEnum> get serializer => _$petStatusEnumSerializer;