Merge pull request #142 from eclipse-thingweb/servient-api

feat!: rework Servient API
eclipse-thingweb · May 21, 2024 · e21cc4e · e21cc4e
2 parents 6ad6c0e + 830b964
commit e21cc4e
Show file tree

Hide file tree

Showing 20 changed files with 245 additions and 155 deletions.
diff --git a/example/coap_discovery.dart b/example/coap_discovery.dart
@@ -37,9 +37,9 @@ Future<void> handleThingDescription(
 }
 
 Future<void> main(List<String> args) async {
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [CoapClientFactory()],
-    discoveryConfiguration: [
+    discoveryConfigurations: [
       DirectConfiguration(
         Uri.parse("coap://plugfest.thingweb.io:5683/testthing"),
       ),

diff --git a/example/coap_dns_sd_discovery.dart b/example/coap_dns_sd_discovery.dart
@@ -14,12 +14,12 @@ void handleThingDescription(ThingDescription thingDescription) =>
     print('Discovered TD with title "${thingDescription.title}".');
 
 Future<void> main(List<String> args) async {
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       CoapClientFactory(),
       HttpClientFactory(),
     ],
-    discoveryConfiguration: [
+    discoveryConfigurations: [
       DnsSdDConfiguration(protocolType: ProtocolType.udp),
     ],
   );

diff --git a/example/coaps_readproperty.dart b/example/coaps_readproperty.dart
@@ -37,7 +37,7 @@ Future<void> main(List<String> args) async {
     pskCredentialsCallback: _pskCredentialsCallback,
   );
 
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       coapClientFactory,
     ],

diff --git a/example/complex_example.dart b/example/complex_example.dart
@@ -98,7 +98,7 @@ Future<void> main() async {
   final httpClientFactory =
       HttpClientFactory(basicCredentialsCallback: basicCredentialsCallback);
 
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       coapClientFactory,
       httpClientFactory,

diff --git a/example/core_link_format_discovery.dart b/example/core_link_format_discovery.dart
@@ -10,9 +10,9 @@ import "package:dart_wot/binding_coap.dart";
 import "package:dart_wot/core.dart";
 
 Future<void> main(List<String> args) async {
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [CoapClientFactory()],
-    discoveryConfiguration: [
+    discoveryConfigurations: [
       CoreLinkFormatConfiguration(
         Uri.parse("coap://plugfest.thingweb.io"),
       ),

diff --git a/example/directory_discovery.dart b/example/directory_discovery.dart
@@ -10,7 +10,7 @@ import "package:dart_wot/binding_http.dart";
 import "package:dart_wot/core.dart";
 
 Future<void> main(List<String> args) async {
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       HttpClientFactory(),
     ],

diff --git a/example/example.dart b/example/example.dart
@@ -11,7 +11,7 @@ import "package:dart_wot/binding_http.dart";
 import "package:dart_wot/core.dart";
 
 Future<void> main(List<String> args) async {
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       CoapClientFactory(),
       HttpClientFactory(),

diff --git a/example/http_basic_authentication.dart b/example/http_basic_authentication.dart
@@ -61,7 +61,7 @@ Future<void> main(List<String> args) async {
   final httpClientFactory = HttpClientFactory(
     basicCredentialsCallback: basicCredentialsCallback,
   );
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       httpClientFactory,
     ],

diff --git a/example/mqtt_example.dart b/example/mqtt_example.dart
@@ -60,7 +60,7 @@ Future<BasicCredentials?> basicCredentialsCallback(
 }
 
 Future<void> main(List<String> args) async {
-  final servient = Servient(
+  final servient = Servient.create(
     clientFactories: [
       MqttClientFactory(basicCredentialsCallback: basicCredentialsCallback),
     ],

diff --git a/lib/src/core/implementation.dart b/lib/src/core/implementation.dart
@@ -15,4 +15,4 @@ export "implementation/discovery/discovery_configuration.dart";
 export "implementation/protocol_interfaces/protocol_client.dart";
 export "implementation/protocol_interfaces/protocol_client_factory.dart";
 export "implementation/protocol_interfaces/protocol_server.dart";
-export "implementation/servient.dart";
+export "implementation/servient.dart" show Servient;
diff --git a/lib/src/core/implementation/consumed_thing.dart b/lib/src/core/implementation/consumed_thing.dart
@@ -20,7 +20,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
       : title = thingDescription.title;
 
   /// The [Servient] corresponding with this [ConsumedThing].
-  final Servient servient;
+  final InternalServient servient;
 
   @override
   final ThingDescription thingDescription;
@@ -428,7 +428,7 @@ class ConsumedThing implements scripting_api.ConsumedThing {
     _subscribedEvents.clear();
 
     if (external) {
-      return servient.deregisterConsumedthing(this);
+      return servient.deregisterConsumedThing(this);
     }
 
     return false;