Fixed CS. This fixes #717
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bcd00fa1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bcd00fa1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bcd00fa1 Branch: refs/heads/master Commit: bcd00fa15b8af962250843f42c20a56ac1ee48e2 Parents: e3751db Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Dec 21 15:37:49 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Dec 21 15:37:49 2015 +0100 ---------------------------------------------------------------------- .../component/rabbitmq/RabbitMQEndpoint.java | 2 +- .../rabbitmq/RabbitMQProducerIntTest.java | 23 ++++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/bcd00fa1/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java index f7a02f4..67b04b7 100644 --- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java +++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQEndpoint.java @@ -16,7 +16,6 @@ */ package org.apache.camel.component.rabbitmq; -import javax.net.ssl.TrustManager; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -34,6 +33,7 @@ import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; +import javax.net.ssl.TrustManager; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Address; http://git-wip-us.apache.org/repos/asf/camel/blob/bcd00fa1/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java index 2684c20..239fb36 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQProducerIntTest.java @@ -35,7 +35,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; - public class RabbitMQProducerIntTest extends CamelTestSupport { private static final String EXCHANGE = "ex1"; private static final String ROUTE = "route1"; @@ -49,13 +48,13 @@ public class RabbitMQProducerIntTest extends CamelTestSupport { @Produce(uri = "direct:start-with-confirms") protected ProducerTemplate templateWithConfirms; - + @Produce(uri = "direct:start-with-confirms-bad-route") protected ProducerTemplate templateWithConfirmsAndBadRoute; private Connection connection; private Channel channel; - + @Override protected RouteBuilder createRouteBuilder() throws Exception { context().setTracing(true); @@ -96,7 +95,7 @@ public class RabbitMQProducerIntTest extends CamelTestSupport { private void assertThatBodiesReceivedIn(final List<String> received, final String... expected) throws InterruptedException { Thread.sleep(500); - + assertListSize(received, expected.length); for (String body : expected) { assertEquals(body, received.get(0)); @@ -117,9 +116,9 @@ public class RabbitMQProducerIntTest extends CamelTestSupport { public void producedMessageIsReceivedWhenPublisherAcknowledgementsAreEnabledAndBadRoutingKeyIsUsed() throws InterruptedException, IOException, TimeoutException { final List<String> received = new ArrayList<>(); channel.basicConsume("sammyq", true, new ArrayPopulatingConsumer(received)); - + templateWithConfirmsAndBadRoute.sendBody("publisher ack message"); - + assertThatBodiesReceivedIn(received); } @@ -141,13 +140,13 @@ public class RabbitMQProducerIntTest extends CamelTestSupport { this.received = received; } - @Override - public void handleDelivery(String consumerTag, - Envelope envelope, - AMQP.BasicProperties properties, - byte[] body) throws IOException { + @Override + public void handleDelivery(String consumerTag, + Envelope envelope, + AMQP.BasicProperties properties, + byte[] body) throws IOException { received.add(new String(body)); - } + } } }
