update java examples to use URIs

Alexandru Scvortov · Alexandru Scvortov · commit cfd4abe1a6d0 · 2011-09-29T14:02:10.000+01:00
diff --git a/build.xml b/build.xml
@@ -227,8 +227,7 @@
     <java fork="true" classname="${test.main}"
         failonerror="${haltOnFailureJava}" errorproperty="test.failure">
       <jvmarg value="-Xdebug"/>
-      <arg value="${broker.hostname}"/>
-      <arg value="${broker.port}"/>
+      <arg value="amqp://${broker.hostname}:${broker.port}"/>
       <classpath>
         <path refid="test.javac.classpath"/>
         <pathelement path="${javac.out}"/>
diff --git a/test/src/com/rabbitmq/examples/BufferPerformanceMetrics.java b/test/src/com/rabbitmq/examples/BufferPerformanceMetrics.java
@@ -43,7 +43,7 @@ public class BufferPerformanceMetrics {
     public static double NANOSECONDS_PER_SECOND = 1000 * 1000 * 1000;
 
     public static void main(String[] args) throws Exception {
-        final String hostName = args.length > 0 ? args[0] : "localhost";
+        final String uri = args.length > 0 ? args[0] : "amqp://localhost";
 
         Random rnd = new Random();
 
@@ -64,8 +64,8 @@ public static void main(String[] args) throws Exception {
 
             for(final boolean useNagle : new boolean[] { false, true }) {
                 ConnectionFactory factory = new ConnectionFactory() {
-                    { setHost(hostName); }
-                    
+                    { setUri(uri); }
+
                         public void configureSocket(Socket socket)
                             throws IOException {
                             socket.setTcpNoDelay(!useNagle);
diff --git a/test/src/com/rabbitmq/examples/ConsumerMain.java b/test/src/com/rabbitmq/examples/ConsumerMain.java
@@ -51,11 +51,10 @@ public static boolean optArg(String[] args, int index, boolean def) {
 
     public static void main(String[] args) {
         try {
-            final String hostName = optArg(args, 0, "localhost");
-            final int portNumber = optArg(args, 1, AMQP.PROTOCOL.PORT);
-            boolean writeStats = optArg(args, 2, true);
-            boolean autoAck = optArg(args, 3, true);
-            final Connection conn = new ConnectionFactory(){{setHost(hostName); setPort(portNumber);}}.newConnection();
+            final String uri = optArg(args, 0, "amqp://localhost");
+            boolean writeStats = optArg(args, 1, true);
+            boolean autoAck = optArg(args, 2, true);
+            final Connection conn = new ConnectionFactory(){{setUri(uri);}}.newConnection();
             System.out.println("Channel 0 fully open.");
             new ConsumerMain(conn, writeStats, autoAck).run();
         } catch (Exception e) {
diff --git a/test/src/com/rabbitmq/examples/FileConsumer.java b/test/src/com/rabbitmq/examples/FileConsumer.java
@@ -37,8 +37,7 @@
 public class FileConsumer {
     public static void main(String[] args) {
 	Options options = new Options();
-	options.addOption(new Option("h", "host", true, "broker host"));
-	options.addOption(new Option("p", "port", true, "broker port"));
+	options.addOption(new Option("h", "uri", true, "AMQP URI"));
 	options.addOption(new Option("q", "queue", true, "queue name"));
 	options.addOption(new Option("t", "type", true, "exchange type"));
 	options.addOption(new Option("e", "exchange", true, "exchange name"));
@@ -50,8 +49,7 @@ public static void main(String[] args) {
         try {
             CommandLine cmd = parser.parse(options, args);
 
-            String hostName = strArg(cmd, 'h', "localhost");
-            int portNumber = intArg(cmd, 'p', AMQP.PROTOCOL.PORT);
+            String uri = strArg(cmd, 'h', "amqp://localhost");
 	    String requestedQueueName = strArg(cmd, 'q', "");
 	    String exchangeType = strArg(cmd, 't', "direct");
 	    String exchange = strArg(cmd, 'e', null);
@@ -65,8 +63,7 @@ public static void main(String[] args) {
 	    }
 
             ConnectionFactory connFactory = new ConnectionFactory();
-            connFactory.setHost(hostName);
-            connFactory.setPort(portNumber);
+            connFactory.setUri(uri);
             Connection conn = connFactory.newConnection();
 
             final Channel ch = conn.createChannel();
diff --git a/test/src/com/rabbitmq/examples/FileProducer.java b/test/src/com/rabbitmq/examples/FileProducer.java
@@ -37,7 +37,7 @@
 public class FileProducer {
     public static void main(String[] args) {
 	Options options = new Options();
-	options.addOption(new Option("h", "host", true, "broker host"));
+	options.addOption(new Option("h", "uri", true, "AMQP URI"));
 	options.addOption(new Option("p", "port", true, "broker port"));
 	options.addOption(new Option("t", "type", true, "exchange type"));
 	options.addOption(new Option("e", "exchange", true, "exchange name"));
@@ -48,15 +48,13 @@ public static void main(String[] args) {
         try {
             CommandLine cmd = parser.parse(options, args);
 
-            String hostName = strArg(cmd, 'h', "localhost");
-            int portNumber = intArg(cmd, 'p', AMQP.PROTOCOL.PORT);
+            String uri = strArg(cmd, 'h', "amqp://localhost");
 	    String exchangeType = strArg(cmd, 't', "direct");
 	    String exchange = strArg(cmd, 'e', null);
 	    String routingKey = strArg(cmd, 'k', null);
 
             ConnectionFactory connFactory = new ConnectionFactory();
-            connFactory.setHost(hostName);
-            connFactory.setPort(portNumber);
+            connFactory.setUri(uri);
             Connection conn = connFactory.newConnection();
 
             final Channel ch = conn.createChannel();
diff --git a/test/src/com/rabbitmq/examples/HelloClient.java b/test/src/com/rabbitmq/examples/HelloClient.java
@@ -27,12 +27,10 @@ public class HelloClient {
     public static void main(String[] args) {
         try {
             String request = (args.length > 0) ? args[0] : "Rabbit";
-            String hostName = (args.length > 1) ? args[1] : "localhost";
-            int portNumber = (args.length > 2) ? Integer.parseInt(args[2]) : AMQP.PROTOCOL.PORT;
+            String uri = (args.length > 1) ? args[1] : "amqp://localhost";
 
-            ConnectionFactory cfconn = new ConnectionFactory(); 
-            cfconn.setHost(hostName); 
-            cfconn.setPort(portNumber);
+            ConnectionFactory cfconn = new ConnectionFactory();
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
             Channel ch = conn.createChannel();
             RpcClient service = new RpcClient(ch, "", "Hello");
diff --git a/test/src/com/rabbitmq/examples/HelloJsonClient.java b/test/src/com/rabbitmq/examples/HelloJsonClient.java
@@ -29,12 +29,10 @@ public class HelloJsonClient {
     public static void main(String[] args) {
         try {
             String request = (args.length > 0) ? args[0] : "Rabbit";
-            String hostName = (args.length > 1) ? args[1] : "localhost";
-            int portNumber = (args.length > 2) ? Integer.parseInt(args[2]) : AMQP.PROTOCOL.PORT;
+            String uri = (args.length > 1) ? args[1] : "amqp://localhost";
 
-            ConnectionFactory cfconn = new ConnectionFactory(); 
-            cfconn.setHost(hostName); 
-            cfconn.setPort(portNumber);
+            ConnectionFactory cfconn = new ConnectionFactory();
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
             Channel ch = conn.createChannel();
             JsonRpcClient client = new JsonRpcClient(ch, "", "Hello", RPC_TIMEOUT_ONE_SECOND);
diff --git a/test/src/com/rabbitmq/examples/HelloJsonServer.java b/test/src/com/rabbitmq/examples/HelloJsonServer.java
@@ -26,12 +26,10 @@
 public class HelloJsonServer {
     public static void main(String[] args) {
         try {
-            String hostName = (args.length > 0) ? args[0] : "localhost";
-            int portNumber = (args.length > 1) ? Integer.parseInt(args[1]) : AMQP.PROTOCOL.PORT;
+            String uri = (args.length > 0) ? args[0] : "amqp://localhost";
 
             ConnectionFactory connFactory = new ConnectionFactory();
-            connFactory.setHost(hostName);
-            connFactory.setPort(portNumber);
+            connFactory.setUri(uri);
             Connection conn = connFactory.newConnection();
             final Channel ch = conn.createChannel();
 
diff --git a/test/src/com/rabbitmq/examples/LogTail.java b/test/src/com/rabbitmq/examples/LogTail.java
@@ -26,13 +26,13 @@
 public class LogTail {
     public static void main(String[] args) {
         try {
-            ConnectionFactory cfconn = new ConnectionFactory();
-            if (args.length > 0) {
-                cfconn.setUri(args[0]);
-            }
+            String uri = (args.length > 0) ? args[0] : "amqp://localhost";
             String exchange = (args.length > 1) ? args[1] : "amq.rabbitmq.log";
 
+            ConnectionFactory cfconn = new ConnectionFactory();
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
+
             Channel ch1 = conn.createChannel();
 
             String queueName = ch1.queueDeclare().getQueue();
diff --git a/test/src/com/rabbitmq/examples/ManyConnections.java b/test/src/com/rabbitmq/examples/ManyConnections.java
@@ -37,24 +37,21 @@ public static void main(String[] args) {
         try {
             if (args.length < 4) {
                 System.err
-                        .println("Usage: ManyConnections hostName connCount chanPerConnCount heartbeatInterval [rate [port]]");
+                        .println("Usage: ManyConnections uri connCount chanPerConnCount heartbeatInterval [rate]");
                 System.exit(2);
             }
 
-            String hostName = args[0];
+            String uri = args[0];
             connectionCount = Integer.parseInt(args[1]);
             channelPerConnectionCount = Integer.parseInt(args[2]);
             heartbeatInterval = Integer.parseInt(args[3]);
             rate = (args.length > 4) ? Double.parseDouble(args[4]) : 1.0;
-            int portNumber = (args.length > 5) ? Integer.parseInt(args[5])
-                    : AMQP.PROTOCOL.PORT;
 
             ConnectionFactory factory = new ConnectionFactory();
             factory.setRequestedHeartbeat(heartbeatInterval);
             for (int i = 0; i < connectionCount; i++) {
                 System.out.println("Starting connection " + i);
-                factory.setHost(hostName);
-                factory.setPort(portNumber);
+                factory.setUri(uri);
                 final Connection conn = factory.newConnection();
 
                 for (int j = 0; j < channelPerConnectionCount; j++) {
diff --git a/test/src/com/rabbitmq/examples/ProducerMain.java b/test/src/com/rabbitmq/examples/ProducerMain.java
@@ -68,14 +68,13 @@ public static boolean summariseArg(String name, boolean value) {
 
     public static void main(String[] args) {
         try {
-            final String hostName = optArg("hostName", args, 0, "localhost");
-            final int portNumber = optArg("portNumber", args, 1, AMQP.PROTOCOL.PORT);
-            int rateLimit = optArg("rateLimit", args, 2, SEND_RATE);
-            int messageCount = optArg("messageCount", args, 3, LATENCY_MESSAGE_COUNT);
-            boolean sendCompletion = optArg("sendCompletion", args, 4, false);
-            int commitEvery = optArg("commitEvery", args, 5, -1);
-            boolean sendLatencyInfo = optArg("sendLatencyInfo", args, 6, true);
-            final Connection conn = new ConnectionFactory(){{setHost(hostName); setPort(portNumber);}}.newConnection();
+            final String uri = optArg("uri", args, 0, "amqp://localhost");
+            int rateLimit = optArg("rateLimit", args, 1, SEND_RATE);
+            int messageCount = optArg("messageCount", args, 2, LATENCY_MESSAGE_COUNT);
+            boolean sendCompletion = optArg("sendCompletion", args, 3, false);
+            int commitEvery = optArg("commitEvery", args, 4, -1);
+            boolean sendLatencyInfo = optArg("sendLatencyInfo", args, 5, true);
+            final Connection conn = new ConnectionFactory(){{setUri(uri);}}.newConnection();
             //if (commitEvery > 0) { conn.getSocket().setTcpNoDelay(true); }
             System.out.println("Channel 0 fully open.");
             new ProducerMain(conn, rateLimit, messageCount, sendCompletion, commitEvery, sendLatencyInfo).run();
diff --git a/test/src/com/rabbitmq/examples/SendString.java b/test/src/com/rabbitmq/examples/SendString.java
@@ -26,20 +26,18 @@ public class SendString {
     public static void main(String[] args) {
         try {
             if (args.length < 5) {
-                System.err.println("Usage: SendString <hostname> <exchange> <exchangetype> <routingkey> <message> [<portnumber>]");
+                System.err.println("Usage: SendString <uri> <exchange> <exchangetype> <routingkey> <message>");
                 System.exit(1);
             }
 
-            String hostName = args[0];
+            String uri = args[0];
             String exchange = args[1];
             String exchangeType = args[2];
             String routingKey = args[3];
             String message = args[4];
-            int portNumber = (args.length > 5) ? Integer.parseInt(args[5]) : AMQP.PROTOCOL.PORT;
 
-            ConnectionFactory cfconn = new ConnectionFactory(); 
-            cfconn.setHost(hostName); 
-            cfconn.setPort(portNumber);
+            ConnectionFactory cfconn = new ConnectionFactory();
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
             Channel ch = conn.createChannel();
 
diff --git a/test/src/com/rabbitmq/examples/SimpleConsumer.java b/test/src/com/rabbitmq/examples/SimpleConsumer.java
@@ -26,13 +26,11 @@
 public class SimpleConsumer {
     public static void main(String[] args) {
         try {
-            String hostName = (args.length > 0) ? args[0] : "localhost";
-            int portNumber = (args.length > 1) ? Integer.parseInt(args[1]) : AMQP.PROTOCOL.PORT;
-            String queueName = (args.length > 2) ? args[2] : "SimpleQueue";
+            String uri = (args.length > 0) ? args[0] : "amqp://localhost";
+            String queueName = (args.length > 1) ? args[1] : "SimpleQueue";
 
             ConnectionFactory connFactory = new ConnectionFactory();
-            connFactory.setHost(hostName);
-            connFactory.setPort(portNumber);
+            connFactory.setUri(uri);
             Connection conn = connFactory.newConnection();
 
             final Channel ch = conn.createChannel();
diff --git a/test/src/com/rabbitmq/examples/SimpleProducer.java b/test/src/com/rabbitmq/examples/SimpleProducer.java
@@ -25,16 +25,14 @@
 public class SimpleProducer {
     public static void main(String[] args) {
         try {
-            String hostName = (args.length > 0) ? args[0] : "localhost";
-            int portNumber = (args.length > 1) ? Integer.parseInt(args[1]) : AMQP.PROTOCOL.PORT;
-            String message = (args.length > 2) ? args[2] :
+            String uri = (args.length > 0) ? args[0] : "amqp://localhost";
+            String message = (args.length > 1) ? args[1] :
                 "the time is " + new java.util.Date().toString();
-            String exchange = (args.length > 3) ? args[3] : "";
-            String routingKey = (args.length > 4) ? args[4] : "SimpleQueue";
+            String exchange = (args.length > 2) ? args[2] : "";
+            String routingKey = (args.length > 3) ? args[3] : "SimpleQueue";
 
             ConnectionFactory cfconn = new ConnectionFactory();
-            cfconn.setHost(hostName);
-            cfconn.setPort(portNumber);
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
 
             Channel ch = conn.createChannel();
diff --git a/test/src/com/rabbitmq/examples/SimpleTopicConsumer.java b/test/src/com/rabbitmq/examples/SimpleTopicConsumer.java
@@ -27,27 +27,24 @@
 public class SimpleTopicConsumer {
     public static void main(String[] args) {
         try {
-            if (args.length < 1 || args.length > 5) {
-                System.err.print("Usage: SimpleTopicConsumer brokerhostname [brokerport\n" +
-                                 "                                           [topicpattern\n" +
-                                 "                                            [exchange\n" +
-                                 "                                             [queue]]]]\n" +
+            if (args.length < 1 || args.length > 4) {
+                System.err.print("Usage: SimpleTopicConsumer brokeruri [topicpattern\n" +
+                                 "                                      [exchange\n" +
+                                 "                                       [queue]]]\n" +
                                  "where\n" +
                                  " - topicpattern defaults to \"#\",\n" +
                                  " - exchange to \"amq.topic\", and\n" +
                                  " - queue to a private, autodelete queue\n");
                 System.exit(1);
             }
 
-            String hostName = (args.length > 0) ? args[0] : "localhost";
-            int portNumber = (args.length > 1) ? Integer.parseInt(args[1]) : AMQP.PROTOCOL.PORT;
-            String topicPattern = (args.length > 2) ? args[2] : "#";
-            String exchange = (args.length > 3) ? args[3] : null;
-            String queue = (args.length > 4) ? args[4] : null;
+            String uri = (args.length > 0) ? args[0] : "amqp://localhost";
+            String topicPattern = (args.length > 1) ? args[1] : "#";
+            String exchange = (args.length > 2) ? args[2] : null;
+            String queue = (args.length > 3) ? args[3] : null;
 
-            ConnectionFactory cfconn = new ConnectionFactory(); 
-            cfconn.setHost(hostName); 
-            cfconn.setPort(portNumber);
+            ConnectionFactory cfconn = new ConnectionFactory();
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
 
             final Channel channel = conn.createChannel();
diff --git a/test/src/com/rabbitmq/examples/SimpleTopicProducer.java b/test/src/com/rabbitmq/examples/SimpleTopicProducer.java
@@ -27,27 +27,24 @@ public class SimpleTopicProducer {
 
     public static void main(String[] args) {
         try {
-            if (args.length < 1 || args.length > 5) {
-                System.err.print("Usage: SimpleTopicProducer brokerhostname [brokerport\n" +
-                                 "                                           [topic\n" +
-                                 "                                            [exchange\n" +
-                                 "                                             [message]]]]\n" +
+            if (args.length < 1 || args.length > 4) {
+                System.err.print("Usage: SimpleTopicProducer brokeruri [topic\n" +
+                                 "                                      [exchange\n" +
+                                 "                                       [message]]]\n" +
                                  "where\n" +
                                  " - topic defaults to \""+DEFAULT_TOPIC+"\",\n" +
                                  " - exchange defaults to \"amq.topic\", and\n" +
                                  " - message defaults to a time-of-day message\n");
                 System.exit(1);
             }
-            String hostName = (args.length > 0) ? args[0] : "localhost";
-            int portNumber = (args.length > 1) ? Integer.parseInt(args[1]) : AMQP.PROTOCOL.PORT;
-            String topic = (args.length > 2) ? args[2] : DEFAULT_TOPIC;
-            String exchange = (args.length > 3) ? args[3] : null;
-            String message = (args.length > 4) ? args[4] :
+            String uri = (args.length > 0) ? args[0] : "amqp://localhost";
+            String topic = (args.length > 1) ? args[1] : DEFAULT_TOPIC;
+            String exchange = (args.length > 2) ? args[2] : null;
+            String message = (args.length > 3) ? args[3] :
                 "the time is " + new java.util.Date().toString();
 
-            ConnectionFactory cfconn = new ConnectionFactory(); 
-            cfconn.setHost(hostName); 
-            cfconn.setPort(portNumber);
+            ConnectionFactory cfconn = new ConnectionFactory();
+            cfconn.setUri(uri);
             Connection conn = cfconn.newConnection();
 
             Channel ch = conn.createChannel();
diff --git a/test/src/com/rabbitmq/examples/SpammyTopicProducer.java b/test/src/com/rabbitmq/examples/SpammyTopicProducer.java
diff --git a/test/src/com/rabbitmq/examples/StressPersister.java b/test/src/com/rabbitmq/examples/StressPersister.java
diff --git a/test/src/com/rabbitmq/examples/TestMain.java b/test/src/com/rabbitmq/examples/TestMain.java
diff --git a/test/src/com/rabbitmq/examples/TracerConcurrencyTest.java b/test/src/com/rabbitmq/examples/TracerConcurrencyTest.java
