NO-JIRA: fix indentation/tabs etc in Server, simplify Client slightly, rename some variables for clarity
This closes #7 Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8a1a498c Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8a1a498c Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8a1a498c Branch: refs/heads/master Commit: 8a1a498c6c8307da1e3079c09c3d4d2e0aff5776 Parents: 72c7bb0 Author: Robert Gemmell <[email protected]> Authored: Wed May 17 12:47:59 2017 +0100 Committer: Robert Gemmell <[email protected]> Committed: Wed May 17 12:47:59 2017 +0100 ---------------------------------------------------------------------- .../org/apache/qpid/jms/example/Client.java | 42 +++++++---------- .../org/apache/qpid/jms/example/Server.java | 49 +++++++++----------- 2 files changed, 41 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8a1a498c/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Client.java ---------------------------------------------------------------------- diff --git a/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Client.java b/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Client.java index babc0ea..482af79 100644 --- a/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Client.java +++ b/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Client.java @@ -36,8 +36,6 @@ import javax.naming.Context; import javax.naming.InitialContext; public class Client { - private static final int DELIVERY_MODE = DeliveryMode.NON_PERSISTENT; - public static void main(String[] args) throws Exception { try { // The configuration for the Qpid InitialContextFactory has been supplied in @@ -54,37 +52,33 @@ public class Client { Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - //Create a temporary queue to receive from, producer, and consumer. - TemporaryQueue tempQueue = session.createTemporaryQueue(); + //Create a temporary queue and consumer to receive responses, and a producer to send requests. + TemporaryQueue responseQueue = session.createTemporaryQueue(); + MessageConsumer messageConsumer = session.createConsumer(responseQueue); MessageProducer messageProducer = session.createProducer(queue); - MessageConsumer messageConsumer = session.createConsumer(tempQueue); - //Create and send four messages. - String[] messageTexts = new String[] { "Twas brillig, and the slithy toves", - "Did gire and gymble in the wabe.", - "All mimsy were the borogroves,", - "And the mome raths outgrabe." }; + //Send some requests and receive the responses. + String[] requests = new String[] { "Twas brillig, and the slithy toves", + "Did gire and gymble in the wabe.", + "All mimsy were the borogroves,", + "And the mome raths outgrabe." }; - for (String text : messageTexts) { - TextMessage messageToBeSent = session.createTextMessage(text); - messageToBeSent.setJMSReplyTo(tempQueue); + for (String request : requests) { + TextMessage requestMessage = session.createTextMessage(request); + requestMessage.setJMSReplyTo(responseQueue); - messageProducer.send(messageToBeSent, DELIVERY_MODE, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE); - } + messageProducer.send(requestMessage, DeliveryMode.NON_PERSISTENT, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE); - //Receive the messages. - for (int i = 1; i <= messageTexts.length; i++) { - TextMessage receivedMessage = (TextMessage) messageConsumer.receive(1000); - if (receivedMessage != null) { - System.out.println("[CLIENT] Received Message " + i + ": " + messageTexts[i-1] + " ---> " + receivedMessage.getText()); + TextMessage responseMessage = (TextMessage) messageConsumer.receive(2000); + if (responseMessage != null) { + System.out.println("[CLIENT] " + request + " ---> " + responseMessage.getText()); } else { - System.out.println("[CLIENT] Message " + i + " was not received within the timeout."); + System.out.println("[CLIENT] Response for '" + request +"' was not received within the timeout, exiting."); + break; } } - System.out.println("[CLIENT] Exiting..."); - System.exit(0); - + connection.close(); } catch (Exception exp) { System.out.println("[CLIENT] Caught exception, exiting."); exp.printStackTrace(System.out); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8a1a498c/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Server.java ---------------------------------------------------------------------- diff --git a/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Server.java b/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Server.java index bbb7bd4..ef12d6b 100644 --- a/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Server.java +++ b/qpid-jms-examples/src/main/java/org/apache/qpid/jms/example/Server.java @@ -31,48 +31,45 @@ import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import javax.jms.ObjectMessage; import javax.naming.Context; import javax.naming.InitialContext; -import java.util.ArrayList; -import java.util.Collections; public class Server { public static void main(String[] args) throws Exception { - try { - // The configuration for the Qpid InitialContextFactory has been supplied in - // a jndi.properties file in the classpath, which results in it being picked - // up automatically by the InitialContext constructor. - Context context = new InitialContext(); + try { + // The configuration for the Qpid InitialContextFactory has been supplied in + // a jndi.properties file in the classpath, which results in it being picked + // up automatically by the InitialContext constructor. + Context context = new InitialContext(); - ConnectionFactory factory = (ConnectionFactory) context.lookup("myFactoryLookup"); - Destination queue = (Destination) context.lookup("myQueueLookup"); + ConnectionFactory factory = (ConnectionFactory) context.lookup("myFactoryLookup"); + Destination queue = (Destination) context.lookup("myQueueLookup"); - Connection connection = factory.createConnection(System.getProperty("USER"), System.getProperty("PASSWORD")); - connection.setExceptionListener(new MyExceptionListener()); - connection.start(); + Connection connection = factory.createConnection(System.getProperty("USER"), System.getProperty("PASSWORD")); + connection.setExceptionListener(new MyExceptionListener()); + connection.start(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - MessageConsumer messageConsumer = session.createConsumer(queue); - MessageProducer messageProducer = session.createProducer(null); + MessageConsumer messageConsumer = session.createConsumer(queue); + MessageProducer messageProducer = session.createProducer(null); while (true) { - //Receive messages and return a new uppercase message. - TextMessage receivedMessage = (TextMessage) messageConsumer.receive(); + //Receive messages and return a new uppercase message. + TextMessage requestMessage = (TextMessage) messageConsumer.receive(); - System.out.println("[SERVER] Received: " + receivedMessage.getText()); + System.out.println("[SERVER] Received: " + requestMessage.getText()); - TextMessage responseMessage = session.createTextMessage(receivedMessage.getText().toUpperCase()); + TextMessage responseMessage = session.createTextMessage(requestMessage.getText().toUpperCase()); - messageProducer.send(receivedMessage.getJMSReplyTo(), responseMessage, DeliveryMode.NON_PERSISTENT, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE); - } + messageProducer.send(requestMessage.getJMSReplyTo(), responseMessage, DeliveryMode.NON_PERSISTENT, Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE); + } } catch (Exception exp) { - System.out.println("[SERVER] Caught exception, exiting."); - exp.printStackTrace(System.out); - System.exit(1); - } + System.out.println("[SERVER] Caught exception, exiting."); + exp.printStackTrace(System.out); + System.exit(1); + } } private static class MyExceptionListener implements ExceptionListener { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
