0.24.2

- Fix deserialization of infinity.
IOT-DSA · Mar 5, 2021 · fb4834d · fb4834d
1 parent b36c7b3
commit fb4834d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ subprojects {
     apply plugin: 'java-library'
     apply plugin: 'maven'
 
-    version = '0.24.1'
+    version = '0.24.2'
     sourceCompatibility = 1.7
     targetCompatibility = 1.7
 

diff --git a/sdk/dslink/src/main/java/org/dsa/iot/dslink/serializer/Deserializer.java b/sdk/dslink/src/main/java/org/dsa/iot/dslink/serializer/Deserializer.java
@@ -1,9 +1,14 @@
 package org.dsa.iot.dslink.serializer;
 
-import java.util.*;
-import org.dsa.iot.dslink.node.*;
-import org.dsa.iot.dslink.node.value.*;
-import org.dsa.iot.dslink.util.json.*;
+import org.dsa.iot.dslink.node.Node;
+import org.dsa.iot.dslink.node.NodeManager;
+import org.dsa.iot.dslink.node.Writable;
+import org.dsa.iot.dslink.node.value.Value;
+import org.dsa.iot.dslink.node.value.ValueType;
+import org.dsa.iot.dslink.node.value.ValueUtils;
+import org.dsa.iot.dslink.util.json.JsonObject;
+
+import java.util.Map;
 
 /**
  * Deserializes a JSON file into a node manager
@@ -20,7 +25,7 @@ public Deserializer(NodeManager nodeManager) {
     }
 
     public Deserializer(SerializationManager serializationManager,
-                        NodeManager nodeManager) {
+            NodeManager nodeManager) {
         this.serializationManager = serializationManager;
         this.nodeManager = nodeManager;
     }
@@ -72,9 +77,25 @@ private void deserializeNode(Node node, JsonObject map) {
                 Value val = ValueUtils.toValue(value);
                 if (t != null && val != null
                         && val.getType().compare(ValueType.STRING)
-                        && t.compare(ValueType.NUMBER)
-                        && "NaN".equals(val.getString())) {
-                    node.setValue(new Value(Float.NaN));
+                        && t.compare(ValueType.NUMBER)) {
+                    String str = val.getString();
+                    if ((str == null) || str.isEmpty()) {
+                        node.setValue(null);
+                    } else {
+                        switch (str) {
+                            case "NaN":
+                                node.setValue(new Value(Float.NaN));
+                                break;
+                            case "Infinity":
+                                node.setValue(new Value(Float.POSITIVE_INFINITY));
+                                break;
+                            case "-Infinity":
+                                node.setValue(new Value(Float.NEGATIVE_INFINITY));
+                                break;
+                            default:
+                                node.setValue(null);
+                        }
+                    }
                 } else {
                     node.setValue(val);
                 }