Skip to content

[dart-dio] fixes Enum classes with integer values #8129

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 2 commits into from
Dec 9, 2020
Merged

[dart-dio] fixes Enum classes with integer values #8129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb93aca
[dart-dio] Enum classes with int values now generate correct BuiltVal…
josh-burton Dec 8, 2020
d778131
[dart-dio] Address PR comments
josh-burton Dec 8, 2020
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
2 changes: 1 addition & 1 deletion modules/openapi-generator/src/main/resources/dart-dio/enum.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class {{classname}} extends EnumClass {
{{#description}}
/// {{description}}
{{/description}}
@BuiltValueEnumConst(wireName: {{{value}}})
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isString}}wireName: {{{value}}}{{/isString}})
Copy link
Contributor

@kuhnroyal kuhnroyal Dec 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use {{^isInteger}} to prevent the double enum from failing.

static const {{classname}} {{name}} = _${{name}};
{{/enumVars}}
{{/allowableValues}}
Expand Down
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/dart-dio/enum_inline.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class {{classname}}{{nameInCamelCase}} extends EnumClass {
{{#description}}
/// {{description}}
{{/description}}
@BuiltValueEnumConst(wireName: {{{value}}})
@BuiltValueEnumConst({{#isInteger}}wireNumber: {{{value}}}{{/isInteger}}{{#isString}}wireName: {{{value}}}{{/isString}})
static const {{classname}}{{nameInCamelCase}} {{name}} = _${{name}};
{{/enumVars}}
{{/allowableValues}}
Expand All @@ -16,4 +16,4 @@ class {{classname}}{{nameInCamelCase}} extends EnumClass {

static BuiltSet<{{classname}}{{nameInCamelCase}}> get values => _${{classVarName}}{{nameInCamelCase}}Values;
static {{classname}}{{nameInCamelCase}} valueOf(String name) => _${{classVarName}}{{nameInCamelCase}}ValueOf(name);
}
Copy link
Contributor

@kuhnroyal kuhnroyal Dec 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably revert this line

}
1 change: 1 addition & 0 deletions samples/client/petstore/dart-dio/petstore_client_lib/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ class OrderStatus extends EnumClass {
}



1 change: 1 addition & 0 deletions samples/client/petstore/dart-dio/petstore_client_lib/lib/model/pet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ class PetStatus extends EnumClass {
}



1 change: 1 addition & 0 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ class OrderStatus extends EnumClass {
}



1 change: 1 addition & 0 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/pet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ class PetStatus extends EnumClass {
}



2 changes: 2 additions & 0 deletions ...les/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/enum_arrays.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class EnumArraysJustSymbol extends EnumClass {
}



class EnumArraysArrayEnum extends EnumClass {

@BuiltValueEnumConst(wireName: 'fish')
Expand All @@ -56,3 +57,4 @@ class EnumArraysArrayEnum extends EnumClass {
}



12 changes: 8 additions & 4 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/enum_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class EnumTestEnumString extends EnumClass {
}



class EnumTestEnumStringRequired extends EnumClass {

@BuiltValueEnumConst(wireName: 'UPPER')
Expand All @@ -94,11 +95,12 @@ class EnumTestEnumStringRequired extends EnumClass {
}



class EnumTestEnumInteger extends EnumClass {

@BuiltValueEnumConst(wireName: 1)
@BuiltValueEnumConst(wireNumber: 1)
static const EnumTestEnumInteger number1 = _$number1;
@BuiltValueEnumConst(wireName: -1)
@BuiltValueEnumConst(wireNumber: -1)
static const EnumTestEnumInteger number1 = _$number1;
Copy link
Contributor

@kuhnroyal kuhnroyal Dec 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI just noticed 2 times $number1 here. My changes also don't fix this yet. Need to address this seperatly.


static Serializer<EnumTestEnumInteger> get serializer => _$enumTestEnumIntegerSerializer;
Expand All @@ -110,11 +112,12 @@ class EnumTestEnumInteger extends EnumClass {
}



class EnumTestEnumNumber extends EnumClass {

@BuiltValueEnumConst(wireName: '1.1')
@BuiltValueEnumConst()
static const EnumTestEnumNumber 11_ = _$11_;
@BuiltValueEnumConst(wireName: '-1.2')
Copy link
Contributor

@kuhnroyal kuhnroyal Dec 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See above comment in template. Sadly wireNumber: doesn't support num/double. Probably need to add a custom serializer for this at some point.

@BuiltValueEnumConst()
static const EnumTestEnumNumber 12_ = _$12_;

static Serializer<EnumTestEnumNumber> get serializer => _$enumTestEnumNumberSerializer;
Expand All @@ -126,3 +129,4 @@ class EnumTestEnumNumber extends EnumClass {
}



2 changes: 2 additions & 0 deletions .../openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object2.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class InlineObject2EnumFormStringArray extends EnumClass {
}



class InlineObject2EnumFormString extends EnumClass {

/// Form parameter enum test (string)
Expand All @@ -63,3 +64,4 @@ class InlineObject2EnumFormString extends EnumClass {
}



1 change: 1 addition & 0 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/map_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ class MapTestMapOfEnumString extends EnumClass {
}



1 change: 1 addition & 0 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/order.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ class OrderStatus extends EnumClass {
}



6 changes: 3 additions & 3 deletions ...napi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/outer_enum_integer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ part 'outer_enum_integer.g.dart';

class OuterEnumInteger extends EnumClass {

@BuiltValueEnumConst(wireName: 0)
@BuiltValueEnumConst(wireNumber: 0)
static const OuterEnumInteger number0 = _$number0;
@BuiltValueEnumConst(wireName: 1)
@BuiltValueEnumConst(wireNumber: 1)
static const OuterEnumInteger number1 = _$number1;
@BuiltValueEnumConst(wireName: 2)
@BuiltValueEnumConst(wireNumber: 2)
static const OuterEnumInteger number2 = _$number2;

static Serializer<OuterEnumInteger> get serializer => _$outerEnumIntegerSerializer;
Expand Down
6 changes: 3 additions & 3 deletions ...etstore/dart-dio/petstore_client_lib_fake/lib/model/outer_enum_integer_default_value.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ part 'outer_enum_integer_default_value.g.dart';

class OuterEnumIntegerDefaultValue extends EnumClass {

@BuiltValueEnumConst(wireName: 0)
@BuiltValueEnumConst(wireNumber: 0)
static const OuterEnumIntegerDefaultValue number0 = _$number0;
@BuiltValueEnumConst(wireName: 1)
@BuiltValueEnumConst(wireNumber: 1)
static const OuterEnumIntegerDefaultValue number1 = _$number1;
@BuiltValueEnumConst(wireName: 2)
@BuiltValueEnumConst(wireNumber: 2)
static const OuterEnumIntegerDefaultValue number2 = _$number2;

static Serializer<OuterEnumIntegerDefaultValue> get serializer => _$outerEnumIntegerDefaultValueSerializer;
Expand Down
1 change: 1 addition & 0 deletions samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/pet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ class PetStatus extends EnumClass {
}