You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/07/17 14:32:28 UTC
[2/2] activemq-artemis git commit: ARTEMIS-1290 QueueQuery add prefix
on address
ARTEMIS-1290 QueueQuery add prefix on address
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/44506f22
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/44506f22
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/44506f22
Branch: refs/heads/master
Commit: 44506f2258271953018a951e11c1c53588995d9f
Parents: 5b8e781
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Jul 14 10:20:45 2017 +0100
Committer: Justin Bertram <jb...@apache.org>
Committed: Mon Jul 17 10:31:20 2017 -0400
----------------------------------------------------------------------
.../artemis/core/server/QueueQueryResult.java | 4 +++
.../core/server/impl/ServerSessionImpl.java | 11 +++++++-
.../tests/integration/client/SessionTest.java | 28 ++++++++++++++++++--
3 files changed, 40 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/44506f22/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
index 3fd818d..cf88d62 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/QueueQueryResult.java
@@ -138,4 +138,8 @@ public class QueueQueryResult {
public int getMaxConsumers() {
return maxConsumers;
}
+
+ public void setAddress(SimpleString address) {
+ this.address = address;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/44506f22/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 8e557d3..bd8c395 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -728,7 +728,16 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
@Override
public QueueQueryResult executeQueueQuery(final SimpleString name) throws Exception {
- return server.queueQuery(removePrefix(name));
+ QueueQueryResult result = server.queueQuery(removePrefix(name));
+ if (prefixEnabled) {
+ for (Map.Entry<SimpleString, RoutingType> entry : prefixes.entrySet()) {
+ if (entry.getValue() == result.getRoutingType()) {
+ result.setAddress(entry.getKey().concat(result.getAddress()));
+ break;
+ }
+ }
+ }
+ return result;
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/44506f22/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
index 9954a4e..de2cc23 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionTest.java
@@ -21,7 +21,9 @@ import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.api.core.client.ClientConsumer;
import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientProducer;
@@ -32,6 +34,7 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryInternal;
import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
+import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
@@ -59,8 +62,11 @@ public class SessionTest extends ActiveMQTestBase {
public void setUp() throws Exception {
super.setUp();
- locator = createInVMNonHALocator();
- server = createServer(false);
+ locator = createNettyNonHALocator();
+ Configuration configuration = createDefaultNettyConfig();
+ configuration.addAcceptorConfiguration("prefixed", "tcp://localhost:61617?multicastPrefix=multicast://;anycastPrefix=anycast://");
+ server = createServer(configuration);
+ createServer(false);
server.start();
waitForServerToStart(server);
}
@@ -206,6 +212,24 @@ public class SessionTest extends ActiveMQTestBase {
clientSession.close();
}
+ @Test
+ public void testQueueQueryWithAddressPrefix() throws Exception {
+ String address = new String("testAddress");
+
+ cf = ActiveMQClient.createServerLocator("tcp://localhost:61617").createSessionFactory();
+ ClientSession clientSession = cf.createSession(false, true, true);
+
+ clientSession.createQueue(address, RoutingType.ANYCAST, queueName + "1", false);
+ clientSession.createQueue(address, RoutingType.MULTICAST, queueName + "2", false);
+
+ QueueQuery respA = clientSession.queueQuery(new SimpleString(queueName + "1"));
+ QueueQuery respM = clientSession.queueQuery(new SimpleString(queueName + "2"));
+
+ Assert.assertEquals(new SimpleString("anycast://" + address), respA.getAddress());
+ Assert.assertEquals(new SimpleString("multicast://" + address), respM.getAddress());
+ clientSession.close();
+ }
+
private void flushQueue() throws Exception {
Queue queue = server.locateQueue(SimpleString.toSimpleString(queueName));
assertNotNull(queue);