This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 93eaeadf92 ARTEMIS-5997 refactor SimpleAddressManager.getMatchingQueue
93eaeadf92 is described below
commit 93eaeadf925f2bea8c7bb0f8d6d86a9e3269ac32
Author: Justin Bertram <[email protected]>
AuthorDate: Fri Apr 10 10:26:27 2026 -0500
ARTEMIS-5997 refactor SimpleAddressManager.getMatchingQueue
The getMatchingQueue method on SimpleAddressManager is overloaded, but
only one of them is actually necessary. The three-parameter version is
only used once and the method that uses it has already performed all
the same work.
Furthermore, the two-parameter version doesn't actually check the
routing-type and the first if statement omits the wild check.
This commit:
- Removes the unnecessary version of getMatchingQueue
- Adds missing checks to the remaining getMatchingQueue
- Adds JavaDoc
- Adds tests
---
.../protocol/amqp/broker/AMQPSessionCallback.java | 6 -
.../amqp/proton/DefaultSenderController.java | 2 +-
artemis-server/pom.xml | 6 +
.../artemis/core/postoffice/AddressManager.java | 2 -
.../artemis/core/postoffice/PostOffice.java | 2 -
.../core/postoffice/impl/PostOfficeImpl.java | 7 -
.../core/postoffice/impl/SimpleAddressManager.java | 59 ++++----
.../postoffice/impl/WildcardAddressManager.java | 6 -
.../artemis/core/server/ServerSession.java | 4 -
.../core/server/impl/ServerSessionImpl.java | 9 +-
.../impl/AddressManagerGetMatchingQueueTest.java | 165 +++++++++++++++++++++
.../core/server/impl/fakes/FakePostOffice.java | 5 -
.../impl/WildcardAddressManagerUnitTest.java | 24 +--
13 files changed, 220 insertions(+), 77 deletions(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 3b1a9b73e9..7df943e09a 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -832,12 +832,6 @@ public class AMQPSessionCallback implements
SessionCallback {
return serverSession.getMatchingQueue(address, routingType);
}
- public SimpleString getMatchingQueue(SimpleString address,
- SimpleString queueName,
- RoutingType routingType) throws
Exception {
- return serverSession.getMatchingQueue(address, queueName, routingType);
- }
-
public AddressInfo getAddress(SimpleString address) {
return serverSession.getAddress(address);
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/DefaultSenderController.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/DefaultSenderController.java
index 514f59e722..332036afae 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/DefaultSenderController.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/DefaultSenderController.java
@@ -527,7 +527,7 @@ public class DefaultSenderController implements
SenderController {
throw new ActiveMQIllegalStateException("Queue: " + queueName +
" filter mismatch [" + filter + "] is different than existing filter [" +
result.getFilterString() + "]");
}
- return sessionSPI.getMatchingQueue(address, queueName,
routingType);
+ return queueName;
}
}
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 789c4f28da..3b2d5d2184 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -290,6 +290,12 @@
<artifactId>mockserver-client-java</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
index 2e4cf5d9e4..95add5d981 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
@@ -51,8 +51,6 @@ public interface AddressManager {
SimpleString getMatchingQueue(SimpleString address, RoutingType
routingType) throws Exception;
- SimpleString getMatchingQueue(SimpleString address, SimpleString queueName,
RoutingType routingType) throws Exception;
-
LocalQueueBinding findLocalBinding(long id);
void clear();
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
index 4ebd7a3cd9..f8ecb42f0d 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
@@ -149,8 +149,6 @@ public interface PostOffice extends ActiveMQComponent {
SimpleString getMatchingQueue(SimpleString address, RoutingType
routingType) throws Exception;
- SimpleString getMatchingQueue(SimpleString address, SimpleString queueName,
RoutingType routingType) throws Exception;
-
RoutingStatus route(Message message, boolean direct) throws Exception;
RoutingStatus route(Message message,
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index 8d629689f9..86275ac2ad 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -1538,13 +1538,6 @@ public class PostOfficeImpl implements PostOffice,
NotificationListener, Binding
return addressManager.getMatchingQueue(address, routingType);
}
- @Override
- public SimpleString getMatchingQueue(SimpleString address,
- SimpleString queueName,
- RoutingType routingType) throws
Exception {
- return addressManager.getMatchingQueue(address, queueName, routingType);
- }
-
@Override
public void sendQueueInfoToQueue(final SimpleString queueName, final
SimpleString address) throws Exception {
// We send direct to the queue so we can send it to the same queue that
is bound to the notifications address -
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
index 2a595a930f..a243119e9a 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
@@ -75,17 +75,12 @@ public class SimpleAddressManager implements AddressManager
{
protected final WildcardConfiguration wildcardConfiguration;
- public SimpleAddressManager(final BindingsFactory bindingsFactory, final
StorageManager storageManager,
- final MetricsManager metricsManager) {
- this(bindingsFactory, new WildcardConfiguration(), storageManager,
metricsManager);
- }
-
public SimpleAddressManager(final BindingsFactory bindingsFactory,
final WildcardConfiguration
wildcardConfiguration,
final StorageManager storageManager,
final MetricsManager metricsManager) {
- this.wildcardConfiguration = wildcardConfiguration;
this.bindingsFactory = bindingsFactory;
+ this.wildcardConfiguration = wildcardConfiguration;
this.storageManager = storageManager;
this.metricsManager = metricsManager;
}
@@ -190,37 +185,49 @@ public class SimpleAddressManager implements
AddressManager {
return Collections.unmodifiableCollection(outputList);
}
+ /**
+ * This method looks at the local queue bindings of an address to find one
with a matching routing type that also is
+ * not wild. A match with the same name as the input address is preferred.
+ * <p>
+ * If a match is found, the unique name of the corresponding binding is
returned. If no match is found, the method
+ * returns {@code null}.
+ *
+ * @param address the address to match against
+ * @param routingType the routing type to use for matching the binding
+ * @return the unique name of the matching binding, or {@code null} if no
match is found
+ * @throws Exception if an error occurs while attempting to find a matching
binding
+ */
@Override
public SimpleString getMatchingQueue(final SimpleString address,
RoutingType routingType) throws Exception {
SimpleString realAddress = CompositeAddress.extractAddressName(address);
- Binding binding = getBinding(realAddress);
- if (binding == null || !(binding instanceof LocalQueueBinding) ||
!binding.getAddress().equals(realAddress)) {
- Bindings bindings = mappings.get(realAddress);
- if (bindings != null) {
- for (Binding theBinding : bindings.getBindings()) {
- if (theBinding instanceof LocalQueueBinding &&
!wildcardConfiguration.isWild(theBinding.getUniqueName())) {
- binding = theBinding;
- break;
- }
+ Binding potentialMatch = getBinding(realAddress);
+ if (checkBindingForMatch(potentialMatch, realAddress, routingType)) {
+ // a local queue binding with the same name as the input address is
preferred
+ return potentialMatch.getUniqueName();
+ }
+
+ Bindings bindings = mappings.get(realAddress);
+ if (bindings != null) {
+ for (Binding b : bindings.getBindings()) {
+ if (checkBindingForMatch(b, realAddress, routingType)) {
+ return b.getUniqueName();
}
}
}
- return binding != null ? binding.getUniqueName() : null;
+ return null;
}
- @Override
- public SimpleString getMatchingQueue(final SimpleString address,
- final SimpleString queueName,
- RoutingType routingType) throws
Exception {
- SimpleString realAddress = CompositeAddress.extractAddressName(address);
- Binding binding = getBinding(queueName);
-
- if (binding != null && !binding.getAddress().equals(realAddress) &&
!realAddress.toString().isEmpty()) {
- throw new IllegalStateException("queue belongs to address" +
binding.getAddress());
+ private boolean checkBindingForMatch(Binding binding, SimpleString address,
RoutingType routingType) {
+ if (binding != null &&
+ binding instanceof LocalQueueBinding lqb &&
+ lqb.getAddress().equals(address) &&
+ lqb.getQueue().getRoutingType() == routingType &&
+ !wildcardConfiguration.isWild(binding.getUniqueName())) {
+ return true;
}
- return binding != null ? binding.getUniqueName() : null;
+ return false;
}
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
index d4797bc8e5..7a3ab89dde 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/WildcardAddressManager.java
@@ -41,12 +41,6 @@ public class WildcardAddressManager extends
SimpleAddressManager {
super(bindingsFactory, wildcardConfiguration, storageManager,
metricsManager);
}
- public WildcardAddressManager(final BindingsFactory bindingsFactory,
- final StorageManager storageManager,
- final MetricsManager metricsManager) {
- super(bindingsFactory, storageManager, metricsManager);
- }
-
// publish, may be a new address that needs wildcard bindings added
// won't contain a wildcard because we don't ever route to a wildcards at
this time
@Override
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
index ec66ec2e7a..623494986e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
@@ -497,10 +497,6 @@ public interface ServerSession extends SecurityAuth {
SimpleString getMatchingQueue(SimpleString address, RoutingType
routingType) throws Exception;
- SimpleString getMatchingQueue(SimpleString address,
- SimpleString queueName,
- RoutingType routingType) throws Exception;
-
AddressInfo getAddress(SimpleString address);
/**
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 4ec39ed1bf..4a46113cef 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
@@ -1935,7 +1935,7 @@ public class ServerSessionImpl extends
CriticalComponentImpl implements ServerSe
Queue q = server.locateQueue(unPrefixedQueue);
if (q == null) {
// The queue doesn't exist.
- if (!queueConfig.isFqqn() &&
server.getPostOffice().getMatchingQueue(unPrefixedAddress,
queueConfig.getRoutingType()) != null) {
+ if (!queueConfig.isFqqn() && getMatchingQueue(unPrefixedAddress,
queueConfig.getRoutingType()) != null) {
// The address has a local, non-wildcard queue with a different
name, which is fine. Just ignore it.
result = AutoCreateResult.EXISTED;
} else if (addressSettings.isAutoCreateQueues() ||
queueConfig.isTemporary()) {
@@ -2226,13 +2226,6 @@ public class ServerSessionImpl extends
CriticalComponentImpl implements ServerSe
return server.getPostOffice().getMatchingQueue(address, routingType);
}
- @Override
- public SimpleString getMatchingQueue(SimpleString address,
- SimpleString queueName,
- RoutingType routingType) throws
Exception {
- return server.getPostOffice().getMatchingQueue(address, queueName,
routingType);
- }
-
@Override
public AddressInfo getAddress(SimpleString address) {
return server.getPostOffice().getAddressInfo(removePrefix(address));
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/postoffice/impl/AddressManagerGetMatchingQueueTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/postoffice/impl/AddressManagerGetMatchingQueueTest.java
new file mode 100644
index 0000000000..e823418e69
--- /dev/null
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/postoffice/impl/AddressManagerGetMatchingQueueTest.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.core.postoffice.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.WildcardConfiguration;
+import org.apache.activemq.artemis.core.postoffice.Binding;
+import org.apache.activemq.artemis.core.postoffice.Bindings;
+import org.apache.activemq.artemis.core.postoffice.BindingsFactory;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.junit.jupiter.api.Test;
+
+import static
org.apache.activemq.artemis.utils.RandomUtil.randomUUIDSimpleString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class AddressManagerGetMatchingQueueTest {
+
+ @Test
+ public void testCorrectNameCorrectRoutingTypeSingleQueue() throws Exception
{
+ SimpleString addressName = SimpleString.of("myAddress");
+ SimpleString queueName = randomUUIDSimpleString();
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(addressName, queueName,
RoutingType.ANYCAST));
+
+ assertEquals(queueName, am.getMatchingQueue(addressName,
RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testCorrectNameCorrectRoutingTypeMultipleQueues() throws
Exception {
+ SimpleString addressName = SimpleString.of("myAddress");
+ SimpleString queueName1 = randomUUIDSimpleString();
+ SimpleString queueName2 = randomUUIDSimpleString();
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(addressName, queueName1,
RoutingType.ANYCAST));
+ am.addBinding(getLocalQueueBinding(addressName, queueName2,
RoutingType.ANYCAST));
+
+ assertThat(am.getMatchingQueue(addressName, RoutingType.ANYCAST),
anyOf(is(queueName1), is(queueName2)));
+ }
+
+ @Test
+ public void
testCorrectNameCorrectRoutingTypeMultipleQueuesMixedRoutingTypes() throws
Exception {
+ SimpleString addressName = SimpleString.of("myAddress");
+ SimpleString queueName1 = randomUUIDSimpleString();
+ SimpleString queueName2 = randomUUIDSimpleString();
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(addressName, queueName1,
RoutingType.ANYCAST));
+ am.addBinding(getLocalQueueBinding(addressName, queueName2,
RoutingType.MULTICAST));
+
+ assertEquals(queueName1, am.getMatchingQueue(addressName,
RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testCorrectNameIncorrectRoutingTypeSingleQueue() throws
Exception {
+ SimpleString addressName = SimpleString.of("myAddress");
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(addressName, RoutingType.MULTICAST));
+
+ assertNull(am.getMatchingQueue(addressName, RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testCorrectNameIncorrectRoutingTypeMultipleQueues() throws
Exception {
+ SimpleString addressName = SimpleString.of("myAddress");
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(addressName, RoutingType.MULTICAST));
+ am.addBinding(getLocalQueueBinding(addressName, RoutingType.MULTICAST));
+
+ assertNull(am.getMatchingQueue(addressName, RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testIncorrectNameCorrectRoutingTypeSingleQueue() throws
Exception {
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+
+ assertNull(am.getMatchingQueue(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testIncorrectNameCorrectRoutingTypeMultipleQueues() throws
Exception {
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+ am.addBinding(getLocalQueueBinding(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+
+ assertNull(am.getMatchingQueue(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testIncorrectNameIncorrectRoutingTypeSingleQueue() throws
Exception {
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(randomUUIDSimpleString(),
RoutingType.MULTICAST));
+
+ assertNull(am.getMatchingQueue(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+ }
+
+ @Test
+ public void testIncorrectNameIncorrectRoutingTypeMultipleQueues() throws
Exception {
+ SimpleAddressManager am = getSimpleAddressManager();
+ am.addBinding(getLocalQueueBinding(randomUUIDSimpleString(),
RoutingType.MULTICAST));
+ am.addBinding(getLocalQueueBinding(randomUUIDSimpleString(),
RoutingType.MULTICAST));
+
+ assertNull(am.getMatchingQueue(randomUUIDSimpleString(),
RoutingType.ANYCAST));
+ }
+
+ private static SimpleAddressManager getSimpleAddressManager() throws
Exception {
+ return new SimpleAddressManager(getBindingsFactory(), new
WildcardConfiguration(), null, null);
+ }
+
+ private static LocalQueueBinding getLocalQueueBinding(SimpleString
addressName, RoutingType routingType) {
+ return getLocalQueueBinding(addressName, randomUUIDSimpleString(),
routingType);
+ }
+
+ private static LocalQueueBinding getLocalQueueBinding(SimpleString
addressName, SimpleString queueName, RoutingType routingType) {
+ return new LocalQueueBinding(addressName, getQueue(queueName,
routingType), randomUUIDSimpleString());
+ }
+
+ private static BindingsFactory getBindingsFactory() throws Exception {
+ List<Binding> bindingsList = new ArrayList<>();
+ Bindings bindings = mock(Bindings.class);
+ doAnswer(invocation -> {
+ bindingsList.add(invocation.getArgument(0));
+ return null;
+ }).when(bindings).addBinding(any(Binding.class));
+ when(bindings.getBindings()).thenReturn(bindingsList);
+
+ BindingsFactory bindingsFactory = mock(BindingsFactory.class);
+
when(bindingsFactory.createBindings(any(SimpleString.class))).thenReturn(bindings);
+ return bindingsFactory;
+ }
+
+ private static Queue getQueue(SimpleString queueName, RoutingType anycast) {
+ Queue q = mock(Queue.class);
+ when(q.getName()).thenReturn(queueName);
+ when(q.getID()).thenReturn(1L);
+ when(q.getRoutingType()).thenReturn(anycast);
+ return q;
+ }
+}
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
index 926aea830e..66e7a36389 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
@@ -116,11 +116,6 @@ public class FakePostOffice implements PostOffice {
return null;
}
- @Override
- public SimpleString getMatchingQueue(SimpleString address, SimpleString
queueName, RoutingType routingType) {
- return null;
- }
-
@Override
public void start() throws Exception {
diff --git
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
index 4fa43935c0..63f78dcbcc 100644
---
a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
+++
b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/WildcardAddressManagerUnitTest.java
@@ -67,7 +67,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testUnitOnWildCardFailingScenario() throws Exception {
int errors = 0;
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addBinding(new BindingFake("Topic1", "Topic1"));
ad.addBinding(new BindingFake("Topic1", "one"));
ad.addBinding(new BindingFake("*", "two"));
@@ -95,7 +95,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testUnitOnWildCardFailingScenarioFQQN() throws Exception {
int errors = 0;
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addBinding(new BindingFake("Topic1", "Topic1"));
ad.addBinding(new BindingFake("Topic1", "one"));
ad.addBinding(new BindingFake("*", "two"));
@@ -126,7 +126,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testWildCardAddressRemoval() throws Exception {
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addAddressInfo(new AddressInfo(SimpleString.of("Queue1.#"),
RoutingType.ANYCAST));
ad.addAddressInfo(new AddressInfo(SimpleString.of("Topic1.#"),
RoutingType.MULTICAST));
ad.addBinding(new BindingFake("Topic1.#", "two"));
@@ -145,7 +145,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testWildCardAddressRemovalNoExplicitBindings() throws Exception
{
final SimpleString address = SimpleString.of(getName());
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
// add a wildcard address & binding
ad.addAddressInfo(new AddressInfo(SimpleString.of("#"),
RoutingType.MULTICAST));
@@ -168,7 +168,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testWildCardAddRemoveBinding() throws Exception {
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
SimpleString address = SimpleString.of("Queue1.1");
ad.addAddressInfo(new AddressInfo(SimpleString.of("Queue1.#"),
RoutingType.ANYCAST));
@@ -187,7 +187,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testWildCardAddAlreadyExistingBindingShouldThrowException()
throws Exception {
assertThrows(ActiveMQQueueExistsException.class, () -> {
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addAddressInfo(new AddressInfo(SimpleString.of("Queue1.#"),
RoutingType.ANYCAST));
ad.addBinding(new BindingFake("Queue1.#", "one"));
ad.addBinding(new BindingFake("Queue1.#", "one"));
@@ -256,7 +256,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testSingleWordWildCardAddressBindingsForRouting() throws
Exception {
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addAddressInfo(new AddressInfo(SimpleString.of("news.*"),
RoutingType.MULTICAST));
ad.addAddressInfo(new AddressInfo(SimpleString.of("news.*.sport"),
RoutingType.MULTICAST));
ad.addBinding(new BindingFake("news.*", "one"));
@@ -279,7 +279,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testAnyWordsWildCardAddressBindingsForRouting() throws
Exception {
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addAddressInfo(new AddressInfo(SimpleString.of("news.europe.#"),
RoutingType.MULTICAST));
ad.addBinding(new BindingFake("news.europe.#", "one"));
@@ -292,7 +292,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testAnyWordsMultipleWildCardsAddressBindingsForRouting() throws
Exception {
- WildcardAddressManager ad = new WildcardAddressManager(new
BindingFactoryFake(), null, null);
+ WildcardAddressManager ad = getTestWildcardAddressManager();
ad.addAddressInfo(new AddressInfo(SimpleString.of("news.#"),
RoutingType.MULTICAST));
ad.addAddressInfo(new AddressInfo(SimpleString.of("news.europe.#"),
RoutingType.MULTICAST));
ad.addBinding(new BindingFake("news.#", "one"));
@@ -308,6 +308,10 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
assertNull(ad.getBindingsForRoutingAddress(SimpleString.of("europe")));
}
+ private static WildcardAddressManager getTestWildcardAddressManager() {
+ return new WildcardAddressManager(new BindingFactoryFake(), new
WildcardConfiguration(), null, null);
+ }
+
@Test
public void testNumberOfBindingsThatMatch() throws Exception {
@@ -411,7 +415,7 @@ public class WildcardAddressManagerUnitTest extends
ActiveMQTestBase {
@Test
public void testConcurrentCalls2() throws Exception {
- WildcardAddressManager simpleAddressManager = new
WildcardAddressManager(new BindingFactoryFake(), new NullStorageManager(),
null);
+ WildcardAddressManager simpleAddressManager = new
WildcardAddressManager(new BindingFactoryFake(), new WildcardConfiguration(),
new NullStorageManager(), null);
final int threads = 20;
final int adds = 1_000;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
