fix(Form): set default contentType to application/json

See https://w3c.github.io/wot-thing-description/#td-default-contentType
eclipse-thingweb · Feb 19, 2022 · 8920ac3 · 8920ac3
1 parent af36b2e
commit 8920ac3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/lib/src/binding_coap/coap_client.dart b/lib/src/binding_coap/coap_client.dart
@@ -211,12 +211,8 @@ class _CoapRequest {
   }
 
   void _applyFormInformation() {
-    if (_form.contentType != null) {
-      _coapRequest.accept = coap.CoapMediaType.parse(_form.contentType);
-    } else {
-      // TODO(JKRhb): Should a default accept option be set?
-      _coapRequest.accept = coap.CoapMediaType.applicationJson;
-    }
+    // TODO(JKRhb): Should the accept option be the form's contentType?
+    _coapRequest.accept = coap.CoapMediaType.parse(_form.contentType);
   }
 }
 

diff --git a/lib/src/binding_http/http_client.dart b/lib/src/binding_http/http_client.dart
@@ -101,9 +101,7 @@ class HttpClient extends ProtocolClient {
   }
 
   static Content _contentFromResponse(Form form, http.Response response) {
-    final type = response.headers["Content-Type"] ??
-        form.contentType ??
-        "application/octet-stream";
+    final type = response.headers["Content-Type"] ?? form.contentType;
     final body = Stream.value(response.bodyBytes);
     return Content(type, body);
   }

diff --git a/lib/src/definitions/form.dart b/lib/src/definitions/form.dart
@@ -22,7 +22,7 @@ class Form {
   List<String>? op;
 
   /// The [contentType] supported by this [Form].
-  String? contentType;
+  String contentType = "application/json";
 
   /// The list of [security] definitions applied to this [Form].
   List<String>? security;
@@ -47,7 +47,7 @@ class Form {
   ///
   /// An [href] has to be provided. A [contentType] is optional.
   Form(this.href,
-      {this.contentType,
+      {this.contentType = "application/json",
       this.subprotocol,
       this.security,
       this.scopes,