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 2c684d8 Fixed CS for Camel-CXF 2c684d8 is described below commit 2c684d8e4b6beb463ea487e8d1ab8ff80dd13940 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Wed Jan 16 10:28:55 2019 +0100 Fixed CS for Camel-CXF --- .../src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 8 ++++---- .../src/main/java/org/apache/camel/component/cxf/CxfProducer.java | 2 +- .../java/org/apache/camel/component/cxf/DefaultCxfBinding.java | 2 +- .../java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java | 2 +- .../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 2 +- .../org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java | 2 +- .../camel/component/cxf/CxfConsumerContinuationTimeoutTest.java | 2 +- .../org/apache/camel/component/cxf/DefaultCxfBindingTest.java | 2 +- .../camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java | 2 +- .../apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java | 2 +- .../java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java index eb7d70a..148492d 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java @@ -61,19 +61,19 @@ import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.feature.CXFMessageDataFormatFeature; import org.apache.camel.component.cxf.feature.PayLoadDataFormatFeature; import org.apache.camel.component.cxf.feature.RAWDataFormatFeature; -import org.apache.camel.http.common.cookie.CookieHandler; -import org.apache.camel.support.DefaultEndpoint; +import org.apache.camel.http.common.cookie.CookieHandler;; import org.apache.camel.impl.SynchronousDelegateProducer; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; -import org.apache.camel.util.CastUtils; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.support.EndpointHelper; +import org.apache.camel.support.jsse.SSLContextParameters; +import org.apache.camel.util.CastUtils; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.UnsafeUriCharactersEncoder; -import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory; import org.apache.cxf.binding.BindingConfiguration; diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java index ff377fc..82217dd 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java @@ -36,8 +36,8 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.support.DefaultAsyncProducer; import org.apache.camel.support.DefaultProducer; -import org.apache.camel.util.ObjectHelper; import org.apache.camel.support.ServiceHelper; +import org.apache.camel.util.ObjectHelper; import org.apache.cxf.Bus; import org.apache.cxf.binding.soap.model.SoapHeaderInfo; import org.apache.cxf.endpoint.Client; diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java index 5c6025a..5d358b9 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java @@ -48,9 +48,9 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.component.cxf.common.header.CxfHeaderHelper; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.util.ReaderInputStream; -import org.apache.camel.support.DefaultAttachment; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; +import org.apache.camel.support.DefaultAttachment; import org.apache.camel.support.ExchangeHelper; import org.apache.camel.util.ObjectHelper; import org.apache.cxf.attachment.AttachmentImpl; diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java index 7bedb0e..5870a1c 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java @@ -29,8 +29,8 @@ import org.apache.camel.impl.HeaderFilterStrategyComponent; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.annotations.Component; import org.apache.camel.support.CamelContextHelper; -import org.apache.camel.util.CastUtils; import org.apache.camel.support.ObjectHelper; +import org.apache.camel.util.CastUtils; import org.apache.cxf.jaxrs.AbstractJAXRSFactoryBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java index 7924ccf..09087d3 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java @@ -34,13 +34,13 @@ import org.apache.camel.RuntimeCamelException; import org.apache.camel.Service; import org.apache.camel.component.cxf.NullFaultListener; import org.apache.camel.http.common.cookie.CookieHandler; -import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.impl.SynchronousDelegateProducer; import org.apache.camel.spi.HeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategyAware; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; +import org.apache.camel.support.DefaultEndpoint; import org.apache.camel.support.EndpointHelper; import org.apache.camel.support.jsse.SSLContextParameters; import org.apache.cxf.Bus; diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java index 6fe2b0f4..b1686d0 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/SimpleCxfRsBinding.java @@ -43,8 +43,8 @@ import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.Response.Status; import org.apache.camel.Message; -import org.apache.camel.support.DefaultAttachment; import org.apache.camel.spi.HeaderFilterStrategy; +import org.apache.camel.support.DefaultAttachment; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.InputStreamDataSource; import org.apache.cxf.jaxrs.ext.multipart.Multipart; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java index 7c5f9db..b7f0ab5 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerContinuationTimeoutTest.java @@ -23,9 +23,9 @@ import org.apache.camel.AsyncProcessor; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.support.AsyncProcessorHelper; import org.apache.camel.support.AsyncProcessorSupport; import org.apache.camel.test.junit4.CamelTestSupport; -import org.apache.camel.support.AsyncProcessorHelper; import org.junit.Test; public class CxfConsumerContinuationTimeoutTest extends CamelTestSupport { diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java index 1c4e654..6bccf36 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java @@ -39,9 +39,9 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.converter.IOConverter; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.support.DefaultExchange; import org.apache.camel.impl.DefaultHeaderFilterStrategy; import org.apache.camel.spi.HeaderFilterStrategy; +import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.ExchangeHelper; import org.apache.cxf.attachment.AttachmentImpl; import org.apache.cxf.binding.Binding; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java index 94487ae..a315a5c 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsGlobalSslProducerTest.java @@ -25,8 +25,8 @@ import org.apache.camel.SSLContextParametersAware; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.component.cxf.jaxrs.testbean.Customer; -import org.apache.camel.test.spring.CamelSpringTestSupport; import org.apache.camel.support.jsse.SSLContextParameters; +import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java index b46e6e5..78bd4da 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBindingTest.java @@ -25,8 +25,8 @@ import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.impl.DefaultCamelContext; -import org.apache.camel.support.DefaultExchange; import org.apache.camel.impl.DefaultHeaderFilterStrategy; +import org.apache.camel.support.DefaultExchange; import org.apache.camel.support.DefaultMessage; import org.apache.camel.support.ExchangeHelper; import org.apache.cxf.message.MessageImpl; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java index 554c465..a8e4a71 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ssl/SslGlobalTest.java @@ -25,8 +25,8 @@ import org.apache.camel.Processor; import org.apache.camel.SSLContextParametersAware; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.common.message.CxfConstants; -import org.apache.camel.test.spring.CamelSpringTestSupport; import org.apache.camel.support.jsse.SSLContextParameters; +import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Test; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -86,4 +86,4 @@ public class SslGlobalTest extends CamelSpringTestSupport { return new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/CxfGlobalSslContext.xml"); } -} \ No newline at end of file +}