Skip to content

[dart-dio] Fix non legacy discriminator behavior #14291

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 15 commits into from
Jan 2, 2023
Merged

[dart-dio] Fix non legacy discriminator behavior #14291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
139bcfb
override createDiscriminator
ahmednfwela Dec 20, 2022
a410925
assign discriminator = null to remove duplicates
ahmednfwela Dec 20, 2022
91acb72
added discriminatorValue extension
ahmednfwela Dec 20, 2022
db5c229
added _defaults
ahmednfwela Dec 20, 2022
0d00861
formatting
ahmednfwela Dec 20, 2022
d2bf302
samples
ahmednfwela Dec 20, 2022
8f3b24b
use gitter instead
ahmednfwela Dec 20, 2022
f471c1b
remove comment
ahmednfwela Dec 20, 2022
b401182
updated samples
ahmednfwela Dec 20, 2022
7b6d235
revert formatting changes
ahmednfwela Dec 20, 2022
51ca294
update samples
ahmednfwela Dec 20, 2022
7b74fc9
change file permissions
ahmednfwela Dec 29, 2022
43cc795
Merge branch 'master' of github.com:OpenAPITools/openapi-generator in…
ahmednfwela Jan 1, 2023
17cb24b
remove discriminator check for anyOf
ahmednfwela Jan 2, 2023
b6b5a6d
add comment to createDiscriminator
ahmednfwela Jan 2, 2023
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
Prev Previous commit
Next Next commit
update samples
  • Loading branch information
@ahmednfwela
ahmednfwela committed Dec 20, 2022
commit 51ca2946eabf24446b96ca4cc58da3fa6ac0fda8
10 changes: 5 additions & 5 deletions samples/openapi3/client/petstore/dart-dio/oneof/lib/src/model/apple.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class _$AppleSerializer implements PrimitiveSerializer<Apple> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.kind != null) {
yield r'kind';
yield serializers.serialize(
object.kind,
specifiedType: const FullType(String),
);
yield r'kind';
yield serializers.serialize(
object.kind,
specifiedType: const FullType(String),
);
}
}

Expand Down
10 changes: 5 additions & 5 deletions samples/openapi3/client/petstore/dart-dio/oneof/lib/src/model/banana.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ class _$BananaSerializer implements PrimitiveSerializer<Banana> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.count != null) {
yield r'count';
yield serializers.serialize(
object.count,
specifiedType: const FullType(num),
);
yield r'count';
yield serializers.serialize(
object.count,
specifiedType: const FullType(num),
);
}
}

Expand Down
10 changes: 5 additions & 5 deletions samples/openapi3/client/petstore/dart-dio/oneof/lib/src/model/fruit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ class _$FruitSerializer implements PrimitiveSerializer<Fruit> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.color != null) {
yield r'color';
yield serializers.serialize(
object.color,
specifiedType: const FullType(String),
);
yield r'color';
yield serializers.serialize(
object.color,
specifiedType: const FullType(String),
);
}
}

Expand Down
20 changes: 10 additions & 10 deletions ...lient/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/addressable.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@ class _$AddressableSerializer implements PrimitiveSerializer<Addressable> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.href != null) {
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
}
if (object.id != null) {
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
}
}

Expand Down
70 changes: 35 additions & 35 deletions ...enapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,58 +56,58 @@ class _$BarSerializer implements PrimitiveSerializer<Bar> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.atSchemaLocation != null) {
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
}
if (object.foo != null) {
yield r'foo';
yield serializers.serialize(
object.foo,
specifiedType: const FullType(FooRefOrValue),
);
yield r'foo';
yield serializers.serialize(
object.foo,
specifiedType: const FullType(FooRefOrValue),
);
}
if (object.atBaseType != null) {
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
}
if (object.fooPropB != null) {
yield r'fooPropB';
yield serializers.serialize(
object.fooPropB,
specifiedType: const FullType(String),
);
yield r'fooPropB';
yield serializers.serialize(
object.fooPropB,
specifiedType: const FullType(String),
);
}
if (object.href != null) {
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
}
if (object.id != null) {
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
}
yield r'@type';
yield serializers.serialize(
object.atType,
specifiedType: const FullType(String),
);
if (object.barPropA != null) {
yield r'barPropA';
yield serializers.serialize(
object.barPropA,
specifiedType: const FullType(String),
);
yield r'barPropA';
yield serializers.serialize(
object.barPropA,
specifiedType: const FullType(String),
);
}
}

Expand Down
70 changes: 35 additions & 35 deletions ...client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/bar_create.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,58 +56,58 @@ class _$BarCreateSerializer implements PrimitiveSerializer<BarCreate> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.atSchemaLocation != null) {
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
}
if (object.foo != null) {
yield r'foo';
yield serializers.serialize(
object.foo,
specifiedType: const FullType(FooRefOrValue),
);
yield r'foo';
yield serializers.serialize(
object.foo,
specifiedType: const FullType(FooRefOrValue),
);
}
if (object.atBaseType != null) {
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
}
if (object.fooPropB != null) {
yield r'fooPropB';
yield serializers.serialize(
object.fooPropB,
specifiedType: const FullType(String),
);
yield r'fooPropB';
yield serializers.serialize(
object.fooPropB,
specifiedType: const FullType(String),
);
}
if (object.href != null) {
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
}
if (object.id != null) {
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
}
yield r'@type';
yield serializers.serialize(
object.atType,
specifiedType: const FullType(String),
);
if (object.barPropA != null) {
yield r'barPropA';
yield serializers.serialize(
object.barPropA,
specifiedType: const FullType(String),
);
yield r'barPropA';
yield serializers.serialize(
object.barPropA,
specifiedType: const FullType(String),
);
}
}

Expand Down
60 changes: 30 additions & 30 deletions ...i3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/bar_ref.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,46 +43,46 @@ class _$BarRefSerializer implements PrimitiveSerializer<BarRef> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.atSchemaLocation != null) {
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
}
if (object.atReferredType != null) {
yield r'@referredType';
yield serializers.serialize(
object.atReferredType,
specifiedType: const FullType(String),
);
yield r'@referredType';
yield serializers.serialize(
object.atReferredType,
specifiedType: const FullType(String),
);
}
if (object.name != null) {
yield r'name';
yield serializers.serialize(
object.name,
specifiedType: const FullType(String),
);
yield r'name';
yield serializers.serialize(
object.name,
specifiedType: const FullType(String),
);
}
if (object.atBaseType != null) {
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
}
if (object.href != null) {
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
}
if (object.id != null) {
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
}
yield r'@type';
yield serializers.serialize(
Expand Down
40 changes: 20 additions & 20 deletions ...pi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/lib/src/model/entity.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,32 +101,32 @@ class _$EntitySerializer implements PrimitiveSerializer<Entity> {
FullType specifiedType = FullType.unspecified,
}) sync* {
if (object.atSchemaLocation != null) {
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
yield r'@schemaLocation';
yield serializers.serialize(
object.atSchemaLocation,
specifiedType: const FullType(String),
);
}
if (object.atBaseType != null) {
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
yield r'@baseType';
yield serializers.serialize(
object.atBaseType,
specifiedType: const FullType(String),
);
}
if (object.href != null) {
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
yield r'href';
yield serializers.serialize(
object.href,
specifiedType: const FullType(String),
);
}
if (object.id != null) {
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
yield r'id';
yield serializers.serialize(
object.id,
specifiedType: const FullType(String),
);
}
yield r'@type';
yield serializers.serialize(
Expand Down
Loading