change to camel case and adjust some names and add some annotations

Author: ericsson-peiwuyang

src/main/java/com/cisco/trex/stateful/TRexAstfClient.java

@@ -11,13 +11,11 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import com.cisco.trex.stateful.model.stats.*;
 import com.cisco.trex.util.Constants;
 import org.apache.commons.lang3.StringUtils;
 
 import com.cisco.trex.ClientBase;
-import com.cisco.trex.stateful.model.stats.AstfStatistics;
-import com.cisco.trex.stateful.model.stats.MetaData;
-import com.cisco.trex.stateful.model.stats.LatencyStats;
 import com.cisco.trex.stateless.exception.TRexConnectionException;
 import com.cisco.trex.stateless.model.ApiVersionHandler;
 import com.cisco.trex.stateless.model.PortStatus;
@@ -27,7 +25,7 @@
 import com.google.gson.JsonParser;
 import com.google.gson.JsonObject;
 import com.cisco.trex.stateful.model.stats.LatencyStats;
-import com.cisco.trex.stateful.model.stats.PortLatencyData;
+import com.cisco.trex.stateful.model.stats.LatencyPortData;
 
 /**
  * TRex Astf Client class
@@ -355,19 +353,19 @@ public LatencyStats getLatencyStats() {
         Map<String, Object> payload = this.createPayload();
         String json = this.callMethod("get_latency_stats", payload);
         JsonElement response = new JsonParser().parse(json);
-        JsonElement latencyStatsData = response.getAsJsonArray().get(0).getAsJsonObject().get("result");
-        //only can parse a part of data, PortLatencyData need to be parsed manually.
-        LatencyStats latencyStats = GSON.fromJson(latencyStatsData, LatencyStats.class);
-        JsonElement dataElement = latencyStatsData.getAsJsonObject().get("data");
-        JsonObject data = dataElement.getAsJsonObject();
-        Map<Integer, PortLatencyData> portLatencyDataMap = new HashMap<>();
-        // parse PortLatencyData manually
-        for (Map.Entry<String, JsonElement> entry : data.entrySet()) {
+        JsonElement latencyStatsJsonElement = response.getAsJsonArray().get(0).getAsJsonObject().get("result");
+        //only can parse a part of data, LatencyPortData need to be parsed manually.
+        LatencyStats latencyStats = GSON.fromJson(latencyStatsJsonElement, LatencyStats.class);
+        JsonElement latencyDataJsonElement = latencyStatsJsonElement.getAsJsonObject().get("data");
+        JsonObject latencyDataJsonObject = latencyDataJsonElement.getAsJsonObject();
+        Map<Integer, LatencyPortData> portLatencyDataMap = new HashMap<>();
+        // parse LatencyPortData manually
+        for (Map.Entry<String, JsonElement> entry : latencyDataJsonObject.entrySet()) {
             String jsonKey = entry.getKey();
             if(jsonKey.startsWith("port")){
-                Integer port = Integer.parseInt(jsonKey.substring(5));
-                PortLatencyData portLatencyData = GSON.fromJson(entry.getValue(), PortLatencyData.class);
-                portLatencyDataMap.put(port,portLatencyData);
+                Integer portIndex = Integer.parseInt(jsonKey.substring(5));
+                LatencyPortData latencyPortData = GSON.fromJson(entry.getValue(), LatencyPortData.class);
+                portLatencyDataMap.put(portIndex, latencyPortData);
             }
         }
         latencyStats.getData().setPortLatencyDataMap(portLatencyDataMap);

src/main/java/com/cisco/trex/stateful/model/stats/HistogramData.java

@@ -1,50 +1,56 @@
 package com.cisco.trex.stateful.model.stats;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
 
 import java.util.Map;
 
 public class LatencyData {
 
-    @JsonProperty("cpu_util")
-    public String cpu_util;
+    @SerializedName("cpu_util")
+    public String cpuUtil;
 
-    @JsonProperty("epoch")
+    @SerializedName("epoch")
     public Integer epoch;
 
-    public Map<Integer, PortLatencyData> portLatencyDataMap;
+    public Map<Integer, LatencyPortData> portLatencyDataMap;
 
-    @JsonProperty("unknown")
+    @SerializedName("unknown")
     public Integer unknown;
 
-    public String getCpu_util() {
-        return cpu_util;
+    @SerializedName("cpu_util")
+    public String getCpuUtil() {
+        return cpuUtil;
     }
 
-    public void setCpu_util(String cpu_util) {
-        this.cpu_util = cpu_util;
+    @SerializedName("cpu_util")
+    public void setCpuUtil(String cpuUtil) {
+        this.cpuUtil = cpuUtil;
     }
 
+    @SerializedName("epoch")
     public Integer getEpoch() {
         return epoch;
     }
 
+    @SerializedName("epoch")
     public void setEpoch(Integer epoch) {
         this.epoch = epoch;
     }
 
-    public Map<Integer, PortLatencyData> getPortLatencyDataMap() {
+    public Map<Integer, LatencyPortData> getPortLatencyDataMap() {
         return portLatencyDataMap;
     }
 
-    public void setPortLatencyDataMap(Map<Integer, PortLatencyData> portLatencyDataMap) {
+    public void setPortLatencyDataMap(Map<Integer, LatencyPortData> portLatencyDataMap) {
         this.portLatencyDataMap = portLatencyDataMap;
     }
 
+    @SerializedName("unknown")
     public Integer getUnknown() {
         return unknown;
     }
 
+    @SerializedName("unknown")
     public void setUnknown(Integer unknown) {
         this.unknown = unknown;
     }

src/main/java/com/cisco/trex/stateful/model/stats/LatencyData.java

@@ -0,0 +1,32 @@
+package com.cisco.trex.stateful.model.stats;
+
+import com.google.gson.annotations.SerializedName;
+
+public class LatencyPortData {
+
+    @SerializedName("hist")
+    public LatencyPortHist hist;
+
+    @SerializedName("stats")
+    public LatencyPortStats stats;
+
+    @SerializedName("hist")
+    public LatencyPortHist getHist() {
+        return hist;
+    }
+
+    @SerializedName("hist")
+    public void setHist(LatencyPortHist hist) {
+        this.hist = hist;
+    }
+
+    @SerializedName("stats")
+    public LatencyPortStats getStats() {
+        return stats;
+    }
+
+    @SerializedName("stats")
+    public void setStats(LatencyPortStats stats) {
+        this.stats = stats;
+    }
+}

src/main/java/com/cisco/trex/stateful/model/stats/LatencyPortData.java

@@ -0,0 +1,127 @@
+package com.cisco.trex.stateful.model.stats;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+public class LatencyPortHist {
+
+    private static class Histogram{
+        @SerializedName("key")
+        public Integer key;
+
+        @SerializedName("val")
+        public Integer val;
+
+        @SerializedName("key")
+        public Integer getKey() {
+            return key;
+        }
+
+        @SerializedName("key")
+        public void setKey(Integer key) {
+            this.key = key;
+        }
+
+        @SerializedName("val")
+        public Integer getVal() {
+            return val;
+        }
+
+        @SerializedName("val")
+        public void setVal(Integer val) {
+            this.val = val;
+        }
+    }
+
+    @SerializedName("cnt")
+    public Integer cnt;
+
+    @SerializedName("high_cnt")
+    public Integer highCnt;
+
+    @SerializedName("histogram")
+    public List<Histogram> histogram;
+
+    @SerializedName("max_usec")
+    public Integer maxUsec;
+
+    @SerializedName("min_usec")
+    public Integer minUsec;
+
+    @SerializedName("s_avg")
+    public Double sAvg;
+
+    @SerializedName("s_max")
+    public Double sMax;
+
+    @SerializedName("cnt")
+    public Integer getCnt() {
+        return cnt;
+    }
+
+    @SerializedName("cnt")
+    public void setCnt(Integer cnt) {
+        this.cnt = cnt;
+    }
+
+    @SerializedName("high_cnt")
+    public Integer getHighCnt() {
+        return highCnt;
+    }
+
+    @SerializedName("high_cnt")
+    public void setHighCnt(Integer highCnt) {
+        this.highCnt = highCnt;
+    }
+
+    @SerializedName("histogram")
+    public List<Histogram> getHistogram() {
+        return histogram;
+    }
+
+    @SerializedName("histogram")
+    public void setHistogram(List<Histogram> histogram) {
+        this.histogram = histogram;
+    }
+
+    @SerializedName("max_usec")
+    public Integer getMaxUsec() {
+        return maxUsec;
+    }
+
+    @SerializedName("max_usec")
+    public void setMaxUsec(Integer maxUsec) {
+        this.maxUsec = maxUsec;
+    }
+
+    @SerializedName("min_usec")
+    public Integer getMinUsec() {
+        return minUsec;
+    }
+
+    @SerializedName("min_usec")
+    public void setMinUsec(Integer minUsec) {
+        this.minUsec = minUsec;
+    }
+
+    @SerializedName("s_avg")
+    public Double getsAvg() {
+        return sAvg;
+    }
+
+    @SerializedName("s_avg")
+    public void setsAvg(Double sAvg) {
+        this.sAvg = sAvg;
+    }
+
+    @SerializedName("s_max")
+    public Double getsMax() {
+        return sMax;
+    }
+
+    @SerializedName("s_max")
+    public void setsMax(Double sMax) {
+        this.sMax = sMax;
+    }
+}