This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sandbox/camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git
commit a3778e6e96a3dc3406fb6c657e932f110b8a3beb Author: Andrea Cosentino <[email protected]> AuthorDate: Tue Dec 4 15:02:21 2018 +0100 Fixed CS --- .../src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java | 2 +- .../src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java | 4 ++-- .../java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java | 2 +- .../java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java | 4 ++-- .../apache/camel/component/sjms/batch/ListAggregationStrategy.java | 2 +- .../org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java | 3 ++- .../java/org/apache/camel/component/sjms/support/MyAsyncEndpoint.java | 2 +- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java index e9f86f6..0456b8f 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java @@ -36,8 +36,8 @@ import org.apache.camel.component.sjms.tx.BatchTransactionCommitStrategy; import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy; import org.apache.camel.component.sjms.tx.SessionBatchTransactionSynchronization; import org.apache.camel.component.sjms.tx.SessionTransactionSynchronization; -import org.apache.camel.support.DefaultConsumer; import org.apache.camel.spi.Synchronization; +import org.apache.camel.support.DefaultConsumer; import org.apache.commons.pool.BasePoolableObjectFactory; import org.apache.commons.pool.impl.GenericObjectPool; diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java index b593f9c..08ed02e 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java @@ -45,15 +45,15 @@ import org.apache.camel.component.sjms.jms.MessageCreatedStrategy; import org.apache.camel.component.sjms.jms.SessionAcknowledgementType; import org.apache.camel.component.sjms.producer.InOnlyProducer; import org.apache.camel.component.sjms.producer.InOutProducer; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; -import org.apache.camel.support.LoggingExceptionHandler; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.support.EndpointHelper; +import org.apache.camel.support.LoggingExceptionHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java index 20c4d13..b59af05 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchConsumer.java @@ -36,12 +36,12 @@ import javax.jms.MessageConsumer; import javax.jms.Queue; import javax.jms.Session; +import org.apache.camel.AggregationStrategy; import org.apache.camel.Exchange; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.RuntimeCamelException; import org.apache.camel.support.DefaultConsumer; -import org.apache.camel.AggregationStrategy; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; import org.slf4j.Logger; diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java index 4790e01..366457b 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpoint.java @@ -21,6 +21,7 @@ import java.util.concurrent.ScheduledExecutorService; import javax.jms.Message; import javax.jms.Session; +import org.apache.camel.AggregationStrategy; import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Exchange; @@ -34,15 +35,14 @@ import org.apache.camel.component.sjms.jms.DestinationNameParser; import org.apache.camel.component.sjms.jms.JmsBinding; import org.apache.camel.component.sjms.jms.JmsKeyFormatStrategy; import org.apache.camel.component.sjms.jms.MessageCreatedStrategy; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.language.simple.SimpleLanguage; -import org.apache.camel.AggregationStrategy; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; /** * The sjms-batch component is a specialized for highly performant, transactional batch consumption from a JMS queue. diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java index 596bd40..2c2e1aa 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/ListAggregationStrategy.java @@ -19,8 +19,8 @@ package org.apache.camel.component.sjms.batch; import java.util.ArrayList; import java.util.List; -import org.apache.camel.Exchange; import org.apache.camel.AggregationStrategy; +import org.apache.camel.Exchange; public class ListAggregationStrategy implements AggregationStrategy { diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java index b927e2c..08fec80 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointTest.java @@ -15,15 +15,16 @@ * limitations under the License. */ package org.apache.camel.component.sjms.batch; + import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.camel.CamelContext; import org.apache.camel.FailedToCreateRouteException; +import org.apache.camel.builder.AggregationStrategies; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.sjms.SjmsComponent; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.SimpleRegistry; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.camel.builder.AggregationStrategies; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncEndpoint.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncEndpoint.java index c5c29d0..6eaeae7 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncEndpoint.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncEndpoint.java @@ -20,8 +20,8 @@ import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.impl.SynchronousDelegateProducer; +import org.apache.camel.support.DefaultEndpoint; /** *
