Update gson date format for serializing/deserializing Date in MS stats (across multiple management servers)

Author: sureshanaparti

core/src/main/java/com/cloud/serializer/GsonHelper.java

@@ -78,6 +78,7 @@ static Gson setDefaultGsonConfig(GsonBuilder builder) {
         }.getType(), new NwGroupsCommandTypeAdaptor());
         builder.registerTypeAdapter(Storage.StoragePoolType.class, new StoragePoolTypeAdaptor());
         builder.registerTypeAdapter(Hypervisor.HypervisorType.class, new HypervisorTypeAdaptor());
+        builder.setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
         Gson gson = builder.create();
         dsAdaptor.initGson(gson);
         dtAdaptor.initGson(gson);

server/src/main/java/com/cloud/server/ManagementServerHostStatsEntry.java

@@ -105,7 +105,7 @@ public void setManagementServerRunId(long managementServerRunId) {
     }
 
     @Override
-    public Date getCollectionTime(){
+    public Date getCollectionTime() {
         return collectionTime;
     }
 

server/src/main/java/com/cloud/server/StatsCollector.java

@@ -170,10 +170,10 @@
 import com.codahale.metrics.jvm.MemoryUsageGaugeSet;
 import com.codahale.metrics.jvm.ThreadStatesGaugeSet;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
 import com.sun.management.OperatingSystemMXBean;
 
 /**
@@ -293,7 +293,9 @@ public String toString() {
 
     private static StatsCollector s_instance = null;
 
-    private static Gson gson = new Gson();
+    private static Gson gson = new GsonBuilder()
+            .setDateFormat("yyyy-MM-dd'T'HH:mm:ssZ")
+            .create();
 
     private ScheduledExecutorService _executor = null;
     @Inject
@@ -1158,9 +1160,9 @@ public String newStatus(ClusterServicePdu pdu) {
                 logger.debug(String.format("StatusUpdate from %s, json: %s", pdu.getSourcePeer(), pdu.getJsonPackage()));
             }
 
-            ManagementServerHostStatsEntry hostStatsEntry = null;
+            ManagementServerHostStatsEntry hostStatsEntry;
             try {
-                hostStatsEntry = gson.fromJson(pdu.getJsonPackage(),new TypeToken<ManagementServerHostStatsEntry>(){}.getType());
+                hostStatsEntry = gson.fromJson(pdu.getJsonPackage(), ManagementServerHostStatsEntry.class);
                 managementServerHostStats.put(hostStatsEntry.getManagementServerHostUuid(), hostStatsEntry);
 
                 // Update peer state to Up in mshost_peer