Skip to content

Commit c0f5c57

Browse files
author
David Gamero
committed
merge master and samples
1 parent 9bdff08 commit c0f5c57

5 files changed

Lines changed: 40 additions & 40 deletions

File tree

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_duplicate_inline_enum.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ class ObjectWithDuplicateInlineEnum {
2929
name: r'attribute',
3030
required: false,
3131
includeIfNull: false,
32-
unknownEnumValue: Set<AttributeEnum>.unknownDefaultOpenApi,
32+
unknownEnumValue: Set<ObjectWithDuplicateInlineEnumAttributeEnum>.unknownDefaultOpenApi,
3333
)
3434

3535

36-
final Set<AttributeEnum>? attribute;
36+
final Set<ObjectWithDuplicateInlineEnumAttributeEnum>? attribute;
3737

3838

3939

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_inline_enum.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ class ObjectWithInlineEnum {
5959
}
6060

6161

62-
enum ObjectWithDuplicateInlineEnumAttributeEnum {
62+
enum ObjectWithInlineEnumAttributeEnum {
6363
@JsonValue(r'value_one')
6464
valueOne(r'value_one'),
6565
@JsonValue(r'value_two')
6666
valueTwo(r'value_two'),
6767
@JsonValue(r'unknown_default_open_api')
6868
unknownDefaultOpenApi(r'unknown_default_open_api');
6969

70-
const ObjectWithDuplicateInlineEnumAttributeEnum(this.value);
70+
const ObjectWithInlineEnumAttributeEnum(this.value);
7171

7272
final String value;
7373

‎samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/src/model/object_with_inline_enum.dart‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ part 'object_with_inline_enum.g.dart';
1717
abstract class ObjectWithInlineEnum implements Built<ObjectWithInlineEnum, ObjectWithInlineEnumBuilder> {
1818
/// Object one attribute enum
1919
@BuiltValueField(wireName: r'attribute')
20-
BuiltSet<ObjectWithDuplicateInlineEnumAttributeEnum>? get attribute;
20+
BuiltSet<ObjectWithInlineEnumAttributeEnum>? get attribute;
2121
// enum attributeEnum { value_one, value_two, };
2222

2323
ObjectWithInlineEnum._();
@@ -47,7 +47,7 @@ class _$ObjectWithInlineEnumSerializer implements PrimitiveSerializer<ObjectWith
4747
yield r'attribute';
4848
yield serializers.serialize(
4949
object.attribute,
50-
specifiedType: const FullType(BuiltSet, [FullType(ObjectWithDuplicateInlineEnumAttributeEnum)]),
50+
specifiedType: const FullType(BuiltSet, [FullType(ObjectWithInlineEnumAttributeEnum)]),
5151
);
5252
}
5353
}
@@ -76,8 +76,8 @@ class _$ObjectWithInlineEnumSerializer implements PrimitiveSerializer<ObjectWith
7676
case r'attribute':
7777
final valueDes = serializers.deserialize(
7878
value,
79-
specifiedType: const FullType(BuiltSet, [FullType(ObjectWithDuplicateInlineEnumAttributeEnum)]),
80-
) as BuiltSet<ObjectWithDuplicateInlineEnumAttributeEnum>;
79+
specifiedType: const FullType(BuiltSet, [FullType(ObjectWithInlineEnumAttributeEnum)]),
80+
) as BuiltSet<ObjectWithInlineEnumAttributeEnum>;
8181
result.attribute.replace(valueDes);
8282
break;
8383
default:
@@ -109,20 +109,20 @@ class _$ObjectWithInlineEnumSerializer implements PrimitiveSerializer<ObjectWith
109109
}
110110
}
111111

112-
class ObjectWithDuplicateInlineEnumAttributeEnum extends EnumClass {
112+
class ObjectWithInlineEnumAttributeEnum extends EnumClass {
113113

114114
@BuiltValueEnumConst(wireName: r'value_one')
115-
static const ObjectWithDuplicateInlineEnumAttributeEnum valueOne = _$objectWithDuplicateInlineEnumAttributeEnum_valueOne;
115+
static const ObjectWithInlineEnumAttributeEnum valueOne = _$objectWithInlineEnumAttributeEnum_valueOne;
116116
@BuiltValueEnumConst(wireName: r'value_two')
117-
static const ObjectWithDuplicateInlineEnumAttributeEnum valueTwo = _$objectWithDuplicateInlineEnumAttributeEnum_valueTwo;
117+
static const ObjectWithInlineEnumAttributeEnum valueTwo = _$objectWithInlineEnumAttributeEnum_valueTwo;
118118
@BuiltValueEnumConst(wireName: r'unknown_default_open_api', fallback: true)
119-
static const ObjectWithDuplicateInlineEnumAttributeEnum unknownDefaultOpenApi = _$objectWithDuplicateInlineEnumAttributeEnum_unknownDefaultOpenApi;
119+
static const ObjectWithInlineEnumAttributeEnum unknownDefaultOpenApi = _$objectWithInlineEnumAttributeEnum_unknownDefaultOpenApi;
120120

121-
static Serializer<ObjectWithDuplicateInlineEnumAttributeEnum> get serializer => _$objectWithDuplicateInlineEnumAttributeEnumSerializer;
121+
static Serializer<ObjectWithInlineEnumAttributeEnum> get serializer => _$objectWithInlineEnumAttributeEnumSerializer;
122122

123-
const ObjectWithDuplicateInlineEnumAttributeEnum._(String name): super(name);
123+
const ObjectWithInlineEnumAttributeEnum._(String name): super(name);
124124

125-
static BuiltSet<ObjectWithDuplicateInlineEnumAttributeEnum> get values => _$objectWithDuplicateInlineEnumAttributeEnumValues;
126-
static ObjectWithDuplicateInlineEnumAttributeEnum valueOf(String name) => _$objectWithDuplicateInlineEnumAttributeEnumValueOf(name);
125+
static BuiltSet<ObjectWithInlineEnumAttributeEnum> get values => _$objectWithInlineEnumAttributeEnumValues;
126+
static ObjectWithInlineEnumAttributeEnum valueOf(String name) => _$objectWithInlineEnumAttributeEnumValueOf(name);
127127
}
128128

‎samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/object_with_duplicate_inline_enum.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ObjectWithDuplicateInlineEnum {
1717
});
1818

1919
/// Object two attribute enum
20-
Set<AttributeEnum> attribute;
20+
Set<ObjectWithDuplicateInlineEnumAttributeEnum> attribute;
2121

2222
@override
2323
bool operator ==(Object other) => identical(this, other) || other is ObjectWithDuplicateInlineEnum &&

‎samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/object_with_inline_enum.dart‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class ObjectWithInlineEnum {
5656
}());
5757

5858
return ObjectWithInlineEnum(
59-
attribute: ObjectWithDuplicateInlineEnumAttributeEnum.listFromJson(json[r'attribute']).toSet(),
59+
attribute: ObjectWithInlineEnumAttributeEnum.listFromJson(json[r'attribute']).toSet(),
6060
);
6161
}
6262
return null;
@@ -108,9 +108,9 @@ class ObjectWithInlineEnum {
108108
}
109109

110110

111-
class ObjectWithDuplicateInlineEnumAttributeEnum {
111+
class ObjectWithInlineEnumAttributeEnum {
112112
/// Instantiate a new enum with the provided [value].
113-
const ObjectWithDuplicateInlineEnumAttributeEnum._(this.value);
113+
const ObjectWithInlineEnumAttributeEnum._(this.value);
114114

115115
/// The underlying value of this enum member.
116116
final String value;
@@ -120,22 +120,22 @@ class ObjectWithDuplicateInlineEnumAttributeEnum {
120120

121121
String toJson() => value;
122122

123-
static const valueOne = ObjectWithDuplicateInlineEnumAttributeEnum._(r'value_one');
124-
static const valueTwo = ObjectWithDuplicateInlineEnumAttributeEnum._(r'value_two');
123+
static const valueOne = ObjectWithInlineEnumAttributeEnum._(r'value_one');
124+
static const valueTwo = ObjectWithInlineEnumAttributeEnum._(r'value_two');
125125

126-
/// List of all possible values in this [enum][ObjectWithDuplicateInlineEnumAttributeEnum].
127-
static const values = <ObjectWithDuplicateInlineEnumAttributeEnum>[
126+
/// List of all possible values in this [enum][ObjectWithInlineEnumAttributeEnum].
127+
static const values = <ObjectWithInlineEnumAttributeEnum>[
128128
valueOne,
129129
valueTwo,
130130
];
131131

132-
static ObjectWithDuplicateInlineEnumAttributeEnum? fromJson(dynamic value) => ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer().decode(value);
132+
static ObjectWithInlineEnumAttributeEnum? fromJson(dynamic value) => ObjectWithInlineEnumAttributeEnumTypeTransformer().decode(value);
133133

134-
static List<ObjectWithDuplicateInlineEnumAttributeEnum> listFromJson(dynamic json, {bool growable = false,}) {
135-
final result = <ObjectWithDuplicateInlineEnumAttributeEnum>[];
134+
static List<ObjectWithInlineEnumAttributeEnum> listFromJson(dynamic json, {bool growable = false,}) {
135+
final result = <ObjectWithInlineEnumAttributeEnum>[];
136136
if (json is List && json.isNotEmpty) {
137137
for (final row in json) {
138-
final value = ObjectWithDuplicateInlineEnumAttributeEnum.fromJson(row);
138+
final value = ObjectWithInlineEnumAttributeEnum.fromJson(row);
139139
if (value != null) {
140140
result.add(value);
141141
}
@@ -145,28 +145,28 @@ class ObjectWithDuplicateInlineEnumAttributeEnum {
145145
}
146146
}
147147

148-
/// Transformation class that can [encode] an instance of [ObjectWithDuplicateInlineEnumAttributeEnum] to String,
149-
/// and [decode] dynamic data back to [ObjectWithDuplicateInlineEnumAttributeEnum].
150-
class ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer {
151-
factory ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer() => _instance ??= const ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer._();
148+
/// Transformation class that can [encode] an instance of [ObjectWithInlineEnumAttributeEnum] to String,
149+
/// and [decode] dynamic data back to [ObjectWithInlineEnumAttributeEnum].
150+
class ObjectWithInlineEnumAttributeEnumTypeTransformer {
151+
factory ObjectWithInlineEnumAttributeEnumTypeTransformer() => _instance ??= const ObjectWithInlineEnumAttributeEnumTypeTransformer._();
152152

153-
const ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer._();
153+
const ObjectWithInlineEnumAttributeEnumTypeTransformer._();
154154

155-
String encode(ObjectWithDuplicateInlineEnumAttributeEnum data) => data.value;
155+
String encode(ObjectWithInlineEnumAttributeEnum data) => data.value;
156156

157-
/// Decodes a [dynamic value][data] to a ObjectWithDuplicateInlineEnumAttributeEnum.
157+
/// Decodes a [dynamic value][data] to a ObjectWithInlineEnumAttributeEnum.
158158
///
159159
/// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
160160
/// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
161161
/// cannot be decoded successfully, then an [UnimplementedError] is thrown.
162162
///
163163
/// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
164164
/// and users are still using an old app with the old code.
165-
ObjectWithDuplicateInlineEnumAttributeEnum? decode(dynamic data, {bool allowNull = true}) {
165+
ObjectWithInlineEnumAttributeEnum? decode(dynamic data, {bool allowNull = true}) {
166166
if (data != null) {
167167
switch (data) {
168-
case r'value_one': return ObjectWithDuplicateInlineEnumAttributeEnum.valueOne;
169-
case r'value_two': return ObjectWithDuplicateInlineEnumAttributeEnum.valueTwo;
168+
case r'value_one': return ObjectWithInlineEnumAttributeEnum.valueOne;
169+
case r'value_two': return ObjectWithInlineEnumAttributeEnum.valueTwo;
170170
default:
171171
if (!allowNull) {
172172
throw ArgumentError('Unknown enum value to decode: $data');
@@ -176,8 +176,8 @@ class ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer {
176176
return null;
177177
}
178178

179-
/// Singleton [ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer] instance.
180-
static ObjectWithDuplicateInlineEnumAttributeEnumTypeTransformer? _instance;
179+
/// Singleton [ObjectWithInlineEnumAttributeEnumTypeTransformer] instance.
180+
static ObjectWithInlineEnumAttributeEnumTypeTransformer? _instance;
181181
}
182182

183183

0 commit comments

Comments
 (0)