From 3cb400710c38ecaa3300a2f432716b4fb4875182 Mon Sep 17 00:00:00 2001
From: Simon Bernard <sbernard@sierrawireless.com>
Date: Tue, 26 Oct 2021 17:33:11 +0200
Subject: [PATCH] server-demo: Add ObjLink write support.

---
 .../json/JacksonLwM2mNodeDeserializer.java    | 15 +++
 .../values/input/ObjLinkValueInput.vue        | 94 +++++++++++++++++++
 .../values/input/SingleValueInput.vue         |  9 +-
 3 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 leshan-server-demo/webapp/src/components/values/input/ObjLinkValueInput.vue

diff --git a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeDeserializer.java b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeDeserializer.java
index 48204f044c..dbaa8a8e37 100644
--- a/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeDeserializer.java
+++ b/leshan-server-demo/src/main/java/org/eclipse/leshan/server/demo/servlet/json/JacksonLwM2mNodeDeserializer.java
@@ -32,6 +32,7 @@
 import org.eclipse.leshan.core.node.LwM2mResource;
 import org.eclipse.leshan.core.node.LwM2mResourceInstance;
 import org.eclipse.leshan.core.node.LwM2mSingleResource;
+import org.eclipse.leshan.core.node.ObjectLink;
 import org.eclipse.leshan.core.util.Hex;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -181,6 +182,20 @@ private Object deserializeValue(JsonNode val, ResourceModel.Type type) {
                 raiseUnexpectedType(val, type, "string", val.getNodeType());
             }
             break;
+        case OBJLNK:
+            if (val.isObject()) {
+                if (val.has("objectId") && val.has("objectInstanceId")) {
+                    JsonNode objectId = val.get("objectId");
+                    JsonNode objectInstanceId = val.get("objectInstanceId");
+                    if (objectId.canConvertToInt() && objectId.canConvertToExactIntegral() && //
+                            objectInstanceId.canConvertToInt() && objectInstanceId.canConvertToExactIntegral()) {
+                        return new ObjectLink(objectId.asInt(), objectInstanceId.asInt());
+                    }
+                }
+            }
+            raiseUnexpectedType(val, type, "object{objectId:integer, objectInstanceId:integer}", val.getNodeType());
+            break;
+
         default:
             break;
         }
diff --git a/leshan-server-demo/webapp/src/components/values/input/ObjLinkValueInput.vue b/leshan-server-demo/webapp/src/components/values/input/ObjLinkValueInput.vue
new file mode 100644
index 0000000000..b940e90bd2
--- /dev/null
+++ b/leshan-server-demo/webapp/src/components/values/input/ObjLinkValueInput.vue
@@ -0,0 +1,94 @@
+<!-----------------------------------------------------------------------------
+ * Copyright (c) 2021 Sierra Wireless and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ * 
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v20.html
+ * and the Eclipse Distribution License is available at
+ *    http://www.eclipse.org/org/documents/edl-v10.html.
+  ----------------------------------------------------------------------------->
+<template>
+  <v-row>
+    <v-col>
+      <v-text-field
+        single-line
+        label="Object Id"
+        :rules="[(v) => !v || isValidId(v) || 'Invalid object id']"
+        :value="objectId"
+        @input="$emit('input', objectIdChanged($event))"
+        clearable
+      />
+    </v-col>
+    <v-col>
+      <v-text-field
+        single-line
+        label="Object Instance Id"
+        :rules="[(v) => !v || isValidId(v) || 'Invalid object instance id']"
+        :value="objectInstanceId"
+        @input="$emit('input', objectInstanceIdChanged($event))"
+        clearable
+      />
+    </v-col>
+  </v-row>
+</template>
+<script>
+import { isInteger } from "../../../js/utils.js";
+
+/**
+ * An input for OBJLNK single value LWM2M node ("Single Instance Resource" or "Resource Instance")
+ */
+export default {
+  props: {
+    value: null, // the input value for this LWM2M Node (v-model)
+    resourcedef: Object, // the model of the resource
+  },
+  data() {
+    return {
+      objectId: "",
+      objectInstanceId: "",
+    };
+  },
+  watch: {
+    value(v) {
+      this.objectId = v.objectId;
+      this.objectInstanceId = v.objectInstanceId;
+    },
+  },
+
+  methods: {
+    convertToNumber(v){
+      if (isInteger(v)){
+        return Number(v)
+      }else{
+        return v;
+      }
+    },
+    isValidId(v) {
+      return isInteger(v);
+    },
+    objectIdChanged(v) {
+      if (v === "" && this.objectInstanceId === "") {
+        return null;
+      } else {
+        return {
+          objectId: this.convertToNumber(v),
+          objectInstanceId: this.objectInstanceId,
+        };
+      }
+    },
+    objectInstanceIdChanged(v) {
+      if (this.objectId === "" && v === "") {
+        return null;
+      } else {
+        return {
+          objectId: this.objectId,
+          objectInstanceId: this.convertToNumber(v)
+        };
+      }
+    },
+  },
+};
+</script>
diff --git a/leshan-server-demo/webapp/src/components/values/input/SingleValueInput.vue b/leshan-server-demo/webapp/src/components/values/input/SingleValueInput.vue
index bb75c04463..3afd687898 100644
--- a/leshan-server-demo/webapp/src/components/values/input/SingleValueInput.vue
+++ b/leshan-server-demo/webapp/src/components/values/input/SingleValueInput.vue
@@ -29,6 +29,12 @@
     :value="value"
     @input="$emit('input', convertValue($event))"
   />
+  <obj-link-value-input
+    v-else-if="resourcedef.type == 'objlnk'"
+    :resourcedef="resourcedef"
+    :value="value"
+    @input="$emit('input', convertValue($event))"
+  />
   <v-text-field
     v-else
     :label="resourcedef.type"
@@ -43,12 +49,13 @@ import BooleanValueInput from "./BooleanValueInput.vue";
 import DateTimeValueInput from "./DateTimeValueInput.vue";
 import OpaqueValueInput from "./OpaqueValueInput.vue";
 import { isInteger, isNumber } from "../../../js/utils.js";
+import ObjLinkValueInput from './ObjLinkValueInput.vue';
 
 /**
  * An input for single value LWM2M node ("Single Instance Resource" or "Resource Instance")
  */
 export default {
-  components: { BooleanValueInput, OpaqueValueInput, DateTimeValueInput },
+  components: { BooleanValueInput, OpaqueValueInput, DateTimeValueInput, ObjLinkValueInput },
   props: {
     value: null, // the input value for this LWM2M Node (v-model)
     resourcedef: Object, // the model of the resource