This closes #2384
This commit is contained in:
commit
16bcdf90b5
|
@ -62,6 +62,11 @@ var ARTEMIS = (function(ARTEMIS) {
|
||||||
displayName: 'Queue Type',
|
displayName: 'Queue Type',
|
||||||
width: '*'
|
width: '*'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
field: 'filter',
|
||||||
|
displayName: 'Filter',
|
||||||
|
width: '*'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
field: 'address',
|
field: 'address',
|
||||||
displayName: 'Address',
|
displayName: 'Address',
|
||||||
|
|
|
@ -58,6 +58,7 @@ public class ConsumerView extends ActiveMQAbstractView<ServerConsumer> {
|
||||||
.add("protocol", toString(consumer.getConnectionProtocolName()))
|
.add("protocol", toString(consumer.getConnectionProtocolName()))
|
||||||
.add("queue", toString(consumer.getQueueName()))
|
.add("queue", toString(consumer.getQueueName()))
|
||||||
.add("queueType", toString(consumer.getQueueType()).toLowerCase())
|
.add("queueType", toString(consumer.getQueueType()).toLowerCase())
|
||||||
|
.add("filter", toString(consumer.getFilterString()))
|
||||||
.add("address", toString(consumer.getQueueAddress()))
|
.add("address", toString(consumer.getQueueAddress()))
|
||||||
.add("localAddress", toString(consumer.getConnectionLocalAddress()))
|
.add("localAddress", toString(consumer.getConnectionLocalAddress()))
|
||||||
.add("remoteAddress", toString(consumer.getConnectionRemoteAddress()))
|
.add("remoteAddress", toString(consumer.getConnectionRemoteAddress()))
|
||||||
|
@ -89,6 +90,8 @@ public class ConsumerView extends ActiveMQAbstractView<ServerConsumer> {
|
||||||
return consumer.getQueueName();
|
return consumer.getQueueName();
|
||||||
case "queueType":
|
case "queueType":
|
||||||
return consumer.getQueueType();
|
return consumer.getQueueType();
|
||||||
|
case "filter":
|
||||||
|
return consumer.getFilterString();
|
||||||
case "localAddress":
|
case "localAddress":
|
||||||
return consumer.getConnectionLocalAddress();
|
return consumer.getConnectionLocalAddress();
|
||||||
case "remoteAddress":
|
case "remoteAddress":
|
||||||
|
|
|
@ -22,7 +22,7 @@ import org.apache.activemq.artemis.core.server.ServerConsumer;
|
||||||
public class ConsumerFilterPredicate extends ActiveMQFilterPredicate<ServerConsumer> {
|
public class ConsumerFilterPredicate extends ActiveMQFilterPredicate<ServerConsumer> {
|
||||||
|
|
||||||
enum Field {
|
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;
|
private Field f;
|
||||||
|
@ -50,6 +50,8 @@ public class ConsumerFilterPredicate extends ActiveMQFilterPredicate<ServerConsu
|
||||||
return matches(consumer.getQueue().getAddress());
|
return matches(consumer.getQueue().getAddress());
|
||||||
case QUEUE:
|
case QUEUE:
|
||||||
return matches(consumer.getQueue().getName());
|
return matches(consumer.getQueue().getName());
|
||||||
|
case FILTER:
|
||||||
|
return matches(consumer.getFilterString());
|
||||||
case PROTOCOL:
|
case PROTOCOL:
|
||||||
return matches(server.getSessionByID(consumer.getSessionID()).getRemotingConnection().getProtocolName());
|
return matches(server.getSessionByID(consumer.getSessionID()).getRemotingConnection().getProtocolName());
|
||||||
case CLIENT_ID:
|
case CLIENT_ID:
|
||||||
|
|
|
@ -27,12 +27,14 @@ public interface ConsumerInfo {
|
||||||
/** @return name of the queue that is being consumed */
|
/** @return name of the queue that is being consumed */
|
||||||
SimpleString getQueueName();
|
SimpleString getQueueName();
|
||||||
|
|
||||||
/** @return name of the queue that is being consumed */
|
/** @return routing type of the queue that is being consumed */
|
||||||
RoutingType getQueueType();
|
RoutingType getQueueType();
|
||||||
|
|
||||||
/** @return name of the queue that is being consumed */
|
/** @return address of the queue that is being consumed */
|
||||||
SimpleString getQueueAddress();
|
SimpleString getQueueAddress();
|
||||||
|
|
||||||
|
SimpleString getFilterString();
|
||||||
|
|
||||||
String getSessionName();
|
String getSessionName();
|
||||||
|
|
||||||
String getConnectionClientID();
|
String getConnectionClientID();
|
||||||
|
|
|
@ -479,6 +479,11 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
|
||||||
return filter;
|
return filter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SimpleString getFilterString() {
|
||||||
|
return filter == null ? null : filter.getFilterString();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public synchronized void close(final boolean failed) throws Exception {
|
public synchronized void close(final boolean failed) throws Exception {
|
||||||
|
|
||||||
|
|
|
@ -194,6 +194,11 @@ public class DummyServerConsumer implements ServerConsumer {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SimpleString getFilterString() {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<MessageReference> getDeliveringMessages() {
|
public List<MessageReference> getDeliveringMessages() {
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue