Fix comments with delete class and rename contants

Author: HongJiangEric

src/e2e-test/java/com/cisco/trex/stateless/TrexClientUtilTest.java

@@ -21,8 +21,6 @@
 import com.cisco.trex.stateless.model.ApiVersionHandler;
 import com.cisco.trex.stateless.model.PortStatus;
 import com.cisco.trex.stateless.model.TRexClientResult;
-import com.cisco.trex.stateless.model.stats.ExtendedPortStatistics;
-import com.cisco.trex.stateless.model.stats.XstatsNames;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
@@ -51,13 +49,13 @@ public TRexAstfClient(String host, String port, String userName) {
     protected void serverAPISync() throws TRexConnectionException {
         LOGGER.info("Sync API with the TRex");
         Map<String, Object> apiVers = new HashMap<>();
-        apiVers.put("major", Constants.API_VERSION_MAJOR);
+        apiVers.put("major", Constants.ASTF_API_VERSION_MAJOR);
         apiVers.put("minor", Constants.ASTF_API_VERSION_MINOR);
         apiVers.put("name", ASTF);
         TRexClientResult<ApiVersionHandler> result = callMethod("api_sync_v2", apiVers, ApiVersionHandler.class);
         if (result.get() == null) {
             TRexConnectionException e = new TRexConnectionException(
-                    "Unable to connect to TRex server. Required API version is " + Constants.API_VERSION_MAJOR + "."
+                    "Unable to connect to TRex server. Required API version is " + Constants.ASTF_API_VERSION_MAJOR + "."
                             + Constants.ASTF_API_VERSION_MINOR);
             LOGGER.error("Unable to sync client with TRex server due to: API_H is null.", e.getMessage());
             throw e;

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

@@ -17,6 +17,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
+import com.cisco.trex.util.Constants;
 import org.pcap4j.packet.ArpPacket;
 import org.pcap4j.packet.Dot1qVlanTagPacket;
 import org.pcap4j.packet.EthernetPacket;
@@ -64,8 +65,6 @@
 public class TRexClient extends ClientBase {
 
     private static final EtherType QInQ = new EtherType((short) 0x88a8, "802.1Q Provider Bridge (Q-in-Q)");
-    private static Integer API_VERSION_MAJOR = 4;
-    private static Integer API_VERSION_MINOR = 6;
     private Integer session_id = 123456789;
 
     public TRexClient(String host, String port, String userName) {
@@ -83,17 +82,17 @@ protected void serverAPISync() throws TRexConnectionException {
 
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("name", "STL");
-        parameters.put("major", API_VERSION_MAJOR);
-        parameters.put("minor", API_VERSION_MINOR);
+        parameters.put("major", Constants.STL_API_VERSION_MAJOR);
+        parameters.put("minor", Constants.STL_API_VERSION_MINOR);
 
         TRexClientResult<ApiVersionHandler> result = callMethod("api_sync_v2", parameters, ApiVersionHandler.class);
 
         if (result.get() == null) {
             TRexConnectionException e = new TRexConnectionException(
                     MessageFormat.format(
                             "Unable to connect to TRex server. Required API version is {0}.{1}. Error: {2}",
-                            API_VERSION_MAJOR,
-                            API_VERSION_MINOR,
+                            Constants.STL_API_VERSION_MAJOR,
+                            Constants.STL_API_VERSION_MINOR,
                             result.getError()));
             LOGGER.error("Unable to sync client with TRex server due to: API_H is null.", e.getMessage());
             throw e;

src/main/java/com/cisco/trex/stateless/TRexClient.java

@@ -5,6 +5,8 @@
  */
 public final class Constants {
     public static final String JSON_RPC_VERSION = "2.0";
-    public static Integer API_VERSION_MAJOR = 1;
+    public static Integer ASTF_API_VERSION_MAJOR = 1;
     public static Integer ASTF_API_VERSION_MINOR = 7;
+    public static Integer STL_API_VERSION_MAJOR = 4;
+    public static Integer STL_API_VERSION_MINOR = 6;
 }

src/main/java/com/cisco/trex/util/Constants.java

@@ -30,7 +30,7 @@ public static TRexServerMode getMode(String host, String port) {
         transport = new TRexTransport(host, port, 3000);
         Map<String, Object> parameters = new HashMap<>();
         parameters.put("name", "ASTF");
-        parameters.put("major", Constants.API_VERSION_MAJOR);
+        parameters.put("major", Constants.ASTF_API_VERSION_MAJOR);
         parameters.put("minor", Constants.ASTF_API_VERSION_MINOR);
         RPCResponse response = null;
         try {