This is an automated email from the ASF dual-hosted git repository. onders pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 97cfd5f CS Fix 97cfd5f is described below commit 97cfd5f64998033573abe751d80a76c240237f6a Author: onders <ond...@apache.org> AuthorDate: Sun Dec 23 23:59:41 2018 +0300 CS Fix --- .../main/java/org/apache/camel/builder/AggregationStrategyClause.java | 2 +- .../main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java | 2 +- .../java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java | 2 +- .../src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java | 2 +- .../main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java | 2 +- .../main/java/org/apache/camel/builder/XsltAggregationStrategy.java | 2 +- .../src/main/java/org/apache/camel/component/bean/MethodInfo.java | 2 +- .../org/apache/camel/component/controlbus/ControlBusEndpoint.java | 2 +- .../org/apache/camel/component/controlbus/ControlBusProducer.java | 2 +- .../main/java/org/apache/camel/component/dataset/DataSetEndpoint.java | 2 +- .../strategy/FileIdempotentChangedRepositoryReadLockStrategy.java | 2 +- .../file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java | 2 +- .../file/strategy/FileIdempotentRepositoryReadLockStrategy.java | 2 +- .../src/main/java/org/apache/camel/component/log/LogComponent.java | 2 +- .../src/main/java/org/apache/camel/component/log/LogEndpoint.java | 2 +- .../apache/camel/component/rest/RestComponentVerifierExtension.java | 2 +- .../java/org/apache/camel/impl/cluster/ClusteredRouteController.java | 4 ++-- .../org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java b/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java index ff29599..31fe541 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java +++ b/camel-core/src/main/java/org/apache/camel/builder/AggregationStrategyClause.java @@ -19,9 +19,9 @@ package org.apache.camel.builder; import java.util.function.BiFunction; +import org.apache.camel.AggregationStrategy; import org.apache.camel.Exchange; import org.apache.camel.Message; -import org.apache.camel.AggregationStrategy; import org.apache.camel.util.ObjectHelper; public class AggregationStrategyClause<T> implements AggregationStrategy { diff --git a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java index b64b3dc..e42db93 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java @@ -24,8 +24,8 @@ import org.apache.camel.Processor; import org.apache.camel.processor.DeadLetterChannel; import org.apache.camel.processor.FatalFallbackErrorHandler; import org.apache.camel.processor.SendProcessor; -import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.CamelLogger; +import org.apache.camel.spi.RouteContext; import org.apache.camel.util.StringHelper; import org.slf4j.LoggerFactory; diff --git a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java index dceef02..790ed44 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/DefaultErrorHandlerBuilder.java @@ -26,11 +26,11 @@ import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.processor.DefaultErrorHandler; import org.apache.camel.processor.RedeliveryPolicy; +import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.ExecutorServiceManager; import org.apache.camel.spi.Language; import org.apache.camel.spi.RouteContext; import org.apache.camel.spi.ThreadPoolProfile; -import org.apache.camel.spi.CamelLogger; import org.apache.camel.support.ExpressionToPredicateAdapter; import org.slf4j.LoggerFactory; diff --git a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java index 14e6f09..a98e867 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolBuilder.java @@ -21,8 +21,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; -import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.apache.camel.spi.ThreadPoolProfile; +import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; /** * A builder to create thread pools. diff --git a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java index 8712735..ca3be1f 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java +++ b/camel-core/src/main/java/org/apache/camel/builder/ThreadPoolProfileBuilder.java @@ -18,8 +18,8 @@ package org.apache.camel.builder; import java.util.concurrent.TimeUnit; -import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.apache.camel.spi.ThreadPoolProfile; +import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; /** * Builder to build {@link org.apache.camel.spi.ThreadPoolProfile}. diff --git a/camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java b/camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java index 4c38bed..59416d3 100644 --- a/camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/builder/XsltAggregationStrategy.java @@ -26,6 +26,7 @@ import javax.xml.transform.URIResolver; import org.w3c.dom.Document; +import org.apache.camel.AggregationStrategy; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.Exchange; @@ -33,7 +34,6 @@ import org.apache.camel.builder.xml.XsltBuilder; import org.apache.camel.builder.xml.XsltUriResolver; import org.apache.camel.component.xslt.XsltEndpoint; import org.apache.camel.component.xslt.XsltOutput; -import org.apache.camel.AggregationStrategy; import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java index f6afbcf..8d77ac3 100644 --- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java +++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java @@ -32,6 +32,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.CompletionStage; import java.util.concurrent.ExecutorService; +import org.apache.camel.AggregationStrategy; import org.apache.camel.AsyncCallback; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; @@ -48,7 +49,6 @@ import org.apache.camel.StreamCache; import org.apache.camel.processor.DynamicRouter; import org.apache.camel.processor.RecipientList; import org.apache.camel.processor.RoutingSlip; -import org.apache.camel.AggregationStrategy; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.DefaultMessage; import org.apache.camel.support.ExchangeHelper; diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java index b3b9d28..fd78eb7 100644 --- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java @@ -22,12 +22,12 @@ import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.RuntimeCamelException; +import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.Language; 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.spi.CamelLogger; import org.apache.camel.support.DefaultEndpoint; /** diff --git a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java index 8949269..042cdc3 100644 --- a/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java +++ b/camel-core/src/main/java/org/apache/camel/component/controlbus/ControlBusProducer.java @@ -27,8 +27,8 @@ import org.apache.camel.Expression; import org.apache.camel.Route; import org.apache.camel.ServiceStatus; import org.apache.camel.builder.ExpressionBuilder; -import org.apache.camel.spi.Language; import org.apache.camel.spi.CamelLogger; +import org.apache.camel.spi.Language; import org.apache.camel.support.DefaultAsyncProducer; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.util.ObjectHelper; diff --git a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java index 95ac1b3..c82c319 100644 --- a/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java @@ -27,11 +27,11 @@ import org.apache.camel.Producer; import org.apache.camel.Service; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.ThroughputLogger; +import org.apache.camel.spi.CamelLogger; 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.spi.CamelLogger; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.URISupport; diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java index edfb05f..a98e85a 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentChangedRepositoryReadLockStrategy.java @@ -28,8 +28,8 @@ import org.apache.camel.component.file.GenericFile; import org.apache.camel.component.file.GenericFileEndpoint; import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy; import org.apache.camel.component.file.GenericFileOperations; -import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.spi.CamelLogger; +import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.ObjectHelper; diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java index 7ba0b49..0f4ec5f 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRenameRepositoryReadLockStrategy.java @@ -26,8 +26,8 @@ import org.apache.camel.component.file.GenericFile; import org.apache.camel.component.file.GenericFileEndpoint; import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy; import org.apache.camel.component.file.GenericFileOperations; -import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.spi.CamelLogger; +import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.ObjectHelper; diff --git a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java index f78e328..8dd377f 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/strategy/FileIdempotentRepositoryReadLockStrategy.java @@ -28,8 +28,8 @@ import org.apache.camel.component.file.GenericFile; import org.apache.camel.component.file.GenericFileEndpoint; import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy; import org.apache.camel.component.file.GenericFileOperations; -import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.spi.CamelLogger; +import org.apache.camel.spi.IdempotentRepository; import org.apache.camel.support.ServiceSupport; import org.apache.camel.util.ObjectHelper; diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java index ad25661..1164e37 100644 --- a/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java +++ b/camel-core/src/main/java/org/apache/camel/component/log/LogComponent.java @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.camel.Endpoint; import org.apache.camel.LoggingLevel; import org.apache.camel.processor.DefaultExchangeFormatter; +import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.spi.Metadata; -import org.apache.camel.spi.CamelLogger; import org.apache.camel.support.DefaultComponent; import org.slf4j.Logger; diff --git a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java index 1a3c823..464cf96 100644 --- a/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java +++ b/camel-core/src/main/java/org/apache/camel/component/log/LogEndpoint.java @@ -25,13 +25,13 @@ import org.apache.camel.processor.CamelLogProcessor; import org.apache.camel.processor.DefaultExchangeFormatter; import org.apache.camel.processor.DefaultMaskingFormatter; import org.apache.camel.processor.ThroughputLogger; +import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.ExchangeFormatter; import org.apache.camel.spi.MaskingFormatter; 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.spi.CamelLogger; import org.apache.camel.support.ProcessorEndpoint; import org.apache.camel.support.ServiceHelper; import org.slf4j.Logger; diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestComponentVerifierExtension.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestComponentVerifierExtension.java index 079b646..734c7d1 100644 --- a/camel-core/src/main/java/org/apache/camel/component/rest/RestComponentVerifierExtension.java +++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestComponentVerifierExtension.java @@ -26,8 +26,8 @@ import org.apache.camel.component.extension.verifier.CatalogVerifierCustomizer; import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension; import org.apache.camel.component.extension.verifier.ResultBuilder; import org.apache.camel.component.extension.verifier.ResultErrorBuilder; -import org.apache.camel.runtimecatalog.impl.JSonSchemaHelper; import org.apache.camel.runtimecatalog.RuntimeCamelCatalog; +import org.apache.camel.runtimecatalog.impl.JSonSchemaHelper; import org.apache.camel.spi.RestConsumerFactory; import org.apache.camel.spi.RestProducerFactory; import org.apache.camel.util.ObjectHelper; diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java index 1e2b040..5ed9003 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java +++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRouteController.java @@ -35,14 +35,14 @@ import org.apache.camel.NamedNode; import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; import org.apache.camel.cluster.CamelClusterService; -import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.impl.DefaultRouteController; import org.apache.camel.meta.Experimental; import org.apache.camel.model.RouteDefinition; import org.apache.camel.spi.RoutePolicy; import org.apache.camel.spi.RoutePolicyFactory; -import org.apache.camel.support.cluster.ClusterServiceHelper; import org.apache.camel.support.ServiceHelper; +import org.apache.camel.support.cluster.ClusterServiceHelper; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.util.ObjectHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java index ffa7828..d6a5fb1 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java +++ b/camel-core/src/main/java/org/apache/camel/impl/cluster/ClusteredRoutePolicyFactory.java @@ -20,9 +20,9 @@ import org.apache.camel.CamelContext; import org.apache.camel.NamedNode; import org.apache.camel.RuntimeCamelException; import org.apache.camel.cluster.CamelClusterService; -import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.spi.RoutePolicy; import org.apache.camel.spi.RoutePolicyFactory; +import org.apache.camel.support.cluster.ClusterServiceSelectors; import org.apache.camel.util.ObjectHelper; public class ClusteredRoutePolicyFactory implements RoutePolicyFactory {