Repository: activemq-artemis Updated Branches: refs/heads/ARTEMIS-780 83f8e6ecb -> 82299f4de
codestyle fixes Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/82299f4d Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/82299f4d Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/82299f4d Branch: refs/heads/ARTEMIS-780 Commit: 82299f4dea8cd7325cf8b2a87773ee4b2c3eca66 Parents: 83f8e6e Author: Andy Taylor <[email protected]> Authored: Mon Dec 5 13:43:36 2016 +0000 Committer: Andy Taylor <[email protected]> Committed: Mon Dec 5 13:44:18 2016 +0000 ---------------------------------------------------------------------- .../artemis/core/server/AddressQueryResult.java | 4 +-- .../amqp/proton/ProtonServerSenderContext.java | 10 ++++---- .../transport/amqp/client/AmqpClient.java | 26 ++++++++++---------- .../BrokerDefinedMulticastConsumerTest.java | 1 - .../amqp/ClientDefinedAnycastConsumerTest.java | 7 ------ .../amqp/ClientDefinedMultiConsumerTest.java | 3 --- 6 files changed, 19 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82299f4d/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java ---------------------------------------------------------------------- diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java index ce74d3b..07d7406 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/AddressQueryResult.java @@ -20,9 +20,7 @@ import org.apache.activemq.artemis.api.core.SimpleString; import java.util.Set; -/** - * @author <a href="mailto:[email protected]";>Andy Taylor</a> - */ + public class AddressQueryResult { private final SimpleString name; private final Set<RoutingType> routingTypes; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82299f4d/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java ---------------------------------------------------------------------- diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java index 7f5f066..c0b9643 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java @@ -233,7 +233,7 @@ public class ProtonServerSenderContext extends ProtonInitializable implements Pr SimpleString queueNameToUse = null; shared = hasCapabilities(SHARED, source); global = hasCapabilities(GLOBAL, source); - ; + //find out if we have an address made up of the address and queue name, if yes then set queue name if (CompositeAddress.isFullyQualified(source.getAddress())) { CompositeAddress compositeAddress = CompositeAddress.getQueueName(source.getAddress()); @@ -617,10 +617,10 @@ public class ProtonServerSenderContext extends ProtonInitializable implements Pr } if (isVolatile) { queue += ":shared-volatile"; - } - if (global) { - queue += ":global"; - } + } + if (global) { + queue += ":global"; + } } return queue; } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82299f4d/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpClient.java ---------------------------------------------------------------------- diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpClient.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpClient.java index b537639..fddaf9d 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpClient.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpClient.java @@ -95,22 +95,22 @@ public class AmqpClient { /** - * Creates a connection with the broker at the given location, this method initiates a - * connect attempt immediately and will fail if the remote peer cannot be reached. - * - * @throws Exception if an error occurs attempting to connect to the Broker. - * @return a new connection object used to interact with the connected peer. - */ - public AmqpConnection connect(String containerId) throws Exception { + * Creates a connection with the broker at the given location, this method initiates a + * connect attempt immediately and will fail if the remote peer cannot be reached. + * + * @throws Exception if an error occurs attempting to connect to the Broker. + * @return a new connection object used to interact with the connected peer. + */ + public AmqpConnection connect(String containerId) throws Exception { - AmqpConnection connection = createConnection(); - connection.setContainerId(containerId); + AmqpConnection connection = createConnection(); + connection.setContainerId(containerId); - LOG.debug("Attempting to create new connection to peer: {}", remoteURI); - connection.connect(); + LOG.debug("Attempting to create new connection to peer: {}", remoteURI); + connection.connect(); - return connection; - } + return connection; + } /** http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82299f4d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java index c47207f..6a114d7 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/BrokerDefinedMulticastConsumerTest.java @@ -24,7 +24,6 @@ import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; import org.apache.activemq.transport.amqp.client.AmqpMessage; import org.apache.activemq.transport.amqp.client.AmqpReceiver; -import org.apache.activemq.transport.amqp.client.AmqpSender; import org.apache.activemq.transport.amqp.client.AmqpSession; import org.apache.qpid.proton.amqp.messaging.Source; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82299f4d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java index a7d2b4e..377cf86 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedAnycastConsumerTest.java @@ -17,8 +17,6 @@ package org.apache.activemq.artemis.tests.integration.amqp; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.core.server.RoutingType; -import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.server.impl.QueueImpl; import org.apache.activemq.transport.amqp.client.AmqpClient; import org.apache.activemq.transport.amqp.client.AmqpConnection; @@ -29,14 +27,9 @@ import org.junit.Test; import java.util.concurrent.TimeUnit; -/** - * @author <a href="mailto:[email protected]";>Andy Taylor</a> - */ public class ClientDefinedAnycastConsumerTest extends AmqpClientTestSupport { SimpleString address = new SimpleString("testAddress"); - SimpleString queue1 = new SimpleString("queue1"); - SimpleString queue2 = new SimpleString("queue2"); @Test(timeout = 60000) public void testConsumeFromSingleQueueOnAddressSameName() throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/82299f4d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java index f5a7808..9b5187f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/ClientDefinedMultiConsumerTest.java @@ -33,9 +33,6 @@ import java.util.concurrent.TimeUnit; import static org.apache.qpid.jms.provider.amqp.message.AmqpDestinationHelper.TOPIC_CAPABILITY; -/** - * @author <a href="mailto:[email protected]";>Andy Taylor</a> - */ public class ClientDefinedMultiConsumerTest extends AmqpClientTestSupport { SimpleString address = new SimpleString("testAddress");
