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

NO-JIRA Check Style Fix

This commit is contained in:
Martyn Taylor 2016-12-16 15:16:02 +00:00
parent 343cdefbd9
commit e29b3913ac
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -1541,7 +1541,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
} }
@Override @Override
public Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, public Queue createQueue(SimpleString address,
RoutingType routingType,
SimpleString queueName,
SimpleString filter,
SimpleString user, SimpleString user,
boolean durable, boolean durable,
boolean temporary, boolean temporary,
@ -1561,13 +1564,14 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final boolean temporary, final boolean temporary,
final boolean autoCreated) throws Exception { final boolean autoCreated) throws Exception {
AddressSettings as = getAddressSettingsRepository().getMatch(address.toString()); AddressSettings as = getAddressSettingsRepository().getMatch(address.toString());
return createQueue(address, routingType, queueName, filterString, user, durable, temporary, autoCreated, return createQueue(address, routingType, queueName, filterString, user, durable, temporary, autoCreated, as.getDefaultMaxConsumers(), as.isDefaultDeleteOnNoConsumers(), as.isAutoCreateAddresses());
as.getDefaultMaxConsumers(),
as.isDefaultDeleteOnNoConsumers(), as.isAutoCreateAddresses());
} }
@Override @Override
public Queue createQueue(SimpleString address, RoutingType routingType, SimpleString queueName, SimpleString filter, public Queue createQueue(SimpleString address,
RoutingType routingType,
SimpleString queueName,
SimpleString filter,
SimpleString user, SimpleString user,
boolean durable, boolean durable,
boolean temporary, boolean temporary,
@ -1598,19 +1602,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
} }
} }
final Queue queue = createQueue(address, final Queue queue = createQueue(address, name, routingType, filterString, user, durable, !durable, true, !durable, false, Queue.MAX_CONSUMERS_UNLIMITED, false, true);
name,
routingType,
filterString,
user,
durable,
!durable,
true,
!durable,
false,
Queue.MAX_CONSUMERS_UNLIMITED,
false,
true);
if (!queue.getAddress().equals(address)) { if (!queue.getAddress().equals(address)) {
throw ActiveMQMessageBundle.BUNDLE.queueSubscriptionBelongsToDifferentAddress(name); throw ActiveMQMessageBundle.BUNDLE.queueSubscriptionBelongsToDifferentAddress(name);
@ -2466,8 +2458,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
} }
@Override @Override
public void removeAddressInfo(final SimpleString address, public void removeAddressInfo(final SimpleString address, final SecurityAuth session) throws Exception {
final SecurityAuth session) throws Exception {
if (session != null) { if (session != null) {
securityStore.check(address, CheckType.DELETE_ADDRESS, session); securityStore.check(address, CheckType.DELETE_ADDRESS, session);
} }
@ -2535,8 +2526,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
if (info == null) { if (info == null) {
final AddressInfo addressInfo = new AddressInfo(addressName, rt); final AddressInfo addressInfo = new AddressInfo(addressName, rt);
createAddressInfo(addressInfo); createAddressInfo(addressInfo);
} } else if (!info.getRoutingTypes().contains(routingType)) {
else if (!info.getRoutingTypes().contains(routingType)) {
Set<RoutingType> routingTypes = new HashSet<>(); Set<RoutingType> routingTypes = new HashSet<>();
routingTypes.addAll(info.getRoutingTypes()); routingTypes.addAll(info.getRoutingTypes());
routingTypes.add(routingType); routingTypes.add(routingType);

3
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java
View File

@ -18,16 +18,15 @@ package org.apache.activemq.artemis.tests.integration.cli;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.PrintStream; import java.io.PrintStream;
import java.text.MessageFormat;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.cli.commands.AbstractAction;
import org.apache.activemq.artemis.cli.commands.ActionContext; import org.apache.activemq.artemis.cli.commands.ActionContext;
import org.apache.activemq.artemis.cli.commands.queue.CreateQueue; import org.apache.activemq.artemis.cli.commands.queue.CreateQueue;
import org.apache.activemq.artemis.cli.commands.queue.DeleteQueue; import org.apache.activemq.artemis.cli.commands.queue.DeleteQueue;
import org.apache.activemq.artemis.cli.commands.AbstractAction;
import org.apache.activemq.artemis.cli.commands.queue.UpdateQueue; import org.apache.activemq.artemis.cli.commands.queue.UpdateQueue;
import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.QueueQueryResult; import org.apache.activemq.artemis.core.server.QueueQueryResult;