This is an automated email from the ASF dual-hosted git repository. acosentino 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 212d17d Fixed CS for Camel-Core 212d17d is described below commit 212d17d530a0aa2206a93e53c2c1e1531c8c1199 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Thu May 2 11:22:11 2019 +0200 Fixed CS for Camel-Core --- .../main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java | 2 +- .../src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java | 2 +- .../main/java/org/apache/camel/processor/channel/DefaultChannel.java | 2 +- .../test/java/org/apache/camel/builder/ContextErrorHandlerTest.java | 2 +- .../src/test/java/org/apache/camel/builder/ErrorHandlerTest.java | 4 ++-- .../src/test/java/org/apache/camel/builder/RouteBuilderTest.java | 2 +- .../src/test/java/org/apache/camel/converter/ConverterBenchmark.java | 2 +- .../src/test/java/org/apache/camel/converter/ConverterTest.java | 2 +- .../camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java | 2 +- .../src/test/java/org/apache/camel/converter/StringSourceTest.java | 2 +- .../java/org/apache/camel/impl/engine/DefaultCamelContextTest.java | 1 - .../src/test/java/org/apache/camel/impl/model/RouteIdFactoryTest.java | 4 ++-- 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java b/core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java index 5b3268d..a9907e7 100644 --- a/core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java +++ b/core/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java @@ -21,9 +21,9 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.LoggingLevel; import org.apache.camel.NoSuchEndpointException; import org.apache.camel.Processor; -import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.processor.FatalFallbackErrorHandler; import org.apache.camel.processor.SendProcessor; +import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.RouteContext; import org.apache.camel.util.StringHelper; diff --git a/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java index ffc94f3..2e518f8 100644 --- a/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java +++ b/core/camel-core/src/main/java/org/apache/camel/impl/CamelPostProcessorHelper.java @@ -38,10 +38,10 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.ProxyInstantiationException; import org.apache.camel.RuntimeCamelException; import org.apache.camel.Service; -import org.apache.camel.spi.BeanProxyFactory; import org.apache.camel.impl.engine.DefaultConsumerTemplate; import org.apache.camel.impl.engine.DefaultFluentProducerTemplate; import org.apache.camel.impl.engine.DefaultProducerTemplate; +import org.apache.camel.spi.BeanProxyFactory; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.support.service.ServiceHelper; diff --git a/core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java b/core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java index 75a1405..6f6517c 100644 --- a/core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java +++ b/core/camel-core/src/main/java/org/apache/camel/processor/channel/DefaultChannel.java @@ -36,8 +36,8 @@ import org.apache.camel.model.RouteDefinition; import org.apache.camel.model.RouteDefinitionHelper; import org.apache.camel.processor.CamelInternalProcessor; import org.apache.camel.processor.CamelInternalProcessorAdvice; -import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler; import org.apache.camel.processor.WrapProcessor; +import org.apache.camel.processor.errorhandler.RedeliveryErrorHandler; import org.apache.camel.processor.interceptor.BacklogDebugger; import org.apache.camel.processor.interceptor.BacklogTracer; import org.apache.camel.spi.InterceptStrategy; diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java index b384fd2..b625a39 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ContextErrorHandlerTest.java @@ -24,9 +24,9 @@ import org.apache.camel.Endpoint; import org.apache.camel.Processor; import org.apache.camel.Route; import org.apache.camel.impl.engine.EventDrivenConsumerRoute; +import org.apache.camel.processor.SendProcessor; import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.processor.errorhandler.RedeliveryPolicy; -import org.apache.camel.processor.SendProcessor; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java index bb2a573..2619fd6 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/ErrorHandlerTest.java @@ -23,10 +23,10 @@ import org.apache.camel.Processor; import org.apache.camel.Route; import org.apache.camel.TestSupport; import org.apache.camel.impl.engine.EventDrivenConsumerRoute; -import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.processor.FilterProcessor; -import org.apache.camel.processor.errorhandler.RedeliveryPolicy; import org.apache.camel.processor.SendProcessor; +import org.apache.camel.processor.errorhandler.DeadLetterChannel; +import org.apache.camel.processor.errorhandler.RedeliveryPolicy; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java index fd476d7..aa2d37f 100644 --- a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java @@ -32,7 +32,6 @@ import org.apache.camel.TestSupport; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.engine.EventDrivenConsumerRoute; import org.apache.camel.processor.ChoiceProcessor; -import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.processor.EvaluateExpressionProcessor; import org.apache.camel.processor.FilterProcessor; import org.apache.camel.processor.MulticastProcessor; @@ -41,6 +40,7 @@ import org.apache.camel.processor.RecipientList; import org.apache.camel.processor.SendProcessor; import org.apache.camel.processor.Splitter; import org.apache.camel.processor.ThreadsProcessor; +import org.apache.camel.processor.errorhandler.DeadLetterChannel; import org.apache.camel.processor.idempotent.IdempotentConsumer; import org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmark.java b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmark.java index a5d2123..c148703 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmark.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterBenchmark.java @@ -21,10 +21,10 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import org.apache.camel.LoggingLevel; +import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.impl.engine.DefaultFactoryFinderResolver; import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; -import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.Injector; import org.apache.camel.util.ReflectionInjector; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java index e16b305..54d660a 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/ConverterTest.java @@ -33,10 +33,10 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.TypeConversionException; import org.apache.camel.TypeConverter; import org.apache.camel.impl.DefaultCamelContext; +import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.impl.engine.DefaultFactoryFinderResolver; import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; -import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.IntrospectionSupport; import org.apache.camel.support.service.ServiceHelper; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java index 2fe6320..a0822666 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/JaxpTest.java @@ -27,10 +27,10 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.apache.camel.TypeConverter; +import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.impl.engine.DefaultFactoryFinderResolver; import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; -import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.ReflectionInjector; import org.junit.Assert; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java index a620fc6..28e8731 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java @@ -23,10 +23,10 @@ import java.io.ObjectOutputStream; import org.apache.camel.StringSource; import org.apache.camel.TypeConverter; +import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.impl.engine.DefaultClassResolver; import org.apache.camel.impl.engine.DefaultFactoryFinderResolver; import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; -import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.ReflectionInjector; import org.junit.Assert; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java index 0e27829..96e1df2 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultCamelContextTest.java @@ -34,7 +34,6 @@ import org.apache.camel.component.bean.BeanComponent; import org.apache.camel.component.direct.DirectComponent; import org.apache.camel.component.log.LogComponent; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.impl.engine.DefaultUuidGenerator; import org.apache.camel.spi.UuidGenerator; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.service.ServiceSupport; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/model/RouteIdFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/model/RouteIdFactoryTest.java index 962fc5e..621804d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/model/RouteIdFactoryTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/model/RouteIdFactoryTest.java @@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.rest.DummyRestConsumerFactory; import org.apache.camel.component.rest.DummyRestProcessorFactory; -import org.apache.camel.impl.RouteIdFactory; import org.apache.camel.impl.JndiRegistry; +import org.apache.camel.impl.RouteIdFactory; import org.junit.Test; public class RouteIdFactoryTest extends ContextTestSupport { @@ -74,4 +74,4 @@ public class RouteIdFactoryTest extends ContextTestSupport { assertEquals("get-hello", context.getRouteDefinitions().get(4).getId()); } -} \ No newline at end of file +}