diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java index e8ec158dae..97dab61593 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java @@ -280,11 +280,21 @@ public ObjectName[] getTopics() { return safeGetBroker().getTopicsNonSuppressed(); } + @Override + public int getTotalTopicsCount() { + return getTopics().length; + } + @Override public ObjectName[] getQueues() { return safeGetBroker().getQueuesNonSuppressed(); } + @Override + public int getTotalQueuesCount() { + return getQueues().length; + } + @Override public String queryQueues(String filter, int page, int pageSize) throws IOException { return DestinationsViewFilter.create(filter) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java index 7584a71734..08a6d19317 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java @@ -179,9 +179,17 @@ public interface BrokerViewMBean extends Service { @MBeanInfo("Topics (broadcasted 'queues'); generally system information.") ObjectName[] getTopics(); + @MBeanInfo("Total number of topics") + int getTotalTopicsCount(); + + @MBeanInfo("Standard Queues containing AIE messages.") ObjectName[] getQueues(); + @MBeanInfo("Total number of queues") + int getTotalQueuesCount(); + + /** * Queue Query API, take a look at {@link DestinationsViewFilter} for more information */ diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java new file mode 100644 index 0000000000..a999009596 --- /dev/null +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/jmx/BrokerViewTest.java @@ -0,0 +1,47 @@ +package org.apache.activemq.broker.jmx; + +import jakarta.jms.*; +import jakarta.jms.Connection; +import org.apache.activemq.*; +import org.apache.activemq.broker.*; +import org.apache.activemq.util.*; +import org.junit.*; + +import static org.junit.Assert.assertTrue; + +public class BrokerViewTest { + protected BrokerService brokerService; + protected ActiveMQConnectionFactory factory; + protected Connection producerConnection; + + protected Session producerSession; + protected MessageConsumer consumer; + protected MessageProducer producer; + protected Queue queue; + + @Before + public void setUp() throws Exception { + brokerService = new BrokerService(); + brokerService.setPersistent(false); + brokerService.start(); + + factory = new ActiveMQConnectionFactory(BrokerRegistry.getInstance().findFirst().getVmConnectorURI()); + producerConnection = factory.createConnection(); + producerConnection.start(); + producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE); + Queue queue = producerSession.createQueue("testQueue"); + producer = producerSession.createProducer(queue); + producer.send(producerSession.createTextMessage("testMessage")); + } + + @Test(timeout=120000) + public void testBrokerViewRetrieveTotalQueuesAndTopicsCount() throws Exception { + assertTrue(Wait.waitFor(() -> (brokerService.getAdminView()) != null)); + + final BrokerView view = brokerService.getAdminView(); + // The total number of advisory topics + assert(view.getTotalTopicsCount() == 4); + // The queue created in setup + assert(view.getTotalQueuesCount() == 1); + } +}