Merge pull request #112 from epics-base/Issue_110

Issue #110

Author: shroffk

epics-vtype/vtype-gson/src/main/java/org/epics/vtype/gson/VTypeToGson.java

@@ -16,6 +16,7 @@
 import org.epics.vtype.VNumber;
 import org.epics.vtype.VNumberArray;
 import org.epics.vtype.VString;
+import org.epics.vtype.VStringArray;
 import org.epics.vtype.VType;
 
 import java.util.List;
@@ -56,6 +57,8 @@ static VType toVType(JsonElement json) {
                 return toVNumberArray(json);
             case "VString":
                 return toVString(json);
+            case "VStringArray":
+                return toVStringArray(json);
             case "VEnum":
                 return toVEnum(json);
             default:
@@ -78,6 +81,8 @@ static JsonElement toJson(VType vType) {
             return toJson((VNumberArray) vType);
         } else if (vType instanceof VString) {
             return toJson((VString) vType);
+        } else if (vType instanceof VStringArray) {
+            return toJson((VStringArray) vType);
         } else if (vType instanceof VEnum) {
             return toJson((VEnum) vType);
         }
@@ -132,6 +137,12 @@ static VString toVString(JsonElement json) {
         VTypeGsonMapper mapper = new VTypeGsonMapper(json.getAsJsonObject());
         return VString.of(mapper.getString("value"), mapper.getAlarm(), mapper.getTime());
     }
+
+    static VStringArray toVStringArray(JsonElement json) {
+        VTypeGsonMapper mapper = new VTypeGsonMapper(json.getAsJsonObject());
+        return VStringArray.of(mapper.getListString("value"), mapper.getAlarm(), mapper.getTime());
+        
+    }
 
     static VEnum toVEnum(JsonElement json) {
         VTypeGsonMapper mapper = new VTypeGsonMapper(json.getAsJsonObject());
@@ -207,7 +218,16 @@ static JsonElement toJson(VString vString) {
                 .addTime(vString.getTime())
                 .build();
     }
-    
+
+    static JsonElement toJson(VStringArray vStringArray) {
+        return new GsonVTypeBuilder()
+                .addType(vStringArray)
+                .addListString("value", vStringArray.getData())
+                .addAlarm(vStringArray.getAlarm())
+                .addTime(vStringArray.getTime())
+                .build();
+    }
+
     static JsonElement toJson(VEnum vEnum) {
         return new GsonVTypeBuilder()
                 .addType(vEnum)

epics-vtype/vtype-gson/src/test/java/org/epics/vtype/gson/VTypeToGsonTest.java

@@ -10,6 +10,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.time.Instant;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -51,6 +52,7 @@
 import org.epics.vtype.VShort;
 import org.epics.vtype.VShortArray;
 import org.epics.vtype.VString;
+import org.epics.vtype.VStringArray;
 import org.epics.vtype.VType;
 import org.epics.vtype.VUByte;
 import org.epics.vtype.VUByteArray;
@@ -290,6 +292,17 @@ public void vByteArray1() {
         testDeserialization("VByteArray1a", vByteArray1);
     }
 
+    @Test
+    public void vStringArray1() {
+        List<String> data = new ArrayList<String>();
+        data.add("a");
+        data.add("b");
+        data.add("c");
+        VStringArray vStringArray1 = VStringArray.of(data, Alarm.none(), Time.of(Instant.ofEpochSecond(0, 0)));
+        testSerialization(vStringArray1, "VStringArray1");
+        testDeserialization("VStringArray1", vStringArray1);
+    }
+
     /**
      * Tests serialization and de-serialization of a Double.NaN. See {@link GsonVTypeBuilder#add} and
      * {@link VTypeToGson#toVNumber}

epics-vtype/vtype-gson/src/test/resources/org/epics/vtype/gson/VStringArray1.json

@@ -0,0 +1,20 @@
+{
+    "type":{
+        "name":"VStringArray",
+        "version":1
+    },
+    "value":[
+        "a",
+        "b",
+        "c"
+    ],
+    "alarm":{
+        "severity":"NONE",
+        "status":"NONE",
+        "name":"None"
+    },
+    "time":{
+        "unixSec":0,
+        "nanoSec":0
+    }
+}