replaces randomRKey for randomRoutingKey

Author: Alvaro Videla

test/src/com/rabbitmq/examples/PerfTest.java

@@ -49,7 +49,7 @@ public static void main(String[] args) {
             String exchangeName     = strArg(cmd, 'e', exchangeType);
             String queueName        = strArg(cmd, 'u', "");
             String routingKey       = strArg(cmd, 'k', null);
-            boolean randomRKey      = cmd.hasOption('K');
+            boolean randomRoutingKey      = cmd.hasOption('K');
             int samplingInterval    = intArg(cmd, 'i', 1);
             float producerRateLimit = floatArg(cmd, 'r', 0.0f);
             float consumerRateLimit = floatArg(cmd, 'R', 0.0f);
@@ -108,7 +108,7 @@ public static void main(String[] args) {
             p.setProducerTxSize(   producerTxSize);
             p.setQueueName(        queueName);
             p.setRoutingKey(       routingKey);
-            p.setRandomRKey(       randomRKey);
+            p.setRandomRoutingKey(       randomRoutingKey);
             p.setProducerRateLimit(producerRateLimit);
             p.setTimeLimit(        timeLimit);
 
@@ -140,7 +140,7 @@ private static Options getOptions() {
         options.addOption(new Option("e", "exchange",      true, "exchange name"));
         options.addOption(new Option("u", "queue",         true, "queue name"));
         options.addOption(new Option("k", "routingKey",    true, "routing key"));
-        options.addOption(new Option("K", "randomRKey",    false,"use random routing key per message"));
+        options.addOption(new Option("K", "randomRoutingKey",    false,"use random routing key per message"));
         options.addOption(new Option("i", "interval",      true, "sampling interval"));
         options.addOption(new Option("r", "rate",          true, "producer rate limit"));
         options.addOption(new Option("R", "consumerRate",  true, "consumer rate limit"));

test/src/com/rabbitmq/examples/perf/MulticastParams.java

@@ -45,7 +45,7 @@ public class MulticastParams {
     private String exchangeType = "direct";
     private String queueName = "";
     private String routingKey = null;
-    private boolean randomRKey = false;
+    private boolean randomRoutingKey = false;
 
     private List<?> flags = new ArrayList<Object>();
 
@@ -71,8 +71,8 @@ public void setRoutingKey(String routingKey) {
         this.routingKey = routingKey;
     }
 
-    public void setRandomRKey(boolean randomRKey) {
-        this.randomRKey = randomRKey;
+    public void setRandomRoutingKey(boolean randomRoutingKey) {
+        this.randomRoutingKey = randomRoutingKey;
     }
 
     public void setProducerRateLimit(float producerRateLimit) {
@@ -168,8 +168,8 @@ public String getRoutingKey() {
         return routingKey;
     }
 
-    public boolean getRandomRKey() {
-        return randomRKey;
+    public boolean getRandomRoutingKey() {
+        return randomRoutingKey;
     }
 
     public Producer createProducer(Connection connection, Stats stats, String id) throws IOException {
@@ -180,7 +180,7 @@ public Producer createProducer(Connection connection, Stats stats, String id) th
             channel.exchangeDeclare(exchangeName, exchangeType);
         }
         final Producer producer = new Producer(channel, exchangeName, id,
-                                               randomRKey, flags, producerTxSize,
+                                               randomRoutingKey, flags, producerTxSize,
                                                producerRateLimit, producerMsgCount,
                                                minMsgSize, timeLimit,
                                                confirm, stats);

test/src/com/rabbitmq/examples/perf/Producer.java

@@ -38,7 +38,7 @@ public class Producer extends ProducerConsumerBase implements Runnable, ReturnLi
     private Channel channel;
     private String  exchangeName;
     private String  id;
-    private boolean randomRKey;
+    private boolean randomRoutingKey;
     private boolean mandatory;
     private boolean immediate;
     private boolean persistent;
@@ -54,7 +54,7 @@ public class Producer extends ProducerConsumerBase implements Runnable, ReturnLi
     private volatile SortedSet<Long> unconfirmedSet =
         Collections.synchronizedSortedSet(new TreeSet<Long>());
 
-    public Producer(Channel channel, String exchangeName, String id, boolean randomRKey,
+    public Producer(Channel channel, String exchangeName, String id, boolean randomRoutingKey,
                     List<?> flags, int txSize,
                     float rateLimit, int msgLimit, int minMsgSize, int timeLimit,
                     long confirm, Stats stats)
@@ -63,7 +63,7 @@ public Producer(Channel channel, String exchangeName, String id, boolean randomR
         this.channel      = channel;
         this.exchangeName = exchangeName;
         this.id           = id;
-        this.randomRKey   = randomRKey;
+        this.randomRoutingKey = randomRoutingKey;
         this.mandatory    = flags.contains("mandatory");
         this.immediate    = flags.contains("immediate");
         this.persistent   = flags.contains("persistent");
@@ -159,7 +159,7 @@ private void publish(byte[] msg)
         throws IOException {
 
         unconfirmedSet.add(channel.getNextPublishSeqNo());
-        channel.basicPublish(exchangeName, randomRKey ? UUID.randomUUID().toString() : id,
+        channel.basicPublish(exchangeName, randomRoutingKey ? UUID.randomUUID().toString() : id,
                              mandatory, immediate,
                              persistent ? MessageProperties.MINIMAL_PERSISTENT_BASIC : MessageProperties.MINIMAL_BASIC,
                              msg);