#263 Add JMS message ID to Command instance

Author: Igor Polevoy

javalite-async/src/main/java/org/javalite/async/Async.java

@@ -416,18 +416,17 @@ public Command receiveCommand(String queueName, long timeout) {
         try(Session session = consumerConnection.createSession()){
             Queue queue = (Queue) jmsServer.lookup(QUEUE_NAMESPACE + queueName);
             MessageConsumer consumer = session.createConsumer(queue);
-            Message m = consumer.receive(timeout);
-            if(m == null){
+            Message message = consumer.receive(timeout);
+            if(message == null){
                 return null;
             }else{
                 Command command;
                 if(binaryMode){
-                    BytesMessage message = (BytesMessage) m;
-                    command = Command.fromBytes(getBytes(message));
+                    command = Command.fromBytes(getBytes((BytesMessage) message));
                 }else {
-                    TextMessage message = (TextMessage) m;
-                    command = Command.fromXml(message.getText());
+                    command = Command.fromXml(((TextMessage)message).getText());
                 }
+                command.setJMSMessageID(message.getJMSMessageID());
                 return command;
             }
         } catch (Exception e) {
@@ -452,13 +451,13 @@ public List<Command> getTopCommands(int count, String queueName)  {
             Enumeration messages = session.createBrowser(queue).getEnumeration();
             for(int i = 0; i < count && messages.hasMoreElements(); i++) {
                 Command command;
+                Message message = (Message) messages.nextElement();
                 if(binaryMode){
-                    BytesMessage message = (BytesMessage)messages.nextElement();
-                    command = Command.fromBytes(getBytes(message));
+                    command = Command.fromBytes(getBytes((BytesMessage) message));
                 }else{
-                    TextMessage msg = (TextMessage)messages.nextElement();
-                    command = Command.fromXml(msg.getText());
+                    command = Command.fromXml(((TextMessage)message).getText());
                 }
+                command.setJMSMessageID(message.getJMSMessageID());
                 res.add(command);
             }
             return res;

javalite-async/src/main/java/org/javalite/async/Command.java

@@ -115,11 +115,11 @@ public static <T extends Command> T fromBytes(byte[] bytes, Class<T> type) throw
         return fromBytes(bytes);
     }
 
-    public String getJmsMessageId() {
+    public String getJMSMessageID() {
         return jmsMessageId;
     }
 
-    public void setJmsMessageId(String jmsMessageId) {
+    public void setJMSMessageID(String jmsMessageId) {
         this.jmsMessageId = jmsMessageId;
     }
 }

javalite-async/src/main/java/org/javalite/async/CommandListener.java

@@ -37,9 +37,9 @@ public void onMessage(Message message) {
             if(message instanceof TextMessage){
                 command = Command.fromXml(((TextMessage) message).getText());
             } else { // assume BytesMessage
-                BytesMessage msg = (BytesMessage) message;
-                command = Command.fromBytes(Async.getBytes(msg));
+                command = Command.fromBytes(Async.getBytes((BytesMessage) message));
             }
+            command.setJMSMessageID(message.getJMSMessageID());
             onCommand(command);
         } catch (Exception e) {
             throw new AsyncException("Failed to process command", e);

javalite-async/src/test/java/org/javalite/async/AsyncSpec.java

@@ -109,6 +109,8 @@ public void shouldRemoveMessages() throws Exception {
         List<Command> commands = async.getTopCommands(10, QUEUE_NAME);
         a(commands.size()).shouldBeEqual(2);
 
+        a(commands.get(0).getJMSMessageID()).shouldNotBeNull();
+
         async.removeAllMessages(QUEUE_NAME);
 
         commands = async.getTopCommands(10, QUEUE_NAME);