Deserialize long parameters in PerfTestMulti

Fixes #214

Author: acogoluegnes

src/main/java/com/rabbitmq/perf/MulticastParams.java

@@ -36,7 +36,7 @@
 
 public class MulticastParams {
 
-    private int confirm = -1;
+    private long confirm = -1;
     private int confirmTimeout = 30;
     private int consumerCount = 1;
     private int producerCount = 1;
@@ -181,10 +181,15 @@ public void setConsumerTxSize(int consumerTxSize) {
         this.consumerTxSize = consumerTxSize;
     }
 
-    public void setConfirm(int confirm) {
+    public void setConfirm(long confirm) {
         this.confirm = confirm;
     }
 
+    // package protected for testing
+    long getConfirm() {
+        return this.confirm;
+    }
+
     public void setConfirmTimeout(int confirmTimeout) {
         this.confirmTimeout = confirmTimeout;
     }

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -102,7 +102,7 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
             int consumerChannelCount = intArg(cmd, 'Y', 1);
             int producerTxSize       = intArg(cmd, 'm', 0);
             int consumerTxSize       = intArg(cmd, 'n', 0);
-            int confirm             = intArg(cmd, 'c', -1);
+            long confirm             = intArg(cmd, 'c', -1);
             int confirmTimeout       = intArg(cmd, "ct", 30);
             boolean autoAck          = hasOption(cmd,"a");
             int multiAckEvery        = intArg(cmd, 'A', 0);

src/main/java/com/rabbitmq/perf/PerfUtil.java

@@ -61,6 +61,12 @@ private static Object convert(Class<?> targetType, Object value) {
                 } else {
                     return Float.valueOf(value.toString());
                 }
+            } else if (isLong(targetType)) {
+                if (value instanceof Number) {
+                    return ((Number) value).longValue();
+                } else {
+                    return Long.valueOf(value.toString());
+                }
             }
         }
         return value;
@@ -73,4 +79,8 @@ private static boolean isInt(Class<?> targetType) {
     private static boolean isFloat(Class<?> targetType) {
         return (targetType.equals(Float.class) || "float".equals(targetType.getSimpleName()));
     }
+
+    private static boolean isLong(Class<?> targetType) {
+        return (targetType.equals(Long.class) || "long".equals(targetType.getSimpleName()));
+    }
 }

src/test/java/com/rabbitmq/perf/ScenarioFactoryTest.java

@@ -32,6 +32,7 @@ public void paramsFromJSON() {
         String spec = "[{'name': 'consume', 'type': 'simple', 'params':" +
                 "[{'time-limit': 30, 'producer-count': 4, 'consumer-count': 2, " +
                 "  'rate': 10, 'exclusive': true, " +
+                "  'confirm': 10, " +
                 "  'body': ['file1.json','file2.json'], 'body-content-type' : 'application/json'}]}]";
         List<Map> scenariosJson = new Gson().fromJson(spec, List.class);
         Map scenario = scenariosJson.get(0);
@@ -41,6 +42,7 @@ public void paramsFromJSON() {
         assertThat(params.getConsumerCount(), is(2));
         assertThat(params.getProducerRateLimit(), is(10.0f));
         assertThat(params.isExclusive(), is(true));
+        assertThat(params.getConfirm(), is(10L));
         assertThat(params.getBodyFiles(), hasSize(2));
         assertThat(params.getBodyFiles(), contains("file1.json", "file2.json"));
         assertThat(params.getBodyContentType(), is("application/json"));