ARTEMIS-2141 Add Filter column to Consumers View of AdminUI

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',

artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java

@@ -58,6 +58,7 @@ public class ConsumerView extends ActiveMQAbstractView<ServerConsumer> {
          .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<ServerConsumer> {
             return consumer.getQueueName();
          case "queueType":
             return consumer.getQueueType();
+         case "filter":
+            return consumer.getFilterString();
          case "localAddress":
             return consumer.getConnectionLocalAddress();
          case "remoteAddress":

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<ServerConsumer> {
 
    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<ServerConsu
             return matches(consumer.getQueue().getAddress());
          case QUEUE:
             return matches(consumer.getQueue().getName());
+         case FILTER:
+            return matches(consumer.getFilterString());
          case PROTOCOL:
             return matches(server.getSessionByID(consumer.getSessionID()).getRemotingConnection().getProtocolName());
          case CLIENT_ID:

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConsumerInfo.java

@@ -27,12 +27,14 @@ public interface ConsumerInfo {
    /** @return name of the queue that is being consumed */
    SimpleString getQueueName();
 
-   /** @return name of the queue that is being consumed */
+   /** @return routing type of the queue that is being consumed */
    RoutingType getQueueType();
 
-   /** @return name of the queue that is being consumed */
+   /** @return address of the queue that is being consumed */
    SimpleString getQueueAddress();
 
+   SimpleString getFilterString();
+
    String getSessionName();
 
    String getConnectionClientID();

artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java

@@ -479,6 +479,11 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
       return filter;
    }
 
+   @Override
+   public SimpleString getFilterString() {
+      return filter == null ? null : filter.getFilterString();
+   }
+
    @Override
    public synchronized void close(final boolean failed) throws Exception {
 

tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DummyServerConsumer.java

@@ -194,6 +194,11 @@ public class DummyServerConsumer implements ServerConsumer {
       return null;
    }
 
+   @Override
+   public SimpleString getFilterString() {
+      return null;
+   }
+
    @Override
    public List<MessageReference> getDeliveringMessages() {
       return null;