Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/69c0182e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/69c0182e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/69c0182e Branch: refs/heads/master Commit: 69c0182ef98463324f41dd6f59b2647d90c1e00b Parents: 366ccef Author: Claus Ibsen <[email protected]> Authored: Fri Mar 4 14:38:41 2016 +0100 Committer: Claus Ibsen <[email protected]> Committed: Fri Mar 4 14:38:41 2016 +0100 ---------------------------------------------------------------------- .../spring/integration/SpringIntegrationConsumer.java | 2 +- .../spring/integration/SpringIntegrationProducer.java | 6 +++--- .../spring/integration/adapter/CamelSourceAdapter.java | 11 ++++++----- .../spring/integration/adapter/CamelTargetAdapter.java | 2 +- .../integration/SpringIntegrationTwoWayConsumerTest.java | 4 ++-- .../integration/adapter/CamelSourceAdapterTest.java | 2 +- .../integration/adapter/CamelTargetAdapterTest.java | 4 ++-- .../spring/integration/adapter/ConfigurationTest.java | 1 - 8 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java index d572ebe..fac7139 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationConsumer.java @@ -22,10 +22,10 @@ import org.apache.camel.Processor; import org.apache.camel.impl.DefaultConsumer; import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.util.ObjectHelper; +import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHandler; import org.springframework.messaging.SubscribableChannel; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.messaging.core.DestinationResolver; /** http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java index 92d0251..3be4d0c 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/SpringIntegrationProducer.java @@ -21,12 +21,12 @@ import org.apache.camel.Processor; import org.apache.camel.impl.DefaultProducer; import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.util.ObjectHelper; +import org.springframework.integration.channel.DirectChannel; +import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHeaders; -import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.MessageHandler; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; +import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.core.DestinationResolver; /** http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java index 0c86132..d963578 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapter.java @@ -23,15 +23,16 @@ import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.spring.integration.SpringIntegrationBinding; +import org.apache.camel.util.ServiceHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHeaders; -import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessageHeaders; /** * A CamelContext will be injected into CameSourceAdapter which will @@ -75,7 +76,7 @@ public class CamelSourceAdapter extends AbstractCamelAdapter implements Initiali replyChannel.subscribe(new MessageHandler() { public void handleMessage(Message<?> message) { LOG.debug("Received {} from ReplyChannel: {}", message, replyChannel); - //TODO set the corralationID + //TODO set the correlationID SpringIntegrationBinding.storeToCamelMessage(message, exchange.getOut()); } }); @@ -93,7 +94,7 @@ public class CamelSourceAdapter extends AbstractCamelAdapter implements Initiali public void destroy() throws Exception { if (consumer != null) { - consumer.stop(); + ServiceHelper.stopAndShutdownService(consumer); } } @@ -101,7 +102,7 @@ public class CamelSourceAdapter extends AbstractCamelAdapter implements Initiali // start the service here camelEndpoint = getCamelContext().getEndpoint(getCamelEndpointUri()); consumer = camelEndpoint.createConsumer(new ConsumerProcessor()); - consumer.start(); + ServiceHelper.startService(consumer); } } http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java index 99ca9e8..837d304 100644 --- a/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java +++ b/components/camel-spring-integration/src/main/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapter.java @@ -26,8 +26,8 @@ import org.apache.camel.impl.DefaultExchange; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageDeliveryException; -import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessageHeaders; /** * CamelTargetAdapter will redirect the Spring Integration message to the Camel context. http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java index 3fe828a..05d6007 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/SpringIntegrationTwoWayConsumerTest.java @@ -24,11 +24,11 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHeaders; -import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; public class SpringIntegrationTwoWayConsumerTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java index af5b101..c23e0ff 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelSourceAdapterTest.java @@ -22,8 +22,8 @@ import java.util.concurrent.TimeUnit; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; +import org.springframework.messaging.Message; import org.springframework.messaging.MessageHandler; public class CamelSourceAdapterTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java index eed8b05..d2fffee 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/CamelTargetAdapterTest.java @@ -25,11 +25,11 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.MessageHeaders; -import org.springframework.integration.channel.DirectChannel; import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.GenericMessage; public class CamelTargetAdapterTest extends CamelSpringTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/69c0182e/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java index cb37135..7599638 100644 --- a/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java +++ b/components/camel-spring-integration/src/test/java/org/apache/camel/component/spring/integration/adapter/ConfigurationTest.java @@ -17,7 +17,6 @@ package org.apache.camel.component.spring.integration.adapter; import org.apache.camel.util.IOHelper; - import org.junit.After; import org.junit.Test; import org.springframework.context.support.AbstractXmlApplicationContext;
