Skip to content
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

fix(property.dart): handle additional fields correctly #183

Merged
merged 1 commit into from
Jul 17, 2024
Merged

fix(property.dart): handle additional fields correctly #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 37 additions & 33 deletions lib/src/core/definitions/interaction_affordances/property.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class Property extends InteractionAffordance implements DataSchema {
required super.forms,
super.uriVariables,
super.additionalFields,
this.dataSchema,
required this.dataSchema,
this.observable = false,
});

Expand Down Expand Up @@ -52,101 +52,105 @@ class Property extends InteractionAffordance implements DataSchema {
}

/// The internal [DataSchema] this property is based on.
final DataSchema? dataSchema;
final DataSchema dataSchema;

@override
String? get title => dataSchema?.title;
String? get title => dataSchema.title;

@override
Map<String, String>? get titles => dataSchema?.titles;
Map<String, String>? get titles => dataSchema.titles;

@override
String? get description => dataSchema?.description;
String? get description => dataSchema.description;

@override
Map<String, String>? get descriptions => dataSchema?.descriptions;
Map<String, String>? get descriptions => dataSchema.descriptions;

@override
List<String>? get atType => dataSchema?.atType;
List<String>? get atType => dataSchema.atType;

@override
Object? get constant => dataSchema?.constant;
Object? get constant => dataSchema.constant;

@override
Object? get defaultValue => dataSchema?.defaultValue;
Object? get defaultValue => dataSchema.defaultValue;

@override
List<Object?>? get enumeration => dataSchema?.enumeration;
List<Object?>? get enumeration => dataSchema.enumeration;

@override
String? get format => dataSchema?.format;
String? get format => dataSchema.format;

@override
List<DataSchema>? get oneOf => dataSchema?.oneOf;
List<DataSchema>? get oneOf => dataSchema.oneOf;

@override
bool get readOnly => dataSchema?.readOnly ?? false;
bool get readOnly => dataSchema.readOnly ?? false;

@override
String? get type => dataSchema?.type;
String? get type => dataSchema.type;

@override
String? get unit => dataSchema?.unit;
String? get unit => dataSchema.unit;

@override
bool get writeOnly => dataSchema?.writeOnly ?? false;
bool get writeOnly => dataSchema.writeOnly ?? false;

@override
String? get contentEncoding => dataSchema?.contentEncoding;
String? get contentEncoding => dataSchema.contentEncoding;

@override
String? get contentMediaType => dataSchema?.contentMediaType;
String? get contentMediaType => dataSchema.contentMediaType;

@override
num? get exclusiveMaximum => dataSchema?.exclusiveMaximum;
num? get exclusiveMaximum => dataSchema.exclusiveMaximum;

@override
num? get exclusiveMinimum => dataSchema?.exclusiveMinimum;
num? get exclusiveMinimum => dataSchema.exclusiveMinimum;

@override
List<DataSchema>? get items => dataSchema?.items;
List<DataSchema>? get items => dataSchema.items;

@override
int? get maxItems => dataSchema?.maxItems;
int? get maxItems => dataSchema.maxItems;

@override
int? get maxLength => dataSchema?.maxLength;
int? get maxLength => dataSchema.maxLength;

@override
num? get maximum => dataSchema?.maximum;
num? get maximum => dataSchema.maximum;

@override
int? get minItems => dataSchema?.minItems;
int? get minItems => dataSchema.minItems;

@override
int? get minLength => dataSchema?.minItems;
int? get minLength => dataSchema.minItems;

@override
num? get minimum => dataSchema?.minimum;
num? get minimum => dataSchema.minimum;

@override
num? get multipleOf => dataSchema?.multipleOf;
num? get multipleOf => dataSchema.multipleOf;

@override
String? get pattern => dataSchema?.pattern;
String? get pattern => dataSchema.pattern;

@override
Map<String, DataSchema>? get properties => dataSchema?.properties;
Map<String, DataSchema>? get properties => dataSchema.properties;

@override
List<String>? get required => dataSchema?.required;
List<String>? get required => dataSchema.required;

/// A hint that indicates whether Servients hosting the Thing and
/// Intermediaries should provide a Protocol Binding that supports the
/// `observeproperty` and `unobserveproperty` operations for this Property.
final bool observable;

@override
Map<String, dynamic> get additionalFields =>
dataSchema?.additionalFields ?? {};
Map<String, dynamic> get additionalFields {
final additionalDataSchemaFields = dataSchema.additionalFields.entries
.where((entry) => super.additionalFields.containsKey(entry.key));

return Map.fromEntries(additionalDataSchemaFields);
}
}
2 changes: 1 addition & 1 deletion test/core/operation_type_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "package:test/test.dart";
void main() {
group("OperationType should indicate the correct default op values for", () {
test("properties", () {
const regularProperty = Property(forms: []);
const regularProperty = Property(forms: [], dataSchema: DataSchema());

final regularPropertyOpValues =
OperationType.defaultOpValues(regularProperty);
Expand Down
Loading