Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2100 address routing-type overridden on attaching AMQP sender 

An already existing address routing type should be taken
in consideration while chosing which routing type use when none
is configured
This commit is contained in:
Francesco Nigro 2018-10-24 15:45:53 +02:00 committed by Clebert Suconic
parent 64cce8ce1f
commit 1c17a4d59d
2 changed files with 127 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
View File

@ -19,11 +19,13 @@ package org.apache.activemq.artemis.protocol.amqp.proton;
import java.util.Arrays;
import java.util.List;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.security.CheckType;
import org.apache.activemq.artemis.core.security.SecurityAuth;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.apache.activemq.artemis.protocol.amqp.broker.AMQPSessionCallback;
import org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
@ -229,8 +231,15 @@ public class ProtonServerReceiverContext extends ProtonInitializable implements
}
}
}
return sessionSPI.getDefaultRoutingType(address);
final AddressInfo addressInfo = sessionSPI.getAddress(address);
if (addressInfo != null && !addressInfo.getRoutingTypes().isEmpty()) {
if (addressInfo.getRoutingTypes().size() == 1) {
return addressInfo.getRoutingType();
}
}
RoutingType defaultRoutingType = sessionSPI.getDefaultRoutingType(address);
defaultRoutingType = defaultRoutingType == null ? ActiveMQDefaultConfiguration.getDefaultRoutingType() : defaultRoutingType;
return defaultRoutingType;
}
/*

116
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java Normal file
View File

@ -0,0 +1,116 @@
/**
* 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.tests.integration.amqp;
import java.util.Map;
import java.util.UUID;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
import org.apache.activemq.transport.amqp.client.AmqpClient;
import org.apache.activemq.transport.amqp.client.AmqpConnection;
import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
import org.junit.Test;
public class AmqpSenderRoutingTypeTest extends JMSClientTestSupport {
@Override
protected void configureAddressPolicy(ActiveMQServer server) {
Configuration serverConfig = server.getConfiguration();
serverConfig.setJournalType(JournalType.NIO);
Map<String, AddressSettings> map = serverConfig.getAddressesSettings();
if (map.size() == 0) {
AddressSettings as = new AddressSettings();
as.setDefaultAddressRoutingType(RoutingType.ANYCAST);
map.put("#", as);
}
}
@Override
protected String getConfiguredProtocols() {
return "AMQP,CORE";
}
@Test
public void testAMQPSenderHonourRoutingTypeOfExistingAddress() throws Exception {
RoutingType routingType = server.getConfiguration().getAddressesSettings().get("#").getDefaultAddressRoutingType();
Assert.assertEquals(RoutingType.ANYCAST, routingType);
try (ActiveMQConnection coreConnection = (ActiveMQConnection) createCoreConnection();
ClientSession clientSession = coreConnection.getSessionFactory().createSession()) {
RoutingType addressRoutingType = RoutingType.MULTICAST;
SimpleString address = SimpleString.toSimpleString("myTopic_" + UUID.randomUUID().toString());
clientSession.createAddress(address, addressRoutingType, false);
ClientSession.AddressQuery addressQuery = clientSession.addressQuery(address);
Assert.assertTrue(addressQuery.isExists());
Assert.assertTrue(addressQuery.getQueueNames().isEmpty());
AmqpClient client = createAmqpClient(guestUser, guestPass);
AmqpConnection connection = addConnection(client.connect());
AmqpSession session = connection.createSession();
AmqpSender sender = session.createSender(address.toString());
try {
ClientSession.QueueQuery queueQuery = clientSession.queueQuery(address);
Assert.assertFalse(queueQuery.isExists());
Assert.assertEquals(addressRoutingType, queueQuery.getRoutingType());
} finally {
sender.close();
session.close();
connection.close();
}
}
}
@Test
public void testAMQPSenderCreateQueueWithDefaultRoutingTypeIfAddressDoNotExist() throws Exception {
RoutingType defaultRoutingType = server.getConfiguration().getAddressesSettings().get("#").getDefaultAddressRoutingType();
Assert.assertEquals(RoutingType.ANYCAST, defaultRoutingType);
try (ActiveMQConnection coreConnection = (ActiveMQConnection) createCoreConnection();
ClientSession clientSession = coreConnection.getSessionFactory().createSession()) {
SimpleString address = SimpleString.toSimpleString("myTopic_" + UUID.randomUUID().toString());
ClientSession.AddressQuery addressQuery = clientSession.addressQuery(address);
Assert.assertFalse(addressQuery.isExists());
Assert.assertTrue(addressQuery.getQueueNames().isEmpty());
AmqpClient client = createAmqpClient(guestUser, guestPass);
AmqpConnection connection = addConnection(client.connect());
AmqpSession session = connection.createSession();
AmqpSender sender = session.createSender(address.toString());
try {
addressQuery = clientSession.addressQuery(address);
Assert.assertTrue(addressQuery.isExists());
Assert.assertThat(addressQuery.getQueueNames(), CoreMatchers.hasItem(address));
ClientSession.QueueQuery queueQuery = clientSession.queueQuery(address);
Assert.assertTrue(queueQuery.isExists());
Assert.assertEquals(defaultRoutingType, queueQuery.getRoutingType());
} finally {
sender.close();
session.close();
connection.close();
}
}
}
}