Fixed the CS errors in camel-rabbitmq
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0e54bc8e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0e54bc8e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0e54bc8e Branch: refs/heads/master Commit: 0e54bc8e58fc7f9a4d89a8ad20b932cd2e389738 Parents: 9d8256a Author: Willem Jiang <willem.ji...@gmail.com> Authored: Wed Jun 10 14:47:41 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Wed Jun 10 14:47:41 2015 +0800 ---------------------------------------------------------------------- .../component/rabbitmq/RabbitMQEndpoint.java | 19 ++++++++----------- .../component/rabbitmq/RabbitMQInOutIntTest.java | 8 +++----- 2 files changed, 11 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0e54bc8e/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 979efb3..54760db 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 @@ -62,6 +62,8 @@ import org.slf4j.LoggerFactory; @UriEndpoint(scheme = "rabbitmq", title = "RabbitMQ", syntax = "rabbitmq:hostname:portNumber/exchangeName", consumerClass = RabbitMQConsumer.class, label = "messaging") public class RabbitMQEndpoint extends DefaultEndpoint { private static final Logger LOG = LoggerFactory.getLogger(RabbitMQEndpoint.class); + // header to indicate that the message body needs to be de-serialized + private static final String SERIALIZE_HEADER = "CamelSerialize"; @UriPath @Metadata(required = "true") private String hostname; @@ -153,18 +155,16 @@ public class RabbitMQEndpoint extends DefaultEndpoint { @UriParam private long requestTimeoutCheckerInterval = 1000; @UriParam - private boolean transferException = false; + private boolean transferException; // camel-jms supports this setting but it is not currently configurable in camel-rabbitmq private boolean useMessageIDAsCorrelationID = true; // camel-jms supports this setting but it is not currently configurable in camel-rabbitmq private String replyToType = ReplyToType.Temporary.name(); // camel-jms supports this setting but it is not currently configurable in camel-rabbitmq - private String replyTo = null; + private String replyTo; private RabbitMQMessageConverter messageConverter = new RabbitMQMessageConverter(); - - // header to indicate that the message body needs to be de-serialized - private static final String SERIALIZE_HEADER = "CamelSerialize"; + public RabbitMQEndpoint() { } @@ -198,8 +198,7 @@ public class RabbitMQEndpoint extends DefaultEndpoint { if (camelExchange.getIn() != null) { // Use the existing message so we keep the headers message = camelExchange.getIn(); - } - else { + } else { message = new DefaultMessage(); camelExchange.setIn(message); } @@ -292,12 +291,10 @@ public class RabbitMQEndpoint extends DefaultEndpoint { o.writeObject(msg.getBody()); body = b.toByteArray(); } - } - else if (msg.getBody() == null) { + } else if (msg.getBody() == null) { properties = getMessageConverter().buildProperties(camelExchange).build(); body = null; - } - else { + } else { LOG.warn("Could not convert {} to byte[]", msg.getBody()); throw new IOException(e); } http://git-wip-us.apache.org/repos/asf/camel/blob/0e54bc8e/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java ---------------------------------------------------------------------- diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java index 9e121f8..7d09545 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQInOutIntTest.java @@ -40,10 +40,10 @@ import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; public class RabbitMQInOutIntTest extends CamelTestSupport { - - private static final String EXCHANGE = "ex5"; + public static final String ROUTING_KEY = "rk5"; public static final long TIMEOUT_MS = 2000; + private static final String EXCHANGE = "ex5"; @Produce(uri = "direct:start") protected ProducerTemplate template; @@ -69,9 +69,7 @@ public class RabbitMQInOutIntTest extends CamelTestSupport { if (exchange.getIn().getBody(TestSerializableObject.class) != null) { TestSerializableObject foo = exchange.getIn().getBody(TestSerializableObject.class); foo.setDescription("foobar"); - } - - else if (exchange.getIn().getBody(String.class) != null) { + } else if (exchange.getIn().getBody(String.class) != null) { if (exchange.getIn().getBody(String.class).contains("header")) { assertEquals(exchange.getIn().getHeader("String"), "String"); assertEquals(exchange.getIn().getHeader("routeHeader"), "routeHeader");
