This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 0e26ffa824b Fixed CS 0e26ffa824b is described below commit 0e26ffa824b7529fb916a53c327d7daeb78205ed Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Jan 12 06:54:52 2023 +0100 Fixed CS --- .../camel/component/cxf/feature/CXFMessageDataFormatFeature.java | 1 + .../java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java | 7 ++++--- .../org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java | 3 ++- .../java/org/apache/camel/component/cxf/jaxws/CxfProducer.java | 3 ++- .../org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java | 3 ++- .../camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java | 3 ++- .../apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java | 3 ++- .../cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java | 3 ++- .../component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java | 3 ++- .../component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java | 1 + .../camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java | 3 ++- .../apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java | 3 ++- .../apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java | 3 ++- .../apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java | 1 + .../java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java | 3 ++- .../java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java | 3 ++- .../apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java | 3 ++- .../test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java | 3 ++- .../apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java | 3 ++- .../test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java | 6 ++++-- .../org/apache/camel/component/cxf/CxfDispatchTestSupport.java | 3 ++- .../java/org/apache/camel/component/cxf/CxfNonWrapperTest.java | 3 ++- .../apache/camel/component/cxf/CxfPayloadProviderRouterTest.java | 3 ++- .../org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java | 3 ++- .../test/java/org/apache/camel/component/cxf/ServiceProvider.java | 3 ++- .../test/java/org/apache/camel/component/cxf/SoapTargetBean.java | 3 ++- .../camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 5 +++-- .../org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java | 5 +++-- .../component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java | 1 + .../component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java | 7 ++++--- .../apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java | 3 ++- .../camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java | 3 ++- .../org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java | 3 ++- .../component/cxf/soap/headers/CxfMessageHeadersRelayTest.java | 7 ++++--- .../apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java | 3 ++- .../test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java | 3 ++- .../apache/camel/component/cxf/transport/CamelDestinationTest.java | 3 ++- .../camel/component/cxf/transport/JaxWSCamelTestSupport.java | 3 ++- 38 files changed, 82 insertions(+), 43 deletions(-) diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java index 7c9132244e6..aaa81e42710 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import jakarta.xml.soap.SOAPMessage; + import javax.xml.transform.Source; import org.apache.camel.component.cxf.interceptors.CxfMessageSoapHeaderOutInterceptor; diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java index fbdc5a02d53..3e01915bde1 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpoint.java @@ -27,6 +27,10 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import jakarta.xml.ws.Provider; +import jakarta.xml.ws.WebServiceProvider; +import jakarta.xml.ws.handler.Handler; + import javax.net.ssl.HostnameVerifier; import javax.wsdl.Definition; import javax.wsdl.WSDLException; @@ -39,9 +43,6 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; -import jakarta.xml.ws.Provider; -import jakarta.xml.ws.WebServiceProvider; -import jakarta.xml.ws.handler.Handler; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java index 331c3a2b31f..7756ac18cfb 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfEndpointUtils.java @@ -19,9 +19,10 @@ package org.apache.camel.component.cxf.jaxws; import java.lang.annotation.Annotation; import jakarta.jws.WebService; -import javax.xml.namespace.QName; import jakarta.xml.ws.WebServiceProvider; +import javax.xml.namespace.QName; + import org.apache.camel.CamelContext; import org.apache.camel.CamelException; import org.apache.camel.Exchange; diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java index 576385a63dd..860fb043959 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java @@ -25,10 +25,11 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import javax.xml.namespace.QName; import jakarta.xml.ws.Holder; import jakarta.xml.ws.handler.MessageContext.Scope; +import javax.xml.namespace.QName; + import org.apache.camel.AsyncCallback; import org.apache.camel.Exchange; import org.apache.camel.RuntimeCamelException; diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java index 7595187175b..0caa5f93216 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBinding.java @@ -35,12 +35,13 @@ import java.util.Set; import java.util.TreeMap; import jakarta.activation.DataHandler; +import jakarta.xml.ws.Holder; + import javax.security.auth.Subject; import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; -import jakarta.xml.ws.Holder; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java index 3ce6657e23d..8ea87ca711a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/DefaultPayloadProviderSEI.java @@ -17,11 +17,12 @@ package org.apache.camel.component.cxf.jaxws; -import javax.xml.transform.Source; import jakarta.xml.ws.Provider; import jakarta.xml.ws.ServiceMode; import jakarta.xml.ws.WebServiceProvider; +import javax.xml.transform.Source; + @WebServiceProvider(targetNamespace = "http://camel.apache.org/cxf/jaxws/provider") @ServiceMode(value = jakarta.xml.ws.Service.Mode.PAYLOAD) public interface DefaultPayloadProviderSEI extends Provider<Source> { diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java index c4fd80dbd72..fda3faefcfd 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/WSDLServiceFactoryBean.java @@ -18,10 +18,11 @@ package org.apache.camel.component.cxf.jaxws; import java.util.Map; +import jakarta.xml.ws.Provider; + import javax.wsdl.Definition; import javax.wsdl.Service; import javax.xml.namespace.QName; -import jakarta.xml.ws.Provider; import org.apache.camel.RuntimeCamelException; import org.apache.cxf.endpoint.Endpoint; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java index e9c016abd42..43268147c33 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java @@ -18,11 +18,12 @@ package org.apache.camel.component.cxf.jaxws; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; +import javax.xml.namespace.QName; + import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.test.junit5.CamelTestSupport; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java index 1daae3a5eb8..fa03a45f044 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CXFWsdlOnlyPayloadModeNoSpringTest.java @@ -18,11 +18,12 @@ package org.apache.camel.component.cxf.jaxws; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; +import javax.xml.namespace.QName; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java index e83b1ea03c6..329cd5e6e3a 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayLoadMarshalFaultTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.jaxws; import java.io.StringReader; import jakarta.xml.bind.JAXBContext; + import javax.xml.namespace.QName; import org.w3c.dom.Element; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java index 3903acc28fd..28d565a115b 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfConsumerPayloadFaultTest.java @@ -19,10 +19,11 @@ package org.apache.camel.component.cxf.jaxws; import java.io.StringReader; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Holder; +import javax.xml.namespace.QName; + import org.w3c.dom.Element; import org.apache.camel.Exchange; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java index 56d7851f0e2..028ae5a79e9 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfPayLoadSoapHeaderTest.java @@ -19,10 +19,11 @@ package org.apache.camel.component.cxf.jaxws; import java.net.URL; import java.util.List; +import jakarta.xml.ws.BindingProvider; + import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; -import jakarta.xml.ws.BindingProvider; import org.w3c.dom.Element; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java index cb3b6b471b9..f7c56c7d8b5 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfSchemaValidationTest.java @@ -18,11 +18,12 @@ package org.apache.camel.component.cxf.jaxws; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Holder; import jakarta.xml.ws.soap.SOAPFaultException; +import javax.xml.namespace.QName; + import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.cxf.common.CXFTestSupport; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java index 8a74a2a22c8..0b9eadc744c 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/DefaultCxfBindingTest.java @@ -27,6 +27,7 @@ import java.util.TreeMap; import jakarta.activation.DataHandler; import jakarta.activation.FileDataSource; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java index 61834a514b5..9dde715be9b 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/ServiceProvider.java @@ -16,12 +16,13 @@ */ package org.apache.camel.component.cxf.jaxws; -import javax.xml.transform.Source; import jakarta.xml.ws.Provider; import jakarta.xml.ws.Service.Mode; import jakarta.xml.ws.ServiceMode; import jakarta.xml.ws.WebServiceProvider; +import javax.xml.transform.Source; + @WebServiceProvider @ServiceMode(Mode.PAYLOAD) public class ServiceProvider implements Provider<Source> { diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java index 7d66ac24cbb..f9e351c1f19 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/SoapTargetBean.java @@ -18,11 +18,12 @@ package org.apache.camel.component.cxf.jaxws; import java.io.InputStream; -import javax.xml.namespace.QName; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPBody; import jakarta.xml.soap.SOAPMessage; +import javax.xml.namespace.QName; + import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java index c69dd4d100f..60118c6e392 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java @@ -23,11 +23,12 @@ import jakarta.annotation.Resource; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; -import javax.xml.namespace.QName; import jakarta.xml.ws.Holder; import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; +import javax.xml.namespace.QName; + import org.w3c.dom.Node; import org.apache.cxf.headers.Header; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java index 00663b28d68..ca548810245 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java @@ -18,11 +18,12 @@ package org.apache.camel.wsdl_first; import java.util.Set; -import javax.xml.namespace.QName; import jakarta.xml.ws.handler.MessageContext; import jakarta.xml.ws.handler.soap.SOAPHandler; import jakarta.xml.ws.handler.soap.SOAPMessageContext; +import javax.xml.namespace.QName; + public class JaxwsTestHandler implements SOAPHandler<SOAPMessageContext> { private int faultCount; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java index 1b7e9fbfe8a..4c3f62220d5 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java @@ -16,9 +16,10 @@ */ package org.apache.camel.component.cxf; -import javax.xml.namespace.QName; import jakarta.xml.ws.Service; +import javax.xml.namespace.QName; + import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.http.base.HttpOperationFailedException; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java index d3157c7da64..79e33256dce 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyTest.java @@ -18,11 +18,12 @@ package org.apache.camel.component.cxf; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; +import javax.xml.namespace.QName; + import org.apache.camel.CamelContext; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; @@ -42,7 +43,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @TestInstance(TestInstance.Lifecycle.PER_CLASS) -public class CXFWsdlOnlyTest extends CamelSpringTestSupport { +public class +CXFWsdlOnlyTest extends CamelSpringTestSupport { private static Endpoint endpoint1; private static Endpoint endpoint2; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java index 8c63fb1ed34..e0bbba496a2 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java @@ -16,9 +16,10 @@ */ package org.apache.camel.component.cxf; -import javax.xml.parsers.DocumentBuilderFactory; import jakarta.xml.ws.Endpoint; +import javax.xml.parsers.DocumentBuilderFactory; + import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java index 1216cb4c580..f935ab12230 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java @@ -18,9 +18,10 @@ package org.apache.camel.component.cxf; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; +import javax.xml.namespace.QName; + import org.apache.camel.CamelContext; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.non_wrapper.Person; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java index 98b3134827e..7b8ada2c688 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayloadProviderRouterTest.java @@ -16,10 +16,11 @@ */ package org.apache.camel.component.cxf; -import javax.xml.namespace.QName; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Service; +import javax.xml.namespace.QName; + import org.apache.camel.builder.RouteBuilder; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java index 614b825d8fa..400a622de01 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java @@ -19,9 +19,10 @@ package org.apache.camel.component.cxf; import java.lang.reflect.UndeclaredThrowableException; import java.net.URL; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; +import javax.xml.namespace.QName; + import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.test.spring.junit5.CamelSpringTestSupport; import org.apache.camel.wsdl_first.JaxwsTestHandler; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java index 9db3c60981c..c59011cc202 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ServiceProvider.java @@ -16,12 +16,13 @@ */ package org.apache.camel.component.cxf; -import javax.xml.transform.Source; import jakarta.xml.ws.Provider; import jakarta.xml.ws.Service.Mode; import jakarta.xml.ws.ServiceMode; import jakarta.xml.ws.WebServiceProvider; +import javax.xml.transform.Source; + @WebServiceProvider @ServiceMode(Mode.PAYLOAD) public class ServiceProvider implements Provider<Source> { diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java index 21a21cd8f0f..86e3d89cb1d 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/SoapTargetBean.java @@ -18,11 +18,12 @@ package org.apache.camel.component.cxf; import java.io.InputStream; -import javax.xml.namespace.QName; import jakarta.xml.soap.MessageFactory; import jakarta.xml.soap.SOAPBody; import jakarta.xml.soap.SOAPMessage; +import javax.xml.namespace.QName; + import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java index d10ce45dba5..02970b526aa 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java @@ -22,12 +22,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import jakarta.activation.DataHandler; -import jakarta.mail.util.ByteArrayDataSource; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.xpath.XPathConstants; +import jakarta.activation.DataHandler; +import jakarta.mail.util.ByteArrayDataSource; + import org.w3c.dom.Element; import org.apache.camel.CamelContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java index 2921c8ba6a2..5b4f6a26e2b 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java @@ -20,12 +20,13 @@ import java.awt.*; import java.net.URL; import java.util.List; -import javax.imageio.ImageIO; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Holder; import jakarta.xml.ws.soap.SOAPBinding; +import javax.imageio.ImageIO; +import javax.xml.namespace.QName; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.attachment.AttachmentMessage; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java index 19410ad12af..e5f2c9de5bf 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java @@ -22,6 +22,7 @@ import java.util.List; import jakarta.activation.DataHandler; import jakarta.mail.util.ByteArrayDataSource; + import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java index cf58612690c..13d1588197a 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java @@ -28,14 +28,15 @@ import java.util.Map; import jakarta.activation.DataHandler; import jakarta.activation.DataSource; import jakarta.annotation.Resource; -import javax.imageio.ImageIO; import jakarta.mail.util.ByteArrayDataSource; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; import jakarta.xml.ws.Holder; import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; +import javax.imageio.ImageIO; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; + import org.apache.camel.Exchange; import org.apache.camel.ExchangePattern; import org.apache.camel.Processor; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java index 44c3c6893e3..61e5976b894 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java @@ -19,11 +19,12 @@ package org.apache.camel.component.cxf.mtom; import java.awt.*; import java.awt.image.BufferedImage; -import javax.imageio.ImageIO; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; import jakarta.xml.ws.soap.SOAPBinding; +import javax.imageio.ImageIO; + import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.Processor; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java index 5079164410b..2a76c47177c 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java @@ -20,12 +20,13 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.net.URL; -import javax.imageio.ImageIO; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; import jakarta.xml.ws.soap.SOAPBinding; +import javax.imageio.ImageIO; + import org.apache.camel.CamelContext; import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.cxf.mtom_feature.Hello; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java index 9b310f2222b..9a93c27bf89 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java @@ -16,10 +16,11 @@ */ package org.apache.camel.component.cxf.multipart; -import javax.xml.namespace.QName; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Service; +import javax.xml.namespace.QName; + import org.apache.camel.component.cxf.common.CXFTestSupport; import org.apache.camel.cxf.multipart.MultiPartInvoke; import org.apache.camel.cxf.multipart.types.InE; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java index dc91560601e..76ee4abd6b0 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java @@ -27,13 +27,14 @@ import java.util.Map; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; -import javax.xml.namespace.QName; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; +import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; + import org.w3c.dom.Node; import org.apache.camel.CamelContext; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java index c69dd4d100f..60118c6e392 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java @@ -23,11 +23,12 @@ import jakarta.annotation.Resource; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; -import javax.xml.namespace.QName; import jakarta.xml.ws.Holder; import jakarta.xml.ws.WebServiceContext; import jakarta.xml.ws.handler.MessageContext; +import javax.xml.namespace.QName; + import org.w3c.dom.Node; import org.apache.cxf.headers.Header; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java index 00663b28d68..ca548810245 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java @@ -18,11 +18,12 @@ package org.apache.camel.wsdl_first; import java.util.Set; -import javax.xml.namespace.QName; import jakarta.xml.ws.handler.MessageContext; import jakarta.xml.ws.handler.soap.SOAPHandler; import jakarta.xml.ws.handler.soap.SOAPMessageContext; +import javax.xml.namespace.QName; + public class JaxwsTestHandler implements SOAPHandler<SOAPMessageContext> { private int faultCount; diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java index fb8e05845e7..806ed3f5c94 100644 --- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java +++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java @@ -19,11 +19,12 @@ package org.apache.camel.component.cxf.transport; import java.io.IOException; import java.io.InputStream; -import javax.xml.namespace.QName; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Holder; import jakarta.xml.ws.WebServiceException; +import javax.xml.namespace.QName; + import org.apache.camel.CamelContext; import org.apache.camel.NoSuchEndpointException; import org.apache.camel.RuntimeCamelException; diff --git a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java index ea75082ccd3..df1f55f9d16 100644 --- a/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java +++ b/components/camel-cxf/camel-cxf-spring-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java @@ -22,12 +22,13 @@ import jakarta.jws.WebMethod; import jakarta.jws.WebParam; import jakarta.jws.WebResult; import jakarta.jws.WebService; -import javax.xml.namespace.QName; import jakarta.xml.ws.AsyncHandler; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.Response; import jakarta.xml.ws.Service; +import javax.xml.namespace.QName; + import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.cxf.Bus; import org.apache.cxf.BusFactory;