Checkstyle + ArtemisTest fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/617a02b8 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/617a02b8 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/617a02b8 Branch: refs/heads/ARTEMIS-780 Commit: 617a02b804fa1483220b94174648976074be5b5b Parents: a980246 Author: jbertram <[email protected]> Authored: Mon Nov 28 15:30:48 2016 -0600 Committer: jbertram <[email protected]> Committed: Mon Nov 28 15:30:48 2016 -0600 ---------------------------------------------------------------------- .../apache/activemq/artemis/cli/commands/Create.java | 8 ++++---- .../apache/activemq/artemis/cli/commands/etc/broker.xml | 12 ++++++------ .../impl/wireformat/CreateSharedQueueMessage_V2.java | 1 - .../artemis/jms/server/impl/JMSServerManagerImpl.java | 2 +- .../artemis/junit/ActiveMQConsumerResource.java | 4 ---- .../artemis/core/server/impl/ActiveMQServerImpl.java | 4 ++-- .../activemq/artemis/core/server/impl/AddressInfo.java | 1 - .../tests/integration/server/PredefinedQueueTest.java | 1 - 8 files changed, 13 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index ae2734c..d13b225 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -783,14 +783,14 @@ public class Create extends InputAbstract { printWriter.println(); for (String str : getQueueList()) { - printWriter.println(" <address name=\"" + str + "\" type=\"anycast\">"); - printWriter.println(" <queues>"); + printWriter.println(" <address name=\"" + str + "\">"); + printWriter.println(" <anycast>"); printWriter.println(" <queue name=\"" + str + "\" />"); - printWriter.println(" </queues>"); + printWriter.println(" </anycast>"); printWriter.println(" </address>"); } for (String str : getAddressList()) { - printWriter.println(" <address name=\"" + str + "\" type=\"multicast\"/>"); + printWriter.println(" <address name=\"" + str + "\"/>"); } filters.put("${address-queue.settings}", writer.toString()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml ---------------------------------------------------------------------- diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml index 3b67a09..d86637d 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml @@ -97,15 +97,15 @@ ${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st </address-settings> <addresses> - <address name="DLQ" type="anycast"> - <queues> + <address name="DLQ"> + <anycast> <queue name="DLQ" /> - </queues> + </anycast> </address> - <address name="ExpiryQueue" type="anycast"> - <queues> + <address name="ExpiryQueue"> + <anycast> <queue name="ExpiryQueue" /> - </queues> + </anycast> </address>${address-queue.settings} </addresses> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java index 7c45ca7..40b9cb5 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java @@ -18,7 +18,6 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl; import org.apache.activemq.artemis.core.server.RoutingType; public class CreateSharedQueueMessage_V2 extends CreateSharedQueueMessage { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java index ee405fc..8532a92 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java @@ -464,7 +464,7 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback final String... bindings) throws Exception { return internalCreateJMSQueue(storeConfig, queueName, selectorString, durable, false, bindings); } -tt + protected boolean internalCreateJMSQueue(final boolean storeConfig, final String queueName, final String selectorString, http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java ---------------------------------------------------------------------- diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java index 8b09827..bab092d 100644 --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java @@ -16,16 +16,12 @@ */ package org.apache.activemq.artemis.junit; -import java.util.Collections; -import java.util.HashSet; - import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.SimpleString; 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.ServerLocator; import org.apache.activemq.artemis.core.server.RoutingType; -import org.apache.activemq.artemis.core.server.impl.AddressInfo; /** * A JUnit Rule that embeds an ActiveMQ Artemis ClientConsumer into a test. http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 5f60429..ccc0b89 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -109,7 +109,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServerLogger; import org.apache.activemq.artemis.core.server.Bindable; import org.apache.activemq.artemis.core.server.BindingQueryResult; -import org.apache.activemq.artemis.core.server.RoutingType; import org.apache.activemq.artemis.core.server.Divert; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.server.LargeServerMessage; @@ -121,6 +120,7 @@ import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.QueueConfig; import org.apache.activemq.artemis.core.server.QueueFactory; import org.apache.activemq.artemis.core.server.QueueQueryResult; +import org.apache.activemq.artemis.core.server.RoutingType; import org.apache.activemq.artemis.core.server.SecuritySettingPlugin; import org.apache.activemq.artemis.core.server.ServerSession; import org.apache.activemq.artemis.core.server.ServiceRegistry; @@ -1407,7 +1407,7 @@ public class ActiveMQServerImpl implements ActiveMQServer { final SimpleString filterString, final boolean durable, final boolean temporary) throws Exception { - return createQueue(address, ActiveMQDefaultConfiguration.getDefaultRoutingType(), queueName, filterString, durable, temporary); + return createQueue(address, ActiveMQDefaultConfiguration.getDefaultRoutingType(), queueName, filterString, durable, temporary); } @Override http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java index 64d6dd5..7816cde 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.artemis.core.server.impl; -import java.util.Collections; import java.util.HashSet; import java.util.Set; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/617a02b8/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java index 93eec9c..0df3846 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java @@ -33,7 +33,6 @@ import org.apache.activemq.artemis.core.config.CoreQueueConfiguration; import org.apache.activemq.artemis.core.postoffice.Bindings; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; -import org.apache.activemq.artemis.core.server.RoutingType; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert;
