chore(form): address linting issue

eclipse-thingweb · Jan 29, 2023 · c17eae5 · c17eae5
1 parent 5ef6a2e
commit c17eae5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/src/core/consumed_thing.dart b/lib/src/core/consumed_thing.dart
@@ -114,7 +114,8 @@ class ConsumedThing implements scripting_api.ConsumedThing {
       client = servient.clientFor(scheme);
     }
 
-    final form = foundForm.resolveUriVariables(options?.uriVariables);
+    final form =
+        foundForm.resolveUriVariables(options?.uriVariables) ?? foundForm;
 
     return _ClientAndForm(client, form);
   }

diff --git a/lib/src/definitions/form.dart b/lib/src/definitions/form.dart
@@ -301,7 +301,9 @@ class Form {
 
   /// Resolves all [uriVariables] in this [Form] and creates a copy with an
   /// updated [resolvedHref].
-  Form resolveUriVariables(Map<String, Object>? uriVariables) {
+  ///
+  /// Returns [Null] if the [href] field does not use any URI variables.
+  Form? resolveUriVariables(Map<String, Object>? uriVariables) {
     final hrefUriVariables = _filterUriVariables(resolvedHref);
 
     // Use global URI variables by default and override them with
@@ -313,7 +315,7 @@ class Form {
     if (hrefUriVariables.isEmpty) {
       // The href uses no uriVariables, therefore we can abort all further
       // checks.
-      return this;
+      return null;
     }
 
     if (affordanceUriVariables.isEmpty) {