From 66cf899d30a67931d30475bb25dc2c73ce8da332 Mon Sep 17 00:00:00 2001 From: Nikolas Rimikis Date: Mon, 13 Nov 2023 08:13:31 +0100 Subject: [PATCH] fix(dynamite_end_to_end_test): fix spec validity Signed-off-by: Nikolas Rimikis --- .../lib/nested_ofs.openapi.dart | 5 +- .../lib/nested_ofs.openapi.g.dart | 122 ++---------------- .../lib/nested_ofs.openapi.json | 6 - .../test/nested_ofs_test.dart | 14 +- 4 files changed, 15 insertions(+), 132 deletions(-) diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart b/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart index 2119651b..67738069 100644 --- a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart +++ b/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.dart @@ -241,14 +241,13 @@ class _$BaseAnyOfSerializer implements PrimitiveSerializer { } @BuiltValue(instantiable: false) -abstract interface class BaseNestedAllOf_3Interface { +abstract interface class BaseNestedAllOf_1Interface { @BuiltValueField(wireName: 'attribute-nested-allOf') String get attributeNestedAllOf; } @BuiltValue(instantiable: false) -abstract interface class BaseNestedAllOfInterface - implements BaseAllOfInterface, BaseOneOfInterface, BaseAnyOfInterface, BaseNestedAllOf_3Interface {} +abstract interface class BaseNestedAllOfInterface implements BaseAllOfInterface, BaseNestedAllOf_1Interface {} abstract class BaseNestedAllOf implements BaseNestedAllOfInterface, Built { factory BaseNestedAllOf([final void Function(BaseNestedAllOfBuilder)? b]) = _$BaseNestedAllOf; diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart b/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart index 9de20256..873ce6b3 100644 --- a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart +++ b/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.g.dart @@ -187,25 +187,7 @@ class _$BaseNestedAllOfSerializer implements StructuredSerializer, BaseAnyO } } -abstract mixin class BaseNestedAllOf_3InterfaceBuilder { - void replace(BaseNestedAllOf_3Interface other); - void update(void Function(BaseNestedAllOf_3InterfaceBuilder) updates); +abstract mixin class BaseNestedAllOf_1InterfaceBuilder { + void replace(BaseNestedAllOf_1Interface other); + void update(void Function(BaseNestedAllOf_1InterfaceBuilder) updates); String? get attributeNestedAllOf; set attributeNestedAllOf(String? attributeNestedAllOf); } abstract mixin class BaseNestedAllOfInterfaceBuilder - implements - BaseAllOfInterfaceBuilder, - BaseOneOfInterfaceBuilder, - BaseAnyOfInterfaceBuilder, - BaseNestedAllOf_3InterfaceBuilder { + implements BaseAllOfInterfaceBuilder, BaseNestedAllOf_1InterfaceBuilder { void replace(covariant BaseNestedAllOfInterface other); void update(void Function(BaseNestedAllOfInterfaceBuilder) updates); String? get attribute; @@ -952,15 +919,6 @@ abstract mixin class BaseNestedAllOfInterfaceBuilder String? get attributeAllOf; set attributeAllOf(covariant String? attributeAllOf); - BaseBuilder get base; - set base(covariant BaseBuilder? base); - - BaseOneOf1Builder get baseOneOf1; - set baseOneOf1(covariant BaseOneOf1Builder? baseOneOf1); - - BaseAnyOf1Builder get baseAnyOf1; - set baseAnyOf1(covariant BaseAnyOf1Builder? baseAnyOf1); - String? get attributeNestedAllOf; set attributeNestedAllOf(covariant String? attributeNestedAllOf); } @@ -971,24 +929,12 @@ class _$BaseNestedAllOf extends BaseNestedAllOf { @override final String attributeAllOf; @override - final Base? base; - @override - final BaseOneOf1? baseOneOf1; - @override - final BaseAnyOf1? baseAnyOf1; - @override final String attributeNestedAllOf; factory _$BaseNestedAllOf([void Function(BaseNestedAllOfBuilder)? updates]) => (BaseNestedAllOfBuilder()..update(updates))._build(); - _$BaseNestedAllOf._( - {required this.attribute, - required this.attributeAllOf, - this.base, - this.baseOneOf1, - this.baseAnyOf1, - required this.attributeNestedAllOf}) + _$BaseNestedAllOf._({required this.attribute, required this.attributeAllOf, required this.attributeNestedAllOf}) : super._() { BuiltValueNullFieldError.checkNotNull(attribute, r'BaseNestedAllOf', 'attribute'); BuiltValueNullFieldError.checkNotNull(attributeAllOf, r'BaseNestedAllOf', 'attributeAllOf'); @@ -1007,9 +953,6 @@ class _$BaseNestedAllOf extends BaseNestedAllOf { return other is BaseNestedAllOf && attribute == other.attribute && attributeAllOf == other.attributeAllOf && - base == other.base && - baseOneOf1 == other.baseOneOf1 && - baseAnyOf1 == other.baseAnyOf1 && attributeNestedAllOf == other.attributeNestedAllOf; } @@ -1018,9 +961,6 @@ class _$BaseNestedAllOf extends BaseNestedAllOf { var _$hash = 0; _$hash = $jc(_$hash, attribute.hashCode); _$hash = $jc(_$hash, attributeAllOf.hashCode); - _$hash = $jc(_$hash, base.hashCode); - _$hash = $jc(_$hash, baseOneOf1.hashCode); - _$hash = $jc(_$hash, baseAnyOf1.hashCode); _$hash = $jc(_$hash, attributeNestedAllOf.hashCode); _$hash = $jf(_$hash); return _$hash; @@ -1031,9 +971,6 @@ class _$BaseNestedAllOf extends BaseNestedAllOf { return (newBuiltValueToStringHelper(r'BaseNestedAllOf') ..add('attribute', attribute) ..add('attributeAllOf', attributeAllOf) - ..add('base', base) - ..add('baseOneOf1', baseOneOf1) - ..add('baseAnyOf1', baseAnyOf1) ..add('attributeNestedAllOf', attributeNestedAllOf)) .toString(); } @@ -1051,18 +988,6 @@ class BaseNestedAllOfBuilder String? get attributeAllOf => _$this._attributeAllOf; set attributeAllOf(covariant String? attributeAllOf) => _$this._attributeAllOf = attributeAllOf; - BaseBuilder? _base; - BaseBuilder get base => _$this._base ??= BaseBuilder(); - set base(covariant BaseBuilder? base) => _$this._base = base; - - BaseOneOf1Builder? _baseOneOf1; - BaseOneOf1Builder get baseOneOf1 => _$this._baseOneOf1 ??= BaseOneOf1Builder(); - set baseOneOf1(covariant BaseOneOf1Builder? baseOneOf1) => _$this._baseOneOf1 = baseOneOf1; - - BaseAnyOf1Builder? _baseAnyOf1; - BaseAnyOf1Builder get baseAnyOf1 => _$this._baseAnyOf1 ??= BaseAnyOf1Builder(); - set baseAnyOf1(covariant BaseAnyOf1Builder? baseAnyOf1) => _$this._baseAnyOf1 = baseAnyOf1; - String? _attributeNestedAllOf; String? get attributeNestedAllOf => _$this._attributeNestedAllOf; set attributeNestedAllOf(covariant String? attributeNestedAllOf) => @@ -1075,9 +1000,6 @@ class BaseNestedAllOfBuilder if ($v != null) { _attribute = $v.attribute; _attributeAllOf = $v.attributeAllOf; - _base = $v.base?.toBuilder(); - _baseOneOf1 = $v.baseOneOf1?.toBuilder(); - _baseAnyOf1 = $v.baseAnyOf1?.toBuilder(); _attributeNestedAllOf = $v.attributeNestedAllOf; _$v = null; } @@ -1099,32 +1021,12 @@ class BaseNestedAllOfBuilder BaseNestedAllOf build() => _build(); _$BaseNestedAllOf _build() { - _$BaseNestedAllOf _$result; - try { - _$result = _$v ?? - _$BaseNestedAllOf._( - attribute: BuiltValueNullFieldError.checkNotNull(attribute, r'BaseNestedAllOf', 'attribute'), - attributeAllOf: - BuiltValueNullFieldError.checkNotNull(attributeAllOf, r'BaseNestedAllOf', 'attributeAllOf'), - base: _base?.build(), - baseOneOf1: _baseOneOf1?.build(), - baseAnyOf1: _baseAnyOf1?.build(), - attributeNestedAllOf: BuiltValueNullFieldError.checkNotNull( - attributeNestedAllOf, r'BaseNestedAllOf', 'attributeNestedAllOf')); - } catch (_) { - late String _$failedField; - try { - _$failedField = 'base'; - _base?.build(); - _$failedField = 'baseOneOf1'; - _baseOneOf1?.build(); - _$failedField = 'baseAnyOf1'; - _baseAnyOf1?.build(); - } catch (e) { - throw BuiltValueNestedFieldError(r'BaseNestedAllOf', _$failedField, e.toString()); - } - rethrow; - } + final _$result = _$v ?? + _$BaseNestedAllOf._( + attribute: BuiltValueNullFieldError.checkNotNull(attribute, r'BaseNestedAllOf', 'attribute'), + attributeAllOf: BuiltValueNullFieldError.checkNotNull(attributeAllOf, r'BaseNestedAllOf', 'attributeAllOf'), + attributeNestedAllOf: BuiltValueNullFieldError.checkNotNull( + attributeNestedAllOf, r'BaseNestedAllOf', 'attributeNestedAllOf')); replace(_$result); return _$result; } diff --git a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.json b/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.json index 658eaabf..83993487 100644 --- a/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.json +++ b/packages/dynamite/dynamite_end_to_end_test/lib/nested_ofs.openapi.json @@ -76,12 +76,6 @@ { "$ref": "#/components/schemas/BaseAllOf" }, - { - "$ref": "#/components/schemas/BaseOneOf" - }, - { - "$ref": "#/components/schemas/BaseAnyOf" - }, { "type": "object", "required": [ diff --git a/packages/dynamite/dynamite_end_to_end_test/test/nested_ofs_test.dart b/packages/dynamite/dynamite_end_to_end_test/test/nested_ofs_test.dart index c3385ff5..260122fd 100644 --- a/packages/dynamite/dynamite_end_to_end_test/test/nested_ofs_test.dart +++ b/packages/dynamite/dynamite_end_to_end_test/test/nested_ofs_test.dart @@ -9,24 +9,12 @@ void main() { (final b) => b ..attribute = 'attributeValue' ..attributeAllOf = 'attributeAllOfValue' - ..attributeNestedAllOf = 'attributeNestedAllOf' - ..base.update( - (final b) => b..attribute = 'baseAttributeValue', - ) - ..baseAnyOf1.update( - (final b) => b..attributeAnyOf = 'baseAnyOfAttributeAnyOfValue', - ) - ..baseOneOf1.update( - (final b) => b..attributeOneOf = 'baseAnyOfAttributeOneOfValue', - ), + ..attributeNestedAllOf = 'attributeNestedAllOf', ); final json = { 'attribute': 'attributeValue', 'attribute-allOf': 'attributeAllOfValue', - 'base': {'attribute': 'baseAttributeValue'}, - 'baseOneOf1': {'attribute-oneOf': 'baseAnyOfAttributeOneOfValue'}, - 'baseAnyOf1': {'attribute-anyOf': 'baseAnyOfAttributeAnyOfValue'}, 'attribute-nested-allOf': 'attributeNestedAllOf', };