Bug fix: Date and DecimalFormat serializers put any specific name for the data.

VTypeToGsonTest passes data through Gson object to serialize VType.

Author: geniejhang

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

@@ -26,6 +26,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
@@ -41,10 +42,7 @@
 public class GsonDateHandler implements JsonSerializer<Date>, JsonDeserializer<Date> {
     @Override
     public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject jsonObject = new JsonObject();
-        jsonObject.addProperty("Date", src.toInstant().toEpochMilli());
-
-        return jsonObject;
+        return new JsonPrimitive(src.toInstant().toEpochMilli());
     }
 
     @Override

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

@@ -26,6 +26,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
@@ -41,10 +42,7 @@
 public class GsonDecimalFormatHandler implements JsonSerializer<DecimalFormat>, JsonDeserializer<DecimalFormat> {
     @Override
     public JsonElement serialize(DecimalFormat src, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject jsonObject = new JsonObject();
-        jsonObject.addProperty("DecimalFormat", src.toPattern());
-
-        return jsonObject;
+        return new JsonPrimitive(src.toPattern());
     }
 
     @Override

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

@@ -81,14 +81,14 @@ public class VTypeToGsonTest {
      * @param expectedJsonFileName the filename to compare
      */
     public static void testSerialization(VType value, String expectedJsonFileName) {
-        JsonElement json = VTypeToGson.toJson(value);
+        JsonElement json = JsonParser.parseString(CustomGson.getGson().toJson(value, VType.class));
 
         boolean success = false;
         try {
             JsonElement reference = loadJson(expectedJsonFileName + ".json");
             assertThat(json, equalTo(reference));
             success = true;
-        } finally {
+        } finally{
             File failedJsonFile = new File("src/test/resources/org/epics/vtype/gson/" + expectedJsonFileName + ".failed.json");
             if (!success) {
                 saveErrorJson(json, failedJsonFile);
@@ -107,7 +107,7 @@ public static void testSerialization(VType value, String expectedJsonFileName) {
      * @param expected the object to compare to
      */
     public static void testDeserialization(String jsonFileName, VType expected) {
-        VType actual = VTypeToGson.toVType(loadJson(jsonFileName + ".json"));
+        VType actual = CustomGson.getGson().fromJson(loadJson(jsonFileName + ".json"), VType.class);
         assertThat(actual, equalTo(expected));
     }