diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js index d4e5c63274..515158a2e3 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js @@ -62,6 +62,11 @@ var ARTEMIS = (function(ARTEMIS) { displayName: 'Queue Type', width: '*' }, + { + field: 'filter', + displayName: 'Filter', + width: '*' + }, { field: 'address', displayName: 'Address', diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java index 52604a8dcd..b29be0992f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java @@ -58,6 +58,7 @@ public class ConsumerView extends ActiveMQAbstractView { .add("protocol", toString(consumer.getConnectionProtocolName())) .add("queue", toString(consumer.getQueueName())) .add("queueType", toString(consumer.getQueueType()).toLowerCase()) + .add("filter", toString(consumer.getFilterString())) .add("address", toString(consumer.getQueueAddress())) .add("localAddress", toString(consumer.getConnectionLocalAddress())) .add("remoteAddress", toString(consumer.getConnectionRemoteAddress())) @@ -89,6 +90,8 @@ public class ConsumerView extends ActiveMQAbstractView { return consumer.getQueueName(); case "queueType": return consumer.getQueueType(); + case "filter": + return consumer.getFilterString(); case "localAddress": return consumer.getConnectionLocalAddress(); case "remoteAddress": diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java index cf1a59aa20..bd6af11d71 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java @@ -22,7 +22,7 @@ import org.apache.activemq.artemis.core.server.ServerConsumer; public class ConsumerFilterPredicate extends ActiveMQFilterPredicate { enum Field { - ID, SESSION_ID, QUEUE, ADDRESS, USER, PROTOCOL, CLIENT_ID, LOCAL_ADDRESS, REMOTE_ADDRESS + ID, SESSION_ID, QUEUE, FILTER, ADDRESS, USER, PROTOCOL, CLIENT_ID, LOCAL_ADDRESS, REMOTE_ADDRESS } private Field f; @@ -50,6 +50,8 @@ public class ConsumerFilterPredicate extends ActiveMQFilterPredicate getDeliveringMessages() { return null;