You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by mi...@apache.org on 2018/10/29 20:41:46 UTC
[1/2] activemq-artemis git commit: This closes #2384
Repository: activemq-artemis
Updated Branches:
refs/heads/master 0630a1813 -> 16bcdf90b
This closes #2384
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/16bcdf90
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/16bcdf90
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/16bcdf90
Branch: refs/heads/master
Commit: 16bcdf90b5b8b557fc3ff2fe5a6a75970e53e4d1
Parents: 0630a18 d7aa9e5
Author: Michael Andre Pearce <mi...@me.com>
Authored: Mon Oct 29 20:42:05 2018 +0000
Committer: Michael Andre Pearce <mi...@me.com>
Committed: Mon Oct 29 20:42:05 2018 +0000
----------------------------------------------------------------------
.../artemis-plugin/src/main/webapp/plugin/js/consumers.js | 5 +++++
.../artemis/core/management/impl/view/ConsumerView.java | 3 +++
.../impl/view/predicate/ConsumerFilterPredicate.java | 4 +++-
.../org/apache/activemq/artemis/core/server/ConsumerInfo.java | 6 ++++--
.../activemq/artemis/core/server/impl/ServerConsumerImpl.java | 5 +++++
.../artemis/tests/integration/cli/DummyServerConsumer.java | 5 +++++
6 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-2141 Add Filter column to
Consumers View of AdminUI
Posted by mi...@apache.org.
ARTEMIS-2141 Add Filter column to Consumers View of AdminUI
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d7aa9e50
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d7aa9e50
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d7aa9e50
Branch: refs/heads/master
Commit: d7aa9e50773e21e4ce64b433b663681da63bef4b
Parents: 0630a18
Author: sebthom <se...@users.noreply.github.com>
Authored: Wed Oct 24 15:26:33 2018 +0200
Committer: Michael Andre Pearce <mi...@me.com>
Committed: Mon Oct 29 20:42:05 2018 +0000
----------------------------------------------------------------------
.../artemis-plugin/src/main/webapp/plugin/js/consumers.js | 5 +++++
.../artemis/core/management/impl/view/ConsumerView.java | 3 +++
.../impl/view/predicate/ConsumerFilterPredicate.java | 4 +++-
.../org/apache/activemq/artemis/core/server/ConsumerInfo.java | 6 ++++--
.../activemq/artemis/core/server/impl/ServerConsumerImpl.java | 5 +++++
.../artemis/tests/integration/cli/DummyServerConsumer.java | 5 +++++
6 files changed, 25 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d7aa9e50/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/consumers.js
----------------------------------------------------------------------
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 d4e5c63..515158a 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
@@ -63,6 +63,11 @@ var ARTEMIS = (function(ARTEMIS) {
width: '*'
},
{
+ field: 'filter',
+ displayName: 'Filter',
+ width: '*'
+ },
+ {
field: 'address',
displayName: 'Address',
width: '*',
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d7aa9e50/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ConsumerView.java
----------------------------------------------------------------------
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 52604a8..b29be09 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<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":
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d7aa9e50/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/predicate/ConsumerFilterPredicate.java
----------------------------------------------------------------------
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 cf1a59a..bd6af11 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<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:
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d7aa9e50/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConsumerInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConsumerInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConsumerInfo.java
index e2b8f2d..2364256 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ConsumerInfo.java
+++ b/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();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d7aa9e50/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index e38c22c..8fd91e5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -480,6 +480,11 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
}
@Override
+ public SimpleString getFilterString() {
+ return filter == null ? null : filter.getFilterString();
+ }
+
+ @Override
public synchronized void close(final boolean failed) throws Exception {
// Close should only ever be done once per consumer.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d7aa9e50/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DummyServerConsumer.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DummyServerConsumer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DummyServerConsumer.java
index dcf6d25..1b790a0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DummyServerConsumer.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/DummyServerConsumer.java
@@ -195,6 +195,11 @@ public class DummyServerConsumer implements ServerConsumer {
}
@Override
+ public SimpleString getFilterString() {
+ return null;
+ }
+
+ @Override
public List<MessageReference> getDeliveringMessages() {
return null;
}