fixup! Implement ExposedThing functionality

eclipse-thingweb · Jul 9, 2024 · 81b23e6 · 81b23e6
1 parent a748279
commit 81b23e6
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/lib/src/core/implementation/exposed_thing.dart b/lib/src/core/implementation/exposed_thing.dart
@@ -288,27 +288,38 @@ class ExposedThing implements scripting_api.ExposedThing, ExposableThing {
   }
 
   @override
-  Future<void> handleReadAllProperties(
-    List<String> propertyNames,
-    PropertyContentMap inputs, {
+  Future<PropertyContentMap> handleReadAllProperties({
     int? formIndex,
     Map<String, Object>? uriVariables,
     Object? data,
-  }) {
-    // TODO: implement handleReadAllProperties
-    throw UnimplementedError();
-  }
+  }) async =>
+      handleReadMultipleProperties(
+        thingDescription.properties?.keys.toList() ?? [],
+      );
 
   @override
   Future<PropertyContentMap> handleReadMultipleProperties(
-    List<String> propertyNames,
-    Content input, {
+    List<String> propertyNames, {
     int? formIndex,
     Map<String, Object>? uriVariables,
     Object? data,
-  }) {
-    // TODO: implement handleReadMultipleProperties
-    throw UnimplementedError();
+  }) async {
+    final contentMapEntries = await Future.wait(
+      propertyNames.map(
+        (propertyName) async {
+          final content = await handleReadProperty(
+            propertyName,
+            formIndex: formIndex,
+            uriVariables: uriVariables,
+            data: data,
+          );
+
+          return MapEntry(propertyName, content);
+        },
+      ),
+    );
+
+    return Map.fromEntries(contentMapEntries);
   }
 
   @override

diff --git a/lib/src/core/protocol_interfaces/exposable_thing.dart b/lib/src/core/protocol_interfaces/exposable_thing.dart
@@ -26,17 +26,14 @@ abstract interface class ExposableThing {
 
   /// Handles a `readmultipleproperties` operation triggered by a TD consumer.
   Future<PropertyContentMap> handleReadMultipleProperties(
-    List<String> propertyNames,
-    Content input, {
+    List<String> propertyNames, {
     int? formIndex,
     Map<String, Object>? uriVariables,
     Object? data,
   });
 
   /// Handles a `readallproperties` operation triggered by a TD consumer.
-  Future<void> handleReadAllProperties(
-    List<String> propertyNames,
-    PropertyContentMap inputs, {
+  Future<PropertyContentMap> handleReadAllProperties({
     int? formIndex,
     Map<String, Object>? uriVariables,
     Object? data,