Return-Path: 
 <commits-return-28966-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 9CB9D173DC
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu, 22 Jan 2015 14:45:19 +0000 (UTC)
Received: (qmail 20975 invoked by uid 500); 22 Jan 2015 14:45:19 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 20927 invoked by uid 500); 22 Jan 2015 14:45:19 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 20918 invoked by uid 99); 22 Jan 2015 14:45:19 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jan 2015 14:45:19 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 7F6E9E03A3; Thu, 22 Jan 2015 14:45:19 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: andytaylor@apache.org
To: commits@activemq.apache.org
Date: Thu, 22 Jan 2015 14:45:19 -0000
Message-Id: <18588cd85d594193be970fe7ec14c793@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] activemq-6 git commit: ACTIVEMQ6-73 Adding missing methods

Repository: activemq-6
Updated Branches:
  refs/heads/master 2ae6f36e7 -> 28db9f984


ACTIVEMQ6-73 Adding missing methods

https://issues.apache.org/jira/browse/ACTIVEMQ6-73
https://bugzilla.redhat.com/show_bug.cgi?id=1174152

this is adding missing methods on the Management interface as originally raised at
https://bugzilla.redhat.com/show_bug.cgi?id=1174152 by RedHat


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/0eb1e332
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/0eb1e332
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/0eb1e332

Branch: refs/heads/master
Commit: 0eb1e332d314c9b5cebef3acc58c0c58b0dd20f0
Parents: 2ae6f36
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed Jan 21 18:32:19 2015 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Wed Jan 21 18:32:21 2015 -0500

----------------------------------------------------------------------
 .../api/jms/management/JMSQueueControl.java     | 31 ++++++++++
 .../management/impl/JMSQueueControlImpl.java    | 62 ++++++++++++++++++--
 .../server/management/JMSQueueControlTest.java  | 51 ++++++++++++++++
 .../management/JMSQueueControlUsingJMSTest.java | 35 +++++++++++
 4 files changed, 173 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/0eb1e332/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
index 8e9b270..7aa2912 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
@@ -275,4 +275,35 @@ public interface JMSQueueControl extends DestinationControl
     */
    void flushExecutor();
 
+   /**
+    * Lists all the messages scheduled for delivery for this queue.
+    * <br>
+    * 1 Map represents 1 message, keys are the message's properties and headers, values are the corresponding values.
+    */
+   @Operation(desc = "List the messages scheduled for delivery", impact = MBeanOperationInfo.INFO)
+   Map<String, Object>[] listScheduledMessages() throws Exception;
+
+   /**
+    * Lists all the messages scheduled for delivery for this queue using JSON serialization.
+    */
+   @Operation(desc = "List the messages scheduled for delivery and returns them using JSON", impact = MBeanOperationInfo.INFO)
+   String listScheduledMessagesAsJSON() throws Exception;
+
+   /**
+    * Lists all the messages being deliver per consumer.
+    * <br>
+    * The Map's key is a toString representation for the consumer. Each consumer will then return a Map<String,Object>[] same way is returned by {@link #listScheduledMessages()}
+    */
+   @Operation(desc = "List all messages being delivered per consumer")
+   Map<String, Map<String, Object>[]> listDeliveringMessages() throws Exception;
+
+   /**
+    * Executes a conversion of {@link #listDeliveringMessages()} to JSON
+    *
+    * @return
+    * @throws Exception
+    */
+   @Operation(desc = "list all messages being delivered per consumer using JSON form")
+   String listDeliveringMessagesAsJSON() throws Exception;
+
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/0eb1e332/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
index 2b7a4dc..6ae572b 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
@@ -18,6 +18,7 @@ package org.apache.activemq.jms.management.impl;
 
 import javax.management.MBeanInfo;
 import javax.management.StandardMBean;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.activemq.api.core.ActiveMQException;
@@ -183,16 +184,59 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
          String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr);
          Map<String, Object>[] coreMessages = coreQueueControl.listMessages(filter);
 
-         Map<String, Object>[] jmsMessages = new Map[coreMessages.length];
+         return toJMSMap(coreMessages);
+      }
+      catch (ActiveMQException e)
+      {
+         throw new IllegalStateException(e.getMessage());
+      }
+   }
+
+   private Map<String, Object>[] toJMSMap(Map<String, Object>[] coreMessages)
+   {
+      Map<String, Object>[] jmsMessages = new Map[coreMessages.length];
+
+      int i = 0;
 
-         int i = 0;
+      for (Map<String, Object> coreMessage : coreMessages)
+      {
+         Map<String, Object> jmsMessage = ActiveMQMessage.coreMaptoJMSMap(coreMessage);
+         jmsMessages[i++] = jmsMessage;
+      }
+      return jmsMessages;
+   }
+
+   @Override
+   public Map<String, Object>[] listScheduledMessages() throws Exception
+   {
+      Map<String, Object>[] coreMessages = coreQueueControl.listScheduledMessages();
+
+      return toJMSMap(coreMessages);
+   }
 
-         for (Map<String, Object> coreMessage : coreMessages)
+   @Override
+   public String listScheduledMessagesAsJSON() throws Exception
+   {
+      return coreQueueControl.listScheduledMessagesAsJSON();
+   }
+
+   @Override
+   public Map<String, Map<String, Object>[]> listDeliveringMessages() throws Exception
+   {
+      try
+      {
+         Map<String, Map<String, Object>[]> returnMap = new HashMap<String, Map<String, Object>[]>();
+
+
+         // the workingMap from the queue-control
+         Map<String, Map<String, Object>[]> workingMap = coreQueueControl.listDeliveringMessages();
+
+         for (Map.Entry<String, Map<String, Object>[]> entry : workingMap.entrySet())
          {
-            Map<String, Object> jmsMessage = ActiveMQMessage.coreMaptoJMSMap(coreMessage);
-            jmsMessages[i++] = jmsMessage;
+            returnMap.put(entry.getKey(), toJMSMap(entry.getValue()));
          }
-         return jmsMessages;
+
+         return returnMap;
       }
       catch (ActiveMQException e)
       {
@@ -200,6 +244,12 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
       }
    }
 
+   @Override
+   public String listDeliveringMessagesAsJSON() throws Exception
+   {
+      return coreQueueControl.listDeliveringMessagesAsJSON();
+   }
+
    public String listMessagesAsJSON(final String filter) throws Exception
    {
       return JMSQueueControlImpl.toJSON(listMessages(filter));

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/0eb1e332/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java
index 5f345e0..effeb65 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlTest.java
@@ -52,6 +52,7 @@ import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy;
 import org.apache.activemq.core.settings.impl.AddressSettings;
 import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
 import org.apache.activemq.jms.client.ActiveMQDestination;
+import org.apache.activemq.jms.client.ActiveMQJMSConnectionFactory;
 import org.apache.activemq.jms.client.ActiveMQQueue;
 import org.apache.activemq.jms.server.impl.JMSServerManagerImpl;
 import org.apache.activemq.jms.server.management.JMSNotificationType;
@@ -158,6 +159,56 @@ public class JMSQueueControlTest extends ManagementTestBase
    }
 
    @Test
+   public void testListDeliveringMessages() throws Exception
+   {
+      JMSQueueControl queueControl = createManagementControl();
+
+      Assert.assertEquals(0, queueControl.getMessageCount());
+
+      String[] ids = JMSUtil.sendMessages(queue, 20);
+
+      ActiveMQJMSConnectionFactory cf = (ActiveMQJMSConnectionFactory)ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF,
+                                                                                                                      new TransportConfiguration(InVMConnectorFactory.class.getName()));
+
+      Connection conn = cf.createConnection();
+      conn.start();
+      Session session = conn.createSession(true, Session.SESSION_TRANSACTED);
+
+      MessageConsumer consumer = session.createConsumer(queue);
+
+
+      for (int i = 0; i < 20; i++)
+      {
+         Assert.assertNotNull(consumer.receive(5000));
+      }
+
+      Assert.assertEquals(20, queueControl.getMessageCount());
+
+      Map<String, Map<String, Object>[]> deliverings = queueControl.listDeliveringMessages();
+
+      // Just one consumer.. so just one queue
+      Assert.assertEquals(1, deliverings.size());
+
+
+      for (Map.Entry<String, Map<String, Object>[]> deliveryEntry : deliverings.entrySet())
+      {
+         System.out.println("Key:" + deliveryEntry.getKey());
+
+         for (int i = 0; i < 20; i++)
+         {
+            Assert.assertEquals(ids[i], deliveryEntry.getValue()[i].get("JMSMessageID").toString());
+         }
+      }
+
+
+
+      session.rollback();
+      session.close();
+
+      JMSUtil.consumeMessages(20, queue);
+   }
+
+   @Test
    public void testListMessagesAsJSONWithNullFilter() throws Exception
    {
       JMSQueueControl queueControl = createManagementControl();

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/0eb1e332/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
index 3921cb1..9adc930 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
@@ -32,6 +32,8 @@ import org.apache.activemq.api.jms.management.JMSQueueControl;
 import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
 import org.apache.activemq.jms.client.ActiveMQConnectionFactory;
 import org.apache.activemq.jms.client.ActiveMQQueue;
+import org.junit.Ignore;
+import org.junit.Test;
 
 /**
  *
@@ -82,6 +84,15 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest
       super.tearDown();
    }
 
+   @Ignore
+   @Override
+   @Test
+   public void testListDeliveringMessages() throws Exception
+   {
+      // I'm not implementing the required proxy for this test on this JMS test
+   }
+
+
    @Override
    protected JMSQueueControl createManagementControl() throws Exception
    {
@@ -197,6 +208,30 @@ public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest
             return (String)proxy.invokeOperation("listMessageCounterHistory");
          }
 
+         @Override
+         public Map<String, Object>[] listScheduledMessages() throws Exception
+         {
+            return null;
+         }
+
+         @Override
+         public String listScheduledMessagesAsJSON() throws Exception
+         {
+            return null;
+         }
+
+         @Override
+         public Map<String, Map<String, Object>[]> listDeliveringMessages() throws Exception
+         {
+            return null;
+         }
+
+         @Override
+         public String listDeliveringMessagesAsJSON() throws Exception
+         {
+            return null;
+         }
+
          public String listMessageCounterHistoryAsHTML() throws Exception
          {
             return (String)proxy.invokeOperation("listMessageCounterHistoryAsHTML");