fix OPAQUE value serialization in leshan-standalone.

eclipse-leshan · Mar 11, 2015 · aa02658 · aa02658
1 parent 96c7068
commit aa02658
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/...ndalone/src/main/java/org/eclipse/leshan/standalone/servlet/json/LwM2mNodeSerializer.java b/...ndalone/src/main/java/org/eclipse/leshan/standalone/servlet/json/LwM2mNodeSerializer.java
@@ -17,10 +17,13 @@
 
 import java.lang.reflect.Type;
 
+import javax.xml.bind.DatatypeConverter;
+
 import org.eclipse.leshan.core.node.LwM2mNode;
 import org.eclipse.leshan.core.node.LwM2mObject;
 import org.eclipse.leshan.core.node.LwM2mObjectInstance;
 import org.eclipse.leshan.core.node.LwM2mResource;
+import org.eclipse.leshan.core.node.Value.DataType;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -44,15 +47,23 @@ public JsonElement serialize(LwM2mNode src, Type typeOfSrc, JsonSerializationCon
             if (rsc.isMultiInstances()) {
                 Object[] values = new Object[rsc.getValues().length];
                 for (int i = 0; i < rsc.getValues().length; i++) {
-                    values[i] = rsc.getValues()[i].value;
+                    if (rsc.getValue().type == DataType.OPAQUE) {
+                        values[i] = DatatypeConverter.printHexBinary((byte[]) rsc.getValue().value);
+                    } else {
+                        values[i] = rsc.getValues()[i].value;
+                    }
                 }
                 element.add("values", context.serialize(values));
             } else {
-                element.add("value", context.serialize(rsc.getValue().value));
+                if (rsc.getValue().type == DataType.OPAQUE) {
+                    element.add("value",
+                            context.serialize(DatatypeConverter.printHexBinary((byte[]) rsc.getValue().value)));
+                } else {
+                    element.add("value", context.serialize(rsc.getValue().value));
+                }
             }
         }
 
         return element;
     }
-
 }