activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject activemq-artemis git commit: NO-JIRA Check Style Fix
Date Fri, 16 Dec 2016 15:17:20 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 343cdefbd -> e29b3913a


NO-JIRA Check Style 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/e29b3913
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e29b3913
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e29b3913

Branch: refs/heads/master
Commit: e29b3913ac31db21e00a0ca35ca8986757a9e48a
Parents: 343cdef
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Fri Dec 16 15:16:02 2016 +0000
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Fri Dec 16 15:16:02 2016 +0000

----------------------------------------------------------------------
 .../core/server/impl/ActiveMQServerImpl.java    | 34 +++++++-------------
 .../tests/integration/cli/QueueCommandTest.java |  3 +-
 2 files changed, 13 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e29b3913/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java
index ed9f147..42b75a6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/QueueCommandTest.java
@@ -18,16 +18,15 @@ package org.apache.activemq.artemis.tests.integration.cli;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
-import java.text.MessageFormat;
 import java.util.EnumSet;
 import java.util.Set;
 import java.util.UUID;
 
 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.queue.CreateQueue;
 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.core.server.Queue;
 import org.apache.activemq.artemis.core.server.QueueQueryResult;


Mime
View raw message