feat: change contenttype to contentType

eclipse-thingweb · Nov 4, 2018 · 2c889b5 · 2c889b5
1 parent 1f13743
commit 2c889b5
Show file tree

Hide file tree

Showing 21 changed files with 98 additions and 98 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "command": {
     "publish": {
       "message": "%s"

diff --git a/packages/binding-coap/package.json b/packages/binding-coap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-coap",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "CoAP client & server protocol binding for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@types/chai": "4.0.4",
     "@types/node": "10.9.4",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
     "chai": "4.1.2",
     "mocha": "3.5.3",
     "mocha-typescript": "1.1.8",
@@ -25,8 +25,8 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
     "rxjs": "5.4.3",
     "coap": "0.21.0",
     "node-coap-client": "1.0.0"

diff --git a/packages/binding-coap/src/coap-client.ts b/packages/binding-coap/src/coap-client.ts
@@ -63,7 +63,7 @@ export default class CoapClient implements ProtocolClient {
 
         // FIXME does not work with blockwise because of node-coap
         let contentType = res.headers["Content-Format"];
-        if (!contentType) contentType = form.contenttype;
+        if (!contentType) contentType = form.contentType;
 
         resolve({ type: contentType, body: res.payload });
       });
@@ -186,9 +186,9 @@ export default class CoapClient implements ProtocolClient {
     let req = this.agent.request(options);
 
     // apply form data
-    if (typeof form.contenttype === "string") {
-      console.log("CoapClient got Form 'contenttype'", form.contenttype);
-      req.setOption("Accept", form.contenttype);
+    if (typeof form.contentType === "string") {
+      console.log("CoapClient got Form 'contentType'", form.contentType);
+      req.setOption("Accept", form.contentType);
     }
     if (Array.isArray(form["coap:options"])) {
       console.log("CoapClient got Form 'options'", form["coap:options"]);

diff --git a/packages/binding-coap/src/coaps-client.ts b/packages/binding-coap/src/coaps-client.ts
@@ -46,7 +46,7 @@ export default class CoapsClient implements ProtocolClient {
 
         // FIXME node-coap-client does not support options
         let contentType; // = res.format[...]
-        if (!contentType) contentType = form.contenttype;
+        if (!contentType) contentType = form.contentType;
 
         resolve({ type: contentType, body: res.payload });
       })
@@ -74,7 +74,7 @@ export default class CoapsClient implements ProtocolClient {
 
         // FIXME node-coap-client does not support options
         let contentType; // = res.format[...]
-        if (!contentType) contentType = form.contenttype;
+        if (!contentType) contentType = form.contentType;
 
         resolve({ type: contentType, body: res.payload });
       })

diff --git a/packages/binding-file/package.json b/packages/binding-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-file",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "File client protocol binding for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -19,8 +19,8 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3"
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4"
   },
   "scripts": {
     "build": "tsc",

diff --git a/packages/binding-fujitsu/package.json b/packages/binding-fujitsu/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-fujitsu",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "Fujitsu Remote Proxy bridge for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -17,7 +17,7 @@
     "@types/chai": "4.0.4",
     "@types/node": "10.9.4",
     "@types/ws": "5.1.2",
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
     "chai": "4.1.2",
     "mocha": "3.5.3",
     "mocha-typescript": "1.1.8",
@@ -26,7 +26,7 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
     "ws": "5.1.1"
   },
   "scripts": {

diff --git a/packages/binding-http/package.json b/packages/binding-http/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-http",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "HTTP client & server protocol binding for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -18,7 +18,7 @@
     "@types/chai": "4.0.4",
     "@types/node": "10.9.4",
     "@types/request-promise": "4.1.41",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
     "chai": "4.1.2",
     "mocha": "3.5.3",
     "mocha-typescript": "1.1.8",
@@ -29,8 +29,8 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
     "basic-auth": "2.0.1",
     "rxjs": "5.4.3"
   },

diff --git a/packages/binding-http/src/http-client.ts b/packages/binding-http/src/http-client.ts
@@ -354,9 +354,9 @@ export default class HttpClient implements ProtocolClient {
     //console.dir(form);
 
     // apply form data
-    if (options.method === "GET" && typeof form.contenttype === "string") {
-      console.debug("HttpClient got Form 'contenttype'", form.contenttype);
-      req.setHeader("Accept", form.contenttype);
+    if (options.method === "GET" && typeof form.contentType === "string") {
+      console.debug("HttpClient got Form 'contentType'", form.contentType);
+      req.setHeader("Accept", form.contentType);
     }
     if (Array.isArray(form["http:headers"])) {
       console.debug("HttpClient got Form 'headers'", form["http:headers"]);

diff --git a/packages/binding-mqtt/package.json b/packages/binding-mqtt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-mqtt",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "MQTT binding for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -17,7 +17,7 @@
     "@types/chai": "4.0.4",
     "@types/node": "10.9.4",
     "@types/request-promise": "4.1.41",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
     "chai": "4.1.2",
     "mocha": "3.5.3",
     "mocha-typescript": "1.1.8",
@@ -28,8 +28,8 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
     "rxjs": "5.4.3",
     "mqtt": "2.18.0"
   },

diff --git a/packages/binding-mqtt/src/mqtt-client.ts b/packages/binding-mqtt/src/mqtt-client.ts
@@ -37,7 +37,7 @@ export default class MqttClient implements ProtocolClient {
     public subscribeResource(form: MqttForm, next: ((value: any) => void), error?: (error: any) => void, complete?: () => void): any {
 
         // get MQTT-based metadata
-        let contentType = form.contenttype;
+        let contentType = form.contentType;
         let retain = form["mqtt:retain"]; // TODO: is this needed here?
         let qos = form["mqtt:qos"]; // TODO: is this needed here?
         let requestUri = url.parse(form['href']);

diff --git a/packages/binding-oracle/package.json b/packages/binding-oracle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-oracle",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "private": true,
   "description": "Oracle IoT Cloud Service protocol binding for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
@@ -21,7 +21,7 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
     "iotcs-csl-js": "18.3.2"
   },
   "scripts": {

diff --git a/packages/binding-websockets/package.json b/packages/binding-websockets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/binding-websockets",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "WebSockets client & server protocol binding for node-wot",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -17,10 +17,10 @@
     "@types/chai": "4.0.4",
     "@types/node": "10.9.4",
     "@types/ws": "5.1.2",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
-    "@node-wot/binding-http": "0.6.0-SNAPSHOT.3",
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
+    "@node-wot/binding-http": "0.6.0-SNAPSHOT.4",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
     "chai": "4.1.2",
     "mocha": "3.5.3",
     "mocha-typescript": "1.1.8",

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/cli",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "servient command line interface",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -18,19 +18,19 @@
   },
   "devDependencies": {
     "@types/node": "10.9.4",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
     "ts-node": "3.3.0",
     "typescript": "2.9.2",
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/binding-coap": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-file": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-http": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-websockets": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-mqtt": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3"
+    "@node-wot/binding-coap": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-file": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-http": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-websockets": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-mqtt": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4"
   },
   "scripts": {
     "build": "tsc",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/core",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "description": "W3C Web of Things (WoT) Servient framework",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
   "license": "EPL-2.0 OR W3C-20150513",
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@types/chai": "4.0.4",
     "@types/node": "10.9.4",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
     "chai": "4.1.2",
     "mocha": "3.5.3",
     "mocha-typescript": "1.1.8",
@@ -25,7 +25,7 @@
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
     "uuid": "3.3.2",
     "rxjs": "5.4.3"
   },

diff --git a/packages/core/src/consumed-thing.ts b/packages/core/src/consumed-thing.ts
@@ -137,7 +137,7 @@ class ConsumedThingProperty extends TD.ThingProperty implements WoT.ThingPropert
             } else {
                 console.log(`ConsumedThing '${this.getThing().name}' reading ${form.href}`);
                 client.readResource(form).then((content) => {
-                    if (!content.type) content.type = form.contenttype;
+                    if (!content.type) content.type = form.contentType;
                     try {
                         let value = ContentManager.contentToValue(content, <any>this);
                         resolve(value);
@@ -159,7 +159,7 @@ class ConsumedThingProperty extends TD.ThingProperty implements WoT.ThingPropert
                 reject(new Error(`ConsumedThing '${this.getThing().name}' did not get suitable client for ${form.href}`));
             } else {
                 console.log(`ConsumedThing '${this.getThing().name}' writing ${form.href} with '${value}'`);
-                let content = ContentManager.valueToContent(value, <any>this, form.contenttype);
+                let content = ContentManager.valueToContent(value, <any>this, form.contentType);
 
                 client.writeResource(form, content).then(() => {
                     resolve();
@@ -202,12 +202,12 @@ class ConsumedThingAction extends TD.ThingAction implements WoT.ThingAction {
                 let input;
 
                 if (parameter!== undefined) {
-                    input = ContentManager.valueToContent(parameter, <any>this, form.contenttype);
+                    input = ContentManager.valueToContent(parameter, <any>this, form.contentType);
                 }
 
                 client.invokeResource(form, input).then((content) => {
                     // infer media type from form if not in response metadata
-                    if (!content.type) content.type = form.contenttype;
+                    if (!content.type) content.type = form.contentType;
                     try {
                         let value = ContentManager.contentToValue(content, this.output);
                         resolve(value);
@@ -246,7 +246,7 @@ class ConsumedThingEvent extends TD.ThingEvent implements Subscribable<any> {
 
             return client.subscribeResource(form,
                 (content) => {
-                    if (!content.type) content.type = form.contenttype;
+                    if (!content.type) content.type = form.contentType;
                     try {
                         let value = ContentManager.contentToValue(content, <any>this);
                         next(value);

diff --git a/packages/demo-servients/package.json b/packages/demo-servients/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@node-wot/demo-servients",
-  "version": "0.6.0-SNAPSHOT.3",
+  "version": "0.6.0-SNAPSHOT.4",
   "private": true,
   "description": "W3C WoT demo Servient for the unpublished version of the monorepo",
   "author": "Eclipse Thingweb <thingweb-dev@eclipse.org> (https://thingweb.io/)",
@@ -15,19 +15,19 @@
   },
   "devDependencies": {
     "@types/node": "10.9.4",
-    "wot-typescript-definitions": "0.6.0-SNAPSHOT.0",
+    "wot-typescript-definitions": "0.6.0-SNAPSHOT.2",
     "ts-node": "3.3.0",
     "typescript": "2.9.2",
     "typescript-standard": "0.3.30"
   },
   "dependencies": {
-    "@node-wot/binding-coap": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-file": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-http": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-oracle": "0.6.0-SNAPSHOT.3",
-    "@node-wot/binding-fujitsu": "0.6.0-SNAPSHOT.3",
-    "@node-wot/core": "0.6.0-SNAPSHOT.3",
-    "@node-wot/td-tools": "0.6.0-SNAPSHOT.3",
+    "@node-wot/binding-coap": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-file": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-http": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-oracle": "0.6.0-SNAPSHOT.4",
+    "@node-wot/binding-fujitsu": "0.6.0-SNAPSHOT.4",
+    "@node-wot/core": "0.6.0-SNAPSHOT.4",
+    "@node-wot/td-tools": "0.6.0-SNAPSHOT.4",
     "rxjs": "5.4.3"
   },
   "scripts": {