vtype-json: adding support for all unsigned scalar integers

gcarcassi · gcarcassi · commit 4f8cf8964e06 · 2017-12-29T17:07:09.000-05:00
diff --git a/epics-vtype/vtype-json/src/main/java/org/epics/vtype/json/JsonVTypeBuilder.java b/epics-vtype/vtype-json/src/main/java/org/epics/vtype/json/JsonVTypeBuilder.java
@@ -16,7 +16,10 @@
 import static org.epics.vtype.json.JsonArrays.*;
 import org.epics.util.array.ListBoolean;
 import org.epics.util.array.ListNumber;
+import org.epics.util.number.UByte;
+import org.epics.util.number.UInteger;
 import org.epics.util.number.ULong;
+import org.epics.util.number.UShort;
 import org.epics.vtype.Alarm;
 import org.epics.vtype.Display;
 import org.epics.vtype.Time;
@@ -203,9 +206,9 @@ public JsonVTypeBuilder addObject(String string, Object o) {
         
         if (o instanceof Double || o instanceof Float) {
             add(string, ((Number) o).doubleValue());
-        } else if (o instanceof Byte || o instanceof Short || o instanceof Integer) {
+        } else if (o instanceof Integer || o instanceof UShort || o instanceof Short || o instanceof UByte || o instanceof Byte) {
             add(string, ((Number) o).intValue());
-        } else if (o instanceof Long) {
+        } else if (o instanceof Long || o instanceof UInteger) {
             add(string, ((Number) o).longValue());
         } else if (o instanceof ULong) {
             add(string, ((ULong) o).bigIntegerValue());
diff --git a/epics-vtype/vtype-json/src/main/java/org/epics/vtype/json/VTypeToJsonV1.java b/epics-vtype/vtype-json/src/main/java/org/epics/vtype/json/VTypeToJsonV1.java
@@ -7,7 +7,10 @@
 import java.util.List;
 import javax.json.JsonObject;
 import org.epics.util.array.ListNumber;
+import org.epics.util.number.UByte;
+import org.epics.util.number.UInteger;
 import org.epics.util.number.ULong;
+import org.epics.util.number.UShort;
 import org.epics.vtype.EnumDisplay;
 import org.epics.vtype.VEnum;
 import org.epics.vtype.VNumber;
@@ -27,8 +30,11 @@ static VType toVType(JsonObject json) {
             case "VFloat":
             case "VULong":
             case "VLong":
+            case "VUInt":
             case "VInt":
+            case "VUShort":
             case "VShort":
+            case "VUByte":
             case "VByte":
                 return toVNumber(json);
             case "VDoubleArray":
@@ -84,12 +90,21 @@ static VNumber toVNumber(JsonObject json) {
             case "VLong":
                 value = (long) mapper.getJsonNumber("value").longValue();
                 break;
+            case "VUInt":
+                value = new UInteger(mapper.getJsonNumber("value").intValue());
+                break;
             case "VInt":
                 value = (int) mapper.getJsonNumber("value").intValue();
                 break;
+            case "VUShort":
+                value = new UShort((short) mapper.getJsonNumber("value").intValue());
+                break;
             case "VShort":
                 value = (short) mapper.getJsonNumber("value").intValue();
                 break;
+            case "VUByte":
+                value = new UByte((byte) mapper.getJsonNumber("value").intValue());
+                break;
             case "VByte":
                 value = (byte) mapper.getJsonNumber("value").intValue();
                 break;
diff --git a/epics-vtype/vtype-json/src/test/java/org/epics/vtype/json/VTypeToJsonTest.java b/epics-vtype/vtype-json/src/test/java/org/epics/vtype/json/VTypeToJsonTest.java
@@ -22,7 +22,10 @@
 import org.epics.util.array.ArrayInteger;
 import org.epics.util.array.ArrayLong;
 import org.epics.util.array.ArrayShort;
+import org.epics.util.number.UByte;
+import org.epics.util.number.UInteger;
 import org.epics.util.number.ULong;
+import org.epics.util.number.UShort;
 import org.epics.vtype.Alarm;
 import org.epics.vtype.AlarmSeverity;
 import org.epics.vtype.AlarmStatus;
@@ -44,7 +47,10 @@
 import org.epics.vtype.VShortArray;
 import org.epics.vtype.VString;
 import org.epics.vtype.VType;
+import org.epics.vtype.VUByte;
+import org.epics.vtype.VUInt;
 import org.epics.vtype.VULong;
+import org.epics.vtype.VUShort;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.hamcrest.Matchers.*;
@@ -186,6 +192,13 @@ public void vLong1() {
         testDeserialization("VLong1a", vLong1);
     }
     
+    @Test
+    public void vUInt1() {
+        VUInt vUInt1 = VUInt.of(new UInteger(-1), Alarm.none(), Time.of(Instant.ofEpochSecond(0, 0)), Display.none());
+        testSerialization(vUInt1, "VUInt1");
+        testDeserialization("VUInt1", vUInt1);
+    }
+    
     @Test
     public void vInt1() {
         VInt vInt1 = VInt.of(314, Alarm.none(), Time.of(Instant.ofEpochSecond(0, 0)), Display.none());
@@ -194,6 +207,13 @@ public void vInt1() {
         testDeserialization("VInt1a", vInt1);
     }
     
+    @Test
+    public void vUShort1() {
+        VUShort vUShort1 = VUShort.of(new UShort((short) -1), Alarm.of(AlarmSeverity.MINOR, AlarmStatus.DB, "HIGH"), Time.of(Instant.ofEpochSecond(0, 0)), Display.none());
+        testSerialization(vUShort1, "VUShort1");
+        testDeserialization("VUShort1", vUShort1);
+    }
+    
     @Test
     public void vShort1() {
         VShort vShort1 = VShort.of((short) 314, Alarm.none(), Time.of(Instant.ofEpochSecond(0, 0)), Display.none());
@@ -202,6 +222,13 @@ public void vShort1() {
         testDeserialization("VShort1a", vShort1);
     }
     
+    @Test
+    public void vUByte1() {
+        VUByte vUByte1 = VUByte.of(new UByte((byte) -1), Alarm.of(AlarmSeverity.MINOR, AlarmStatus.DB, "HIGH"), Time.of(Instant.ofEpochSecond(0, 0)), Display.none());
+        testSerialization(vUByte1, "VUByte1");
+        testDeserialization("VUByte1", vUByte1);
+    }
+    
     @Test
     public void vByte1() {
         VByte vByte1 = VByte.of((byte) 31, Alarm.none(), Time.of(Instant.ofEpochSecond(0, 0)), Display.none());
diff --git a/epics-vtype/vtype-json/src/test/resources/org/epics/vtype/json/VUByte1.json b/epics-vtype/vtype-json/src/test/resources/org/epics/vtype/json/VUByte1.json
@@ -0,0 +1,19 @@
+{
+    "type":{
+        "name":"VUByte",
+        "version":1
+    },
+    "value":255,
+    "alarm":{
+        "severity":"MINOR",
+        "status":"DB",
+        "name":"HIGH"
+    },
+    "time":{
+        "unixSec":0,
+        "nanoSec":0
+    },
+    "display":{
+        "units":""
+    }
+}
diff --git a/epics-vtype/vtype-json/src/test/resources/org/epics/vtype/json/VUInt1.json b/epics-vtype/vtype-json/src/test/resources/org/epics/vtype/json/VUInt1.json
@@ -0,0 +1,19 @@
+{
+    "type":{
+        "name":"VUInt",
+        "version":1
+    },
+    "value":4294967295,
+    "alarm":{
+        "severity":"NONE",
+        "status":"NONE",
+        "name":"None"
+    },
+    "time":{
+        "unixSec":0,
+        "nanoSec":0
+    },
+    "display":{
+        "units":""
+    }
+}
diff --git a/epics-vtype/vtype-json/src/test/resources/org/epics/vtype/json/VUShort1.json b/epics-vtype/vtype-json/src/test/resources/org/epics/vtype/json/VUShort1.json
@@ -0,0 +1,19 @@
+{
+    "type":{
+        "name":"VUShort",
+        "version":1
+    },
+    "value":65535,
+    "alarm":{
+        "severity":"MINOR",
+        "status":"DB",
+        "name":"HIGH"
+    },
+    "time":{
+        "unixSec":0,
+        "nanoSec":0
+    },
+    "display":{
+        "units":""
+    }
+}
