Merge pull request #106 from cisco-system-traffic-generator/int-to-long2

int to long update

Author: Emil-Gustafsson

src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdRecv.java

@@ -10,7 +10,7 @@ public class ASTFCmdRecv extends ASTFCmd {
    * @param minBytes minimal receive bytes
    * @param clear true if clear data
    */
-  public ASTFCmdRecv(int minBytes, boolean clear) {
+  public ASTFCmdRecv(long minBytes, boolean clear) {
     super();
     fields.addProperty("name", NAME);
     fields.addProperty("min_bytes", minBytes);

src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdRecvMsg.java

@@ -10,7 +10,7 @@ public class ASTFCmdRecvMsg extends ASTFCmd {
    * @param minPkts
    * @param clear
    */
-  public ASTFCmdRecvMsg(int minPkts, boolean clear) {
+  public ASTFCmdRecvMsg(long minPkts, boolean clear) {
     super();
     fields.addProperty("name", NAME);
     fields.addProperty("min_pkts", minPkts);

src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFCmdSetVal.java

@@ -10,7 +10,7 @@ public class ASTFCmdSetVal extends ASTFCmd {
    * @param idVal
    * @param val
    */
-  public ASTFCmdSetVal(String idVal, Long val) {
+  public ASTFCmdSetVal(String idVal, long val) {
     super();
     this.fields.addProperty("name", NAME);
     this.fields.addProperty("id", idVal);

src/main/java/com/cisco/trex/stateful/api/lowlevel/ASTFProgram.java

@@ -3,7 +3,6 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -26,19 +25,15 @@ public class ASTFProgram {
   private static final int MIN_DELAY = 50;
   private static final int MAX_DELAY = 700000;
   private static final int MAX_KEEPALIVE = 500000;
-  private static final Charset UTF_8 = Charset.forName("UTF-8");
   private static final String COMMANDS = "commands";
 
-  private Map<String, Integer> vars = new HashMap();
-  private Map<String, Integer> labels = new HashMap();
-  private Map<String, List<ASTFCmd>> fields = new HashMap();
-  private int totalSendBytes = 0;
-  private int totalRcvBytes = 0;
-  private int payloadLen = 0;
+  private Map<String, Integer> vars = new HashMap<>();
+  private Map<String, Integer> labels = new HashMap<>();
+  private Map<String, List<ASTFCmd>> fields = new HashMap<>();
+  private long totalSendBytes;
+  private long totalRcvBytes;
+  private int payloadLen;
 
-  private String filePath;
-  private SideType side;
-  private List<ASTFCmd> commands;
   private boolean stream = true;
   private static BufferList bufList = new BufferList();
 
@@ -75,9 +70,6 @@ public ASTFProgram(String filePath, SideType side) {
    * @param stream
    */
   public ASTFProgram(String filePath, SideType side, List<ASTFCmd> commands, boolean stream) {
-    this.filePath = filePath;
-    this.side = side;
-    this.commands = commands;
     this.stream = stream;
     fields.put(COMMANDS, new ArrayList<ASTFCmd>());
     if (filePath != null) {
@@ -106,12 +98,12 @@ private void createCmdFromCap(
       throw new IllegalStateException(
           String.format("cmds size %s is not equal to dirs size %s", cmds.size(), dirs.size()));
     }
-    if (cmds.size() == 0) {
+    if (cmds.isEmpty()) {
       return;
     }
 
-    List<ASTFCmd> newCmds = new ArrayList();
-    int totRcvBytes = 0;
+    List<ASTFCmd> newCmds = new ArrayList<>();
+    long totRcvBytes = 0;
     boolean rx = false;
     int maxDelay = 0;
 
@@ -143,7 +135,6 @@ private void createCmdFromCap(
       SideType lastDir = null;
       for (int i = 0; i < cmds.size(); i++) {
         SideType dir = dirs.get(i);
-        CPacketData cmd = cmds.get(i);
         Double time = times.get(i);
 
         if (dir == initSide) {
@@ -208,7 +199,7 @@ private void setCmds(List<ASTFCmd> commands) {
    * @param progS AstfProgram server
    */
   public void updateKeepAlive(ASTFProgram progS) {
-    if (fields.get(COMMANDS).size() > 0) {
+    if (!fields.get(COMMANDS).isEmpty()) {
       ASTFCmd cmd = fields.get(COMMANDS).get(0);
       if (cmd instanceof ASTFCmdKeepaliveMsg) {
         progS.fields.get(COMMANDS).add(0, cmd);
@@ -217,7 +208,7 @@ public void updateKeepAlive(ASTFProgram progS) {
   }
 
   /**
-   * delay for a random time betwean min-max usec with uniform distribution
+   * delay for a random time between min-max usec with uniform distribution
    *
    * @param minUsec
    * @param maxUsec
@@ -289,15 +280,15 @@ public void sendMsg(String buf) {
   }
 
   /**
-   * Send l7_buffer by splitting it into small chunks and issue a delay betwean each chunk. This is
+   * Send l7_buffer by splitting it into small chunks and issue a delay between each chunk. This is
    * a utility command that works on top of send/delay command
    *
    * <p>example1: send (buffer1,100,10) will split the buffer to buffers of 100 bytes with delay of
    * 10usec
    *
    * @param l7Buf l7 stream as string
    * @param chunkSize size of each chunk
-   * @param delayUsec the delay in usec to insert betwean each write
+   * @param delayUsec the delay in usec to insert between each write
    */
   public void sendChunk(String l7Buf, int chunkSize, int delayUsec) {
     int size = l7Buf.length();
@@ -320,8 +311,9 @@ public void sendChunk(String l7Buf, int chunkSize, int delayUsec) {
   /**
    * recv bytes command
    *
-   * @param bytes
+   * @param bytes @Deprecated use method with Long instead
    */
+  @Deprecated
   public void recv(int bytes) {
     recv(bytes, false);
   }
@@ -330,29 +322,72 @@ public void recv(int bytes) {
    * recv bytes command
    *
    * @param bytes
-   * @param clear
    */
+  public void recv(long bytes) {
+    recv(bytes, false);
+  }
+
+  /**
+   * recv bytes command
+   *
+   * @param bytes
+   * @param clear @Deprecated use method with long instead
+   */
+  @Deprecated
   public void recv(int bytes, boolean clear) {
+    recv((long) bytes, clear);
+  }
+
+  /**
+   * recv bytes command
+   *
+   * @param bytes
+   * @param clear
+   */
+  public void recv(long bytes, boolean clear) {
     this.totalRcvBytes += bytes;
     fields.get(COMMANDS).add(new ASTFCmdRecv(totalRcvBytes, clear));
   }
 
   /**
    * recv msg, works for UDP flow
    *
-   * @param pkts wait until the rx packet watermark is reached on flow counter.
+   * @param pkts wait until the rx packet watermark is reached on flow counter. @Deprecated use
+   *     method with long instead
    */
+  @Deprecated
   public void recvMsg(int pkts) {
+    recvMsg((long) pkts, false);
+  }
+
+  /**
+   * recv msg, works for UDP flow
+   *
+   * @param pkts wait until the rx packet watermark is reached on flow counter.
+   */
+  public void recvMsg(long pkts) {
     recvMsg(pkts, false);
   }
 
   /**
    * recv Msg cmd
    *
    * @param pkts wait until the rx packet watermark is reached on flow counter.
-   * @param clear when reach the watermark clear the flow counter
+   * @param clear when reach the watermark clear the flow counter @Deprecated use method with long
+   *     instead
    */
+  @Deprecated
   public void recvMsg(int pkts, boolean clear) {
+    recvMsg((long) pkts, clear);
+  }
+
+  /**
+   * recv Msg cmd
+   *
+   * @param pkts wait until the rx packet watermark is reached on flow counter.
+   * @param clear when reach the watermark clear the flow counter
+   */
+  public void recvMsg(long pkts, boolean clear) {
     this.totalRcvBytes += pkts;
     fields.get(COMMANDS).add(new ASTFCmdRecvMsg(this.totalRcvBytes, clear));
   }
@@ -404,8 +439,9 @@ public void setKeepAliveMsg(int msec) {
    * set var command
    *
    * @param varId
-   * @param value
+   * @param value @Deprecated use method with Long instead
    */
+  @Deprecated
   public void setVar(String varId, int value) {
     addVar(varId);
     fields.get(COMMANDS).add(new ASTFCmdSetVal(varId, (long) value));
@@ -447,9 +483,19 @@ public void jmpNz(String varId, String label) {
   /**
    * get the total send bytes of the program
    *
-   * @return sent bytes
+   * @return sent bytes @Deprecated use getTotalSendBytesLong instead
    */
+  @Deprecated
   public int getTotalSendBytes() {
+    return (int) totalSendBytes;
+  }
+
+  /**
+   * get the total send bytes of the program
+   *
+   * @return sent bytes
+   */
+  public long getTotalSendBytesLong() {
     return totalSendBytes;
   }
 
@@ -562,7 +608,7 @@ private void compile() {
     }
   }
 
-  private boolean isNumber(String str) {
+  private static boolean isNumber(String str) {
     for (char c : str.toCharArray()) {
       if (c < 48 || c > 57) {
         return false;
@@ -595,12 +641,11 @@ public int add(String base64Buf) {
       String sha256Buf = encodeSha256(base64Buf);
       if (bufHash.containsKey(sha256Buf)) {
         return bufHash.get(sha256Buf);
-      } else {
-        bufList.add(base64Buf);
-        int newIndex = bufList.size() - 1;
-        bufHash.put(sha256Buf, newIndex);
-        return newIndex;
       }
+      bufList.add(base64Buf);
+      int newIndex = bufList.size() - 1;
+      bufHash.put(sha256Buf, newIndex);
+      return newIndex;
     }
 
     /**
@@ -621,7 +666,7 @@ public JsonArray toJson() {
    * @param buf should be base64 encode string
    * @return Hex string of the sha256 encode buf
    */
-  private static String encodeSha256(String buf) {
+  static String encodeSha256(String buf) {
     try {
       MessageDigest sha256 = MessageDigest.getInstance("MD5");
       byte[] hashInBytes = sha256.digest(buf.getBytes(StandardCharsets.UTF_8));