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
commit 445029481751208ae8288307752213ed7a436a37 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Jan 12 07:19:51 2023 +0100 Fixed CS --- camel-dependencies/pom.xml | 2 +- .../camel/component/cometd/CometdProducer.java | 3 +- .../cloud/ConsulServiceCallWithRegistrationIT.java | 2 +- .../consul/cloud/ConsulServiceDiscoveryIT.java | 2 +- .../cloud/ConsulServiceRegistrationTestBase.java | 2 +- .../cxf/multipart/MultiPartInvokeImpl.java | 8 ++-- .../cxf/soap/headers/HeaderTesterImpl.java | 4 +- .../cxf/spring/jaxws/CxfSpringEndpoint.java | 3 +- .../cxf/spring/jaxws/CxfSpringEndpointUtils.java | 3 +- .../component/cxf/AbstractCxfWsdlFirstTest.java | 3 +- .../camel/component/cxf/CXFWsdlOnlyTest.java | 3 +- .../CxfConsumerPayloadFaultCauseEnabledTest.java | 3 +- .../camel/component/cxf/CxfOneWayRouteTest.java | 3 +- .../cxf/CxfPayLoadSoapHeaderSpringTest.java | 5 ++- .../cxf/mtom/CxfMtomConsumerPayloadModeTest.java | 6 +-- .../cxf/mtom/CxfMtomProducerPayloadModeTest.java | 7 +-- .../apache/camel/component/cxf/mtom/HelloImpl.java | 3 +- .../cxf/multipart/MultiPartInvokeImpl.java | 8 ++-- .../cxf/soap/headers/HeaderTesterImpl.java | 4 +- .../cxf/wssecurity/server/GreeterImpl.java | 6 +-- .../org/apache/camel/http/common/HttpBinding.java | 4 +- .../common/ServletResolveConsumerStrategy.java | 3 +- .../camel/converter/jaxb/address/package-info.java | 2 +- .../camel/converter/jaxb/person/package-info.java | 2 +- .../component/jclouds/JcloudsBlobStoreHelper.java | 1 + .../camel/component/jms/JmsMessageHelper.java | 6 +-- .../jms/JmsFormatDateHeadersToIso8601Test.java | 2 +- .../component/jms/ManagedJmsSelectorTest.java | 1 + .../component/jmx/NotificationXmlFormatter.java | 7 +-- .../camel/component/mail/JavaMailSender.java | 2 +- .../camel/component/mail/MailConfiguration.java | 1 + .../apache/camel/component/mail/MailSorter.java | 8 ++-- .../camel/component/rest/openapi/HttpsTest.java | 5 ++- .../camel/component/rest/openapi/HttpsV3Test.java | 5 ++- .../camel/component/rest/swagger/HttpsTest.java | 5 ++- .../component/salesforce/SalesforceConsumer.java | 2 +- .../salesforce/api/dto/bulk/BatchInfo.java | 1 + .../component/salesforce/api/dto/bulk/JobInfo.java | 1 + .../salesforce/api/dto/bulk/ObjectFactory.java | 1 + .../salesforce/api/dto/bulk/package-info.java | 2 +- .../internal/client/DefaultBulkApiClient.java | 1 + .../internal/client/SalesforceSecurityHandler.java | 1 - .../salesforce/HttpProxyIntegrationTest.java | 1 - .../component/servicenow/ServiceNowClient.java | 3 +- .../camel/component/sjms/jms/JmsMessageHelper.java | 12 +++--- .../dataformat/soap/Soap11DataFormatAdapter.java | 3 +- .../dataformat/soap/Soap12DataFormatAdapter.java | 3 +- .../camel/dataformat/soap/SoapDataFormat.java | 1 + .../soap/name/ServiceInterfaceStrategy.java | 3 +- .../dataformat/soap/name/TypeNameStrategy.java | 1 + ...mlRootElementPreferringElementNameStrategy.java | 1 + ...otElementPreferringElementNameStrategyTest.java | 1 + .../spring/ws/SpringWebserviceConsumer.java | 3 +- .../spring/ws/filter/impl/BasicMessageFilter.java | 1 + .../net/javacrumbs/calc/model/package-info.java | 2 +- .../ws/filter/impl/BasicMessageFilterTest.java | 1 + .../component/spring/ws/jaxb/package-info.java | 2 +- .../org/apache/camel/spring/xml/package-info.java | 2 +- .../camel/spring/rmi/RmiRegistryFactoryBean.java | 50 +++++++++++----------- .../java/org/apache/camel/spring/package-info.java | 2 +- .../component/stax/StAXJAXBIteratorExpression.java | 3 +- .../main/java/org/apache/camel/package-info.java | 2 +- .../org/apache/camel/model/cloud/package-info.java | 2 +- .../apache/camel/model/config/package-info.java | 2 +- .../camel/model/dataformat/package-info.java | 2 +- .../camel/model/errorhandler/package-info.java | 2 +- .../apache/camel/model/language/package-info.java | 2 +- .../camel/model/loadbalancer/package-info.java | 2 +- .../java/org/apache/camel/model/package-info.java | 2 +- .../org/apache/camel/model/rest/package-info.java | 2 +- .../camel/model/transformer/package-info.java | 2 +- .../apache/camel/model/validator/package-info.java | 2 +- .../org/apache/camel/core/xml/package-info.java | 2 +- .../camel/core/xml/util/jsse/package-info.java | 4 +- .../java/org/apache/camel/util/SensitiveUtils.java | 2 +- .../org/apache/camel/itest/CamelJmsTestHelper.java | 3 -- .../camel/itest/security/GreeterClientTest.java | 3 +- .../camel/itest/utils/extensions/GreeterImpl.java | 6 +-- .../camel/maven/packaging/PrepareCatalogMojo.java | 6 ++- 79 files changed, 159 insertions(+), 127 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index c10190a4724..490c5380eff 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -245,7 +245,7 @@ <ical4j-version>1.0.7</ical4j-version> <icu4j-version>72.1</icu4j-version> <ignite-version>2.12.0</ignite-version> - <impsort-maven-plugin-version>1.6.0</impsort-maven-plugin-version> + <impsort-maven-plugin-version>1.8.0</impsort-maven-plugin-version> <infinispan-version>14.0.4.Final</infinispan-version> <influx-java-driver-version>2.22</influx-java-driver-version> <influx-client-java-driver-version>6.7.0</influx-client-java-driver-version> diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java index 9be07be9efb..b9750bf502b 100644 --- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java +++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java @@ -108,7 +108,8 @@ public class CometdProducer extends DefaultProducer implements CometdProducerCon logDelivery(exchange, channel); ServerMessage.Mutable mutable = binding.createCometdMessage(channel, serverSession, exchange.getIn()); - channel.publish(serverSession, mutable, new org.cometd.bayeux.Promise<>() {}); + channel.publish(serverSession, mutable, new org.cometd.bayeux.Promise<>() { + }); } } finally { if (disconnectLocalSession && serverSession.isLocalSession()) { diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java index 1e371c7cc1d..2e2b513c0ae 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceCallWithRegistrationIT.java @@ -23,8 +23,8 @@ import org.apache.camel.CamelExecutionException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.consul.ConsulTestSupport; import org.apache.camel.impl.cloud.ServiceRegistrationRoutePolicy; -import org.junit.jupiter.api.Test; import org.apache.camel.test.AvailablePortFinder; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java index 793cbced40d..4a283c43632 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceDiscoveryIT.java @@ -28,9 +28,9 @@ import org.apache.camel.cloud.ServiceDefinition; import org.apache.camel.cloud.ServiceDiscovery; import org.apache.camel.component.consul.ConsulConfiguration; import org.apache.camel.component.consul.ConsulTestSupport; +import org.apache.camel.test.AvailablePortFinder; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; -import org.apache.camel.test.AvailablePortFinder; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java index 6ab9cebace7..f9a6189d585 100644 --- a/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java +++ b/components/camel-consul/src/test/java/org/apache/camel/component/consul/cloud/ConsulServiceRegistrationTestBase.java @@ -28,8 +28,8 @@ import com.orbitz.consul.model.health.ServiceHealth; import org.apache.camel.CamelContext; import org.apache.camel.cloud.ServiceDefinition; import org.apache.camel.component.consul.ConsulTestSupport; -import org.junit.jupiter.api.Test; import org.apache.camel.test.AvailablePortFinder; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java index 6953894eedd..3c0e3313d2e 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java @@ -24,10 +24,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @jakarta.jws.WebService( - serviceName = "MultiPartInvokeService", - portName = "MultiPartInvokePort", - targetNamespace = "http://adapter.ti.tongtech.com/ws", - endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke") + serviceName = "MultiPartInvokeService", + portName = "MultiPartInvokePort", + targetNamespace = "http://adapter.ti.tongtech.com/ws", + endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke") public class MultiPartInvokeImpl implements MultiPartInvoke { 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 60118c6e392..abda5c19416 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 @@ -39,8 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @jakarta.jws.WebService(serviceName = "HeaderService", - targetNamespace = "http://apache.org/camel/cxf/soap/headers", - endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") + targetNamespace = "http://apache.org/camel/cxf/soap/headers", + endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") public class HeaderTesterImpl implements HeaderTester { private static final Logger LOG = LoggerFactory.getLogger(HeaderTesterImpl.class); diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java index acee9bd4171..fb749943b99 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpoint.java @@ -16,9 +16,10 @@ */ package org.apache.camel.component.cxf.spring.jaxws; -import javax.xml.namespace.QName; import jakarta.xml.ws.Provider; +import javax.xml.namespace.QName; + import org.apache.camel.CamelContext; import org.apache.camel.component.cxf.common.DataFormat; import org.apache.camel.component.cxf.common.message.CxfConstants; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java index 5d4d41fa846..9be1881fad3 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/main/java/org/apache/camel/component/cxf/spring/jaxws/CxfSpringEndpointUtils.java @@ -19,9 +19,10 @@ package org.apache.camel.component.cxf.spring.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-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java index 7f6aaee8f92..be60da3d97b 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java @@ -20,11 +20,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.Holder; import jakarta.xml.ws.WebServiceException; +import javax.xml.namespace.QName; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.component.cxf.common.CXFTestSupport; 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 79e33256dce..239ad5a8068 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 @@ -43,8 +43,7 @@ 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/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java index ffbd25f865a..26467401aaf 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java @@ -19,12 +19,13 @@ package org.apache.camel.component.cxf; import java.net.URL; import java.util.ResourceBundle; -import javax.xml.namespace.QName; import jakarta.xml.soap.SOAPFault; 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.Processor; import org.apache.camel.builder.RouteBuilder; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java index d840e53427c..0f73b0646a9 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfOneWayRouteTest.java @@ -18,9 +18,10 @@ package org.apache.camel.component.cxf; import java.io.ByteArrayOutputStream; -import javax.xml.namespace.QName; import jakarta.xml.ws.Service; +import javax.xml.namespace.QName; + 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/CxfPayLoadSoapHeaderSpringTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java index 24b64442945..a4749e7d517 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderSpringTest.java @@ -19,11 +19,12 @@ package org.apache.camel.component.cxf; import java.net.URL; import java.util.List; +import jakarta.xml.ws.BindingProvider; +import jakarta.xml.ws.Endpoint; + 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 org.w3c.dom.Element; 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 02970b526aa..0ef9d982013 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,13 +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/CxfMtomProducerPayloadModeTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java index 103fefa861f..1586ed17829 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java @@ -25,12 +25,13 @@ import java.util.List; import java.util.Map; import jakarta.activation.DataHandler; -import javax.imageio.ImageIO; import jakarta.mail.util.ByteArrayDataSource; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; import jakarta.xml.ws.Endpoint; import jakarta.xml.ws.soap.SOAPBinding; + +import javax.imageio.ImageIO; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; import javax.xml.xpath.XPathConstants; import org.w3c.dom.Element; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java index 071c9266d67..4df762c202c 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/mtom/HelloImpl.java @@ -20,9 +20,10 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; -import javax.imageio.ImageIO; import jakarta.xml.ws.Holder; +import javax.imageio.ImageIO; + import org.apache.camel.cxf.mtom_feature.Hello; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java index 6953894eedd..3c0e3313d2e 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java @@ -24,10 +24,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @jakarta.jws.WebService( - serviceName = "MultiPartInvokeService", - portName = "MultiPartInvokePort", - targetNamespace = "http://adapter.ti.tongtech.com/ws", - endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke") + serviceName = "MultiPartInvokeService", + portName = "MultiPartInvokePort", + targetNamespace = "http://adapter.ti.tongtech.com/ws", + endpointInterface = "org.apache.camel.cxf.multipart.MultiPartInvoke") public class MultiPartInvokeImpl implements MultiPartInvoke { 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 60118c6e392..abda5c19416 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 @@ -39,8 +39,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @jakarta.jws.WebService(serviceName = "HeaderService", - targetNamespace = "http://apache.org/camel/cxf/soap/headers", - endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") + targetNamespace = "http://apache.org/camel/cxf/soap/headers", + endpointInterface = "org.apache.camel.component.cxf.soap.headers.HeaderTester") public class HeaderTesterImpl implements HeaderTester { private static final Logger LOG = LoggerFactory.getLogger(HeaderTesterImpl.class); diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java index 078c1ed2c46..8e9a29db94f 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/wssecurity/server/GreeterImpl.java @@ -21,9 +21,9 @@ import java.util.logging.Logger; import org.apache.camel.hello_world_soap_http.Greeter; @jakarta.jws.WebService(serviceName = "GreeterService", - portName = "GreeterPort", - endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter", - targetNamespace = "http://camel.apache.org/hello_world_soap_http") + portName = "GreeterPort", + endpointInterface = "org.apache.camel.hello_world_soap_http.Greeter", + targetNamespace = "http://camel.apache.org/hello_world_soap_http") public class GreeterImpl implements Greeter { diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java index 51b51c87e65..ca380f0a3c2 100644 --- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java +++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpBinding.java @@ -106,8 +106,8 @@ public interface HttpBinding { boolean isUseReaderForPayload(); /** - * Should the {@link jakarta.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input messages - * in the Camel {@link org.apache.camel.Message#getBody()} or not. If false then the + * Should the {@link jakarta.servlet.http.HttpServletRequest#getReader()} be exposed as the payload of input + * messages in the Camel {@link org.apache.camel.Message#getBody()} or not. If false then the * {@link jakarta.servlet.http.HttpServletRequest#getInputStream()} will be exposed. * <p/> * Is default <tt>false</tt>. diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java index 7bdf565b787..beeea13e723 100644 --- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java +++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/ServletResolveConsumerStrategy.java @@ -42,7 +42,8 @@ public interface ServletResolveConsumerStrategy { * @param method the http method * @param consumers the map of registered consumers * @return <tt>true</tt> if the method is allowed and can be serviced. Otherwise a - * {@link jakarta.servlet.http.HttpServletResponse#SC_METHOD_NOT_ALLOWED} is returned to the client. + * {@link jakarta.servlet.http.HttpServletResponse#SC_METHOD_NOT_ALLOWED} is returned to the + * client. */ boolean isHttpMethodAllowed(HttpServletRequest request, String method, Map<String, HttpConsumer> consumers); diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java index 36f090bb16c..3be45fcecf7 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/address/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "address.jaxb.converter.camel.apache.org", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.converter.jaxb.address; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java index f618959e212..5bc53c6504c 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/person/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "person.jaxb.converter.camel.apache.org", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.converter.jaxb.person; diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java index eb18804e309..7f294b97a74 100644 --- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java +++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java @@ -32,6 +32,7 @@ import static org.jclouds.blobstore.options.PutOptions.Builder.multipart; public final class JcloudsBlobStoreHelper { private static final String APPLICATION_OCTET_STREAM = "application/octet-stream"; + private JcloudsBlobStoreHelper() { //Utility Class } diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java index 4a4dadc42a9..e18b19cb5d1 100644 --- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java +++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java @@ -384,9 +384,9 @@ public final class JmsMessageHelper { /** * Sets the JMSDeliveryMode on the message. * - * @param exchange the exchange - * @param message the message - * @param deliveryMode the delivery mode, either as a String or integer + * @param exchange the exchange + * @param message the message + * @param deliveryMode the delivery mode, either as a String or integer * @throws jakarta.jms.JMSException is thrown if error setting the delivery mode */ public static void setJMSDeliveryMode(Exchange exchange, Message message, Object deliveryMode) throws JMSException { diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java index 1e4c15b8d1b..d2de5c4fbc4 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFormatDateHeadersToIso8601Test.java @@ -23,8 +23,8 @@ import jakarta.jms.ConnectionFactory; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.infra.activemq.services.LegacyEmbeddedBroker; +import org.apache.camel.test.infra.artemis.common.ConnectionFactoryHelper; import org.apache.camel.test.junit5.CamelTestSupport; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java index 085c80d9260..0a0a503408e 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsSelectorTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.jms; import java.util.Set; import jakarta.jms.ConnectionFactory; + import javax.management.Attribute; import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/NotificationXmlFormatter.java b/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/NotificationXmlFormatter.java index 2178c6f7757..da4131dda79 100644 --- a/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/NotificationXmlFormatter.java +++ b/components/camel-jmx/src/main/java/org/apache/camel/component/jmx/NotificationXmlFormatter.java @@ -22,6 +22,10 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.List; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; + import javax.management.AttributeChangeNotification; import javax.management.MBeanServerNotification; import javax.management.Notification; @@ -30,9 +34,6 @@ import javax.management.monitor.MonitorNotification; import javax.management.relation.RelationNotification; import javax.management.remote.JMXConnectionNotification; import javax.management.timer.TimerNotification; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBException; -import jakarta.xml.bind.Marshaller; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java index b3b419b916f..598859eb9ad 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/JavaMailSender.java @@ -31,7 +31,7 @@ public interface JavaMailSender { /** * Send the mail * - * @param mimeMessage the message to send + * @param mimeMessage the message to send * @throws jakarta.mail.MessagingException is thrown if error sending the mail. */ void send(MimeMessage mimeMessage) throws MessagingException; diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java index 7959ec3b1b6..9e9ef2dc716 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConfiguration.java @@ -24,6 +24,7 @@ import java.util.Properties; import jakarta.mail.Message; import jakarta.mail.PasswordAuthentication; import jakarta.mail.Session; + import javax.net.ssl.SSLContext; import org.apache.camel.CamelContext; diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java index dbf1e62851f..2ebb98d89cd 100644 --- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java +++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailSorter.java @@ -107,10 +107,10 @@ public final class MailSorter { /** * Compare the value of the property of the two messages. * - * @param msg1 Message 1 - * @param msg2 Message 2 - * @param property Property to compare - * @return msg1.property.compareTo(msg2.property) + * @param msg1 Message 1 + * @param msg2 Message 2 + * @param property Property to compare + * @return msg1.property.compareTo(msg2.property) * @throws jakarta.mail.MessagingException If message data could not be read. */ private static int compareMessageProperty(Message msg1, Message msg2, SortTerm property) throws MessagingException { diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java index fbba235739d..0b379eb739b 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsTest.java @@ -27,11 +27,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Marshaller; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; + import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.common.HttpsSettings; import com.google.common.io.Resources; diff --git a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java index 7771f5e5a3b..89adda64fd6 100644 --- a/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java +++ b/components/camel-rest-openapi/src/test/java/org/apache/camel/component/rest/openapi/HttpsV3Test.java @@ -27,11 +27,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Marshaller; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; + import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.common.HttpsSettings; import com.google.common.io.Resources; diff --git a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java index 3ad3b0c2a54..b1497059e06 100644 --- a/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java +++ b/components/camel-rest-swagger/src/test/java/org/apache/camel/component/rest/swagger/HttpsTest.java @@ -27,11 +27,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.Marshaller; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; + import com.github.tomakehurst.wiremock.WireMockServer; import com.github.tomakehurst.wiremock.common.HttpsSettings; import com.google.common.io.Resources; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java index 71ce21726e0..8f361a66a8c 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java @@ -171,7 +171,7 @@ public class SalesforceConsumer extends DefaultConsumer { if (rawPayload) { // getJSON is used for raw payload in.setBody(new org.cometd.common.JacksonJSONContextClient() - .generate(new org.cometd.common.HashMapMessage(message))); + .generate(new org.cometd.common.HashMapMessage(message))); } else { payload.remove("ChangeEventHeader"); in.setBody(payload); diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java index 242ebaba5d4..d7fd54c53f1 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/BatchInfo.java @@ -21,6 +21,7 @@ import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; + import javax.xml.datatype.XMLGregorianCalendar; /** diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java index 9b97e1c2e67..4c9035c9827 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/JobInfo.java @@ -20,6 +20,7 @@ import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; + import javax.xml.datatype.XMLGregorianCalendar; /** diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java index 34bbbacbaa8..47b9cd2f739 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/ObjectFactory.java @@ -19,6 +19,7 @@ package org.apache.camel.component.salesforce.api.dto.bulk; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlElementDecl; import jakarta.xml.bind.annotation.XmlRegistry; + import javax.xml.namespace.QName; /** diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java index 512fa6ea1a1..cfc5897582e 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/api/dto/bulk/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.force.com/2009/06/asyncapi/dataload", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.component.salesforce.api.dto.bulk; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java index d2d86630098..1567172b22f 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultBulkApiClient.java @@ -29,6 +29,7 @@ import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; + import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java index fd5f3380327..a16d69bf08a 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java +++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/SalesforceSecurityHandler.java @@ -36,7 +36,6 @@ import org.eclipse.jetty.client.api.Response; import org.eclipse.jetty.client.api.Result; import org.eclipse.jetty.client.util.BufferingResponseListener; import org.eclipse.jetty.http.HttpField; -import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; import org.eclipse.jetty.http.HttpStatus; import org.slf4j.Logger; diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java index 5640deb4815..000a817337b 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java +++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java @@ -34,7 +34,6 @@ import org.apache.camel.test.junit5.params.Test; import org.eclipse.jetty.proxy.ConnectHandler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.util.StringUtil; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.slf4j.Logger; diff --git a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java index dcced685769..85ff2116ecc 100644 --- a/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java +++ b/components/camel-servicenow/camel-servicenow-component/src/main/java/org/apache/camel/component/servicenow/ServiceNowClient.java @@ -22,10 +22,11 @@ import java.util.Arrays; import java.util.Map; import java.util.function.Function; -import javax.net.ssl.SSLContext; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import javax.net.ssl.SSLContext; + import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import org.apache.camel.CamelContext; import org.apache.camel.Message; diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java index da00c2102c5..43e8a741dbb 100644 --- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java +++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/JmsMessageHelper.java @@ -42,9 +42,9 @@ public final class JmsMessageHelper { /** * Removes the property from the JMS message. * - * @param jmsMessage the JMS message - * @param name name of the property to remove - * @return the old value of the property or <tt>null</tt> if not exists + * @param jmsMessage the JMS message + * @param name name of the property to remove + * @return the old value of the property or <tt>null</tt> if not exists * @throws jakarta.jms.JMSException can be thrown */ public static Object removeJmsProperty(Message jmsMessage, String name) throws JMSException { @@ -347,9 +347,9 @@ public final class JmsMessageHelper { /** * Sets the JMSDeliveryMode on the message. * - * @param exchange the exchange - * @param message the message - * @param deliveryMode the delivery mode, either as a String or integer + * @param exchange the exchange + * @param message the message + * @param deliveryMode the delivery mode, either as a String or integer * @throws jakarta.jms.JMSException is thrown if error setting the delivery mode */ public static void setJMSDeliveryMode(Exchange exchange, Message message, Object deliveryMode) throws JMSException { diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java index 4be55627cc7..16c6a1074a7 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap11DataFormatAdapter.java @@ -26,12 +26,13 @@ import java.util.List; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBIntrospector; -import javax.xml.namespace.QName; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPFactory; import jakarta.xml.ws.WebFault; import jakarta.xml.ws.soap.SOAPFaultException; +import javax.xml.namespace.QName; + import org.apache.camel.Exchange; import org.apache.camel.ExchangePropertyKey; import org.apache.camel.RuntimeCamelException; diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java index d5fdbc24ca6..25f95f9792b 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/Soap12DataFormatAdapter.java @@ -26,12 +26,13 @@ import java.util.List; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBIntrospector; -import javax.xml.namespace.QName; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPFactory; import jakarta.xml.ws.WebFault; import jakarta.xml.ws.soap.SOAPFaultException; +import javax.xml.namespace.QName; + import org.apache.camel.Exchange; import org.apache.camel.ExchangePropertyKey; import org.apache.camel.RuntimeCamelException; diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java index d2e880b3d37..878e5368bc9 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapDataFormat.java @@ -26,6 +26,7 @@ import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.JAXBIntrospector; + import javax.xml.namespace.QName; import org.apache.camel.Exchange; diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java index 2c5d615947b..764ea5b12ea 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java @@ -27,11 +27,12 @@ import java.util.Map; import jakarta.jws.WebMethod; import jakarta.jws.WebParam; import jakarta.jws.WebResult; -import javax.xml.namespace.QName; import jakarta.xml.ws.RequestWrapper; import jakarta.xml.ws.ResponseWrapper; import jakarta.xml.ws.WebFault; +import javax.xml.namespace.QName; + import org.apache.camel.RuntimeCamelException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/TypeNameStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/TypeNameStrategy.java index e0ee41a3e9a..e9be8abb3ad 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/TypeNameStrategy.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/TypeNameStrategy.java @@ -19,6 +19,7 @@ package org.apache.camel.dataformat.soap.name; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchema; import jakarta.xml.bind.annotation.XmlType; + import javax.xml.namespace.QName; import org.apache.camel.util.ObjectHelper; diff --git a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/XmlRootElementPreferringElementNameStrategy.java b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/XmlRootElementPreferringElementNameStrategy.java index 4c943fc4536..23ac039f8bd 100644 --- a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/XmlRootElementPreferringElementNameStrategy.java +++ b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/XmlRootElementPreferringElementNameStrategy.java @@ -19,6 +19,7 @@ package org.apache.camel.dataformat.soap.name; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlSchema; import jakarta.xml.bind.annotation.XmlType; + import javax.xml.namespace.QName; import org.apache.camel.util.ObjectHelper; diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java index 84d083bbdf9..64b8247ff85 100644 --- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java +++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/XmlRootElementPreferringElementNameStrategyTest.java @@ -20,6 +20,7 @@ import java.io.Serializable; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; + import javax.xml.namespace.QName; import org.apache.camel.converter.soap.name.testpackage.RequestWithDefaultNs; diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java index 65dd4c4ab07..52d2c4776d3 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConsumer.java @@ -20,9 +20,10 @@ import java.util.Iterator; import java.util.Map; import jakarta.servlet.http.HttpServletRequest; -import javax.xml.namespace.QName; import jakarta.xml.soap.MimeHeaders; import jakarta.xml.soap.SOAPMessage; + +import javax.xml.namespace.QName; import javax.xml.transform.Source; import org.apache.camel.Endpoint; diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java index dcc76381566..ad624eb87de 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilter.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Set; import jakarta.activation.DataHandler; + import javax.xml.namespace.QName; import org.apache.camel.Exchange; diff --git a/components/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java b/components/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java index 6ca2b09ef24..3734549ee1d 100644 --- a/components/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java +++ b/components/camel-spring-ws/src/test/java/net/javacrumbs/calc/model/package-info.java @@ -23,5 +23,5 @@ // @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://javacrumbs.net/calc", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package net.javacrumbs.calc.model; diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java index 02dc13e932e..edf88be8631 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/filter/impl/BasicMessageFilterTest.java @@ -17,6 +17,7 @@ package org.apache.camel.component.spring.ws.filter.impl; import jakarta.activation.DataHandler; + import javax.xml.namespace.QName; import org.apache.camel.attachment.AttachmentMessage; diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java index 12efae56653..4b0c0e35b48 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/jaxb/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.stockquotes.edu/", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.component.spring.ws.jaxb; diff --git a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java index 1e047fdb22b..c77d2653fcf 100644 --- a/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java +++ b/components/camel-spring-xml/src/main/java/org/apache/camel/spring/xml/package-info.java @@ -15,5 +15,5 @@ * limitations under the License. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.spring.xml; diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/rmi/RmiRegistryFactoryBean.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/rmi/RmiRegistryFactoryBean.java index 880157c08b9..3930463d949 100644 --- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/rmi/RmiRegistryFactoryBean.java +++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/rmi/RmiRegistryFactoryBean.java @@ -110,19 +110,20 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi this.registry = getRegistry(this.host, this.port, this.clientSocketFactory, this.serverSocketFactory); } - /** * Locate or create the RMI registry. - * @param registryHost the registry host to use (if this is specified, - * no implicit creation of a RMI registry will happen) - * @param registryPort the registry port to use - * @param clientSocketFactory the RMI client socket factory for the registry (if any) - * @param serverSocketFactory the RMI server socket factory for the registry (if any) - * @return the RMI registry + * + * @param registryHost the registry host to use (if this is specified, no implicit creation of a RMI + * registry will happen) + * @param registryPort the registry port to use + * @param clientSocketFactory the RMI client socket factory for the registry (if any) + * @param serverSocketFactory the RMI server socket factory for the registry (if any) + * @return the RMI registry * @throws java.rmi.RemoteException if the registry couldn't be located or created */ - protected Registry getRegistry(String registryHost, int registryPort, - RMIClientSocketFactory clientSocketFactory, RMIServerSocketFactory serverSocketFactory) + protected Registry getRegistry( + String registryHost, int registryPort, + RMIClientSocketFactory clientSocketFactory, RMIServerSocketFactory serverSocketFactory) throws RemoteException { if (registryHost != null) { @@ -140,11 +141,12 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi /** * Locate or create the RMI registry. - * @param registryPort the registry port to use - * @param clientSocketFactory the RMI client socket factory for the registry (if any) - * @param serverSocketFactory the RMI server socket factory for the registry (if any) - * @return the RMI registry - * @throws RemoteException if the registry couldn't be located or created + * + * @param registryPort the registry port to use + * @param clientSocketFactory the RMI client socket factory for the registry (if any) + * @param serverSocketFactory the RMI server socket factory for the registry (if any) + * @return the RMI registry + * @throws RemoteException if the registry couldn't be located or created */ protected Registry getRegistry( int registryPort, RMIClientSocketFactory clientSocketFactory, RMIServerSocketFactory serverSocketFactory) @@ -180,8 +182,9 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi /** * Locate or create the RMI registry. - * @param registryPort the registry port to use - * @return the RMI registry + * + * @param registryPort the registry port to use + * @return the RMI registry * @throws RemoteException if the registry couldn't be located or created */ protected Registry getRegistry(int registryPort) throws RemoteException { @@ -210,18 +213,18 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi } /** - * Test the given RMI registry, calling some operation on it to - * check whether it is still active. - * <p>Default implementation calls <code>Registry.list()</code>. - * @param registry the RMI registry to test + * Test the given RMI registry, calling some operation on it to check whether it is still active. + * <p> + * Default implementation calls <code>Registry.list()</code>. + * + * @param registry the RMI registry to test * @throws RemoteException if thrown by registry methods - * @see java.rmi.registry.Registry#list() + * @see java.rmi.registry.Registry#list() */ protected void testRegistry(Registry registry) throws RemoteException { registry.list(); } - public Registry getObject() throws Exception { return this.registry; } @@ -235,8 +238,7 @@ public class RmiRegistryFactoryBean implements FactoryBean<Registry>, Initializi } /** - * Unexport the RMI registry on bean factory shutdown, - * provided that this bean actually created a registry. + * Unexport the RMI registry on bean factory shutdown, provided that this bean actually created a registry. */ public void destroy() throws RemoteException { if (this.created) { diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java b/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java index 11be58a1803..28c8ff7c697 100644 --- a/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java +++ b/components/camel-spring/src/main/java/org/apache/camel/spring/package-info.java @@ -18,5 +18,5 @@ * The classes for working with Camel and Spring along with the primary factory beans. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.spring; diff --git a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java index d220a998c73..7d5afd909ef 100644 --- a/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java +++ b/components/camel-stax/src/main/java/org/apache/camel/component/stax/StAXJAXBIteratorExpression.java @@ -22,10 +22,11 @@ import java.io.InputStream; import java.util.Iterator; import java.util.Map; -import javax.xml.XMLConstants; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Unmarshaller; + +import javax.xml.XMLConstants; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; diff --git a/core/camel-api/src/main/java/org/apache/camel/package-info.java b/core/camel-api/src/main/java/org/apache/camel/package-info.java index 76e93b2f1af..7b279bbee92 100644 --- a/core/camel-api/src/main/java/org/apache/camel/package-info.java +++ b/core/camel-api/src/main/java/org/apache/camel/package-info.java @@ -18,5 +18,5 @@ * The core Camel API. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/package-info.java index 7a0d7885d0b..1f367626f67 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/cloud/package-info.java @@ -19,5 +19,5 @@ * The JAXB POJOs for the remote service call DSL */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.cloud; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java index 46cad07bfb5..b1dfb0b7bae 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/config/package-info.java @@ -19,5 +19,5 @@ * Configuration</a> of the routing rules. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.config; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java index 7dc9a9cb95d..ba82f51939b 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/package-info.java @@ -19,5 +19,5 @@ * unmarshal objects to and from streams inside <a href="http://camel.apache.org/components.html">components</a> */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.dataformat; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java index 4725577562f..c95be1ced79 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/errorhandler/package-info.java @@ -18,5 +18,5 @@ * The JAXB POJOs for the <a href="https://camel.apache.org/manual/error-handler.html">Error Handler</a>. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.errorhandler; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java index 5d013d99eb9..c5f48122423 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/package-info.java @@ -20,5 +20,5 @@ * <a href="http://camel.apache.org/xml-configuration.html">XML Configuration</a>. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.language; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java index 8e925cc372d..a28a9584276 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/package-info.java @@ -20,5 +20,5 @@ * <a href="http://camel.apache.org/xml-configuration.html">XML Configuration</a>. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.loadbalancer; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java index fa39dbddee8..9adf5ec265a 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/package-info.java @@ -19,5 +19,5 @@ * rules. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java index 40fbf3576e8..8dfb6449b61 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/package-info.java @@ -19,5 +19,5 @@ * The JAXB POJOs for the REST DSL */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.rest; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java index 90d61bf6978..54b13e99842 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/package-info.java @@ -19,5 +19,5 @@ * contents according to declared data types inside <a href="http://camel.apache.org/components.html">components</a> */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.transformer; diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java index cbc9eb2e3bc..fe194b5b94c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/package-info.java @@ -19,5 +19,5 @@ * contents according to declared data types inside <a href="http://camel.apache.org/components.html">components</a> */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.model.validator; diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java index bb1a4367203..a2305b578cb 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/package-info.java @@ -18,5 +18,5 @@ * The classes for working with Camel and XML along with the primary factory beans. */ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.core.xml; diff --git a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java index 452b0ec8fba..55f91d28f0c 100644 --- a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java +++ b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/package-info.java @@ -15,6 +15,6 @@ * limitations under the License. */ @jakarta.xml.bind.annotation.XmlSchema( - namespace = "http://camel.apache.org/schema/spring", - elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) + namespace = "http://camel.apache.org/schema/spring", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.camel.core.xml.util.jsse; diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index d3889ad8cac..889a4f1c3dc 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -174,7 +174,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" - // SENSITIVE-PATTERN: END + // SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java index 9a8a02a10a2..41253f7a2a1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java @@ -16,13 +16,10 @@ */ package org.apache.camel.itest; -import java.io.File; import java.util.concurrent.atomic.AtomicInteger; import jakarta.jms.ConnectionFactory; -import org.apache.camel.util.FileUtil; - /** * A helper for unit testing with Apache ActiveMQ as embedded JMS broker. */ diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java index d81e2edd4b6..104a5e8ed55 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java @@ -21,10 +21,11 @@ import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; -import javax.xml.namespace.QName; import jakarta.xml.ws.BindingProvider; import jakarta.xml.ws.soap.SOAPFaultException; +import javax.xml.namespace.QName; + import org.apache.camel.CamelContext; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.spring.junit5.CamelSpringTest; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java index 8c45ab0b6f3..a9f2c167d61 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/utils/extensions/GreeterImpl.java @@ -23,9 +23,9 @@ import org.apache.hello_world_soap_http.PingMeFault; import org.apache.hello_world_soap_http.types.FaultDetail; @jakarta.jws.WebService(portName = "SoapOverHttp", serviceName = "SOAPService", - targetNamespace = "http://apache.org/hello_world_soap_http", - endpointInterface = "org.apache.hello_world_soap_http.Greeter", - wsdlLocation = "wsdl/hello_world.wsdl") + targetNamespace = "http://apache.org/hello_world_soap_http", + endpointInterface = "org.apache.hello_world_soap_http.Greeter", + wsdlLocation = "wsdl/hello_world.wsdl") public class GreeterImpl implements Greeter { diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java index f65bd53e63b..36bcccf688c 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java @@ -230,8 +230,10 @@ public class PrepareCatalogMojo extends AbstractMojo { .filter(dir -> { String d = dir.getFileName().toString(); // TODO: camel4 these are not yet working - boolean bad = "camel-activemq".equals(d) || "camel-johnzon".equals(d) || "camel-stomp".equals(d) || "camel-websocket".equals(d); - return !bad;}) + boolean bad = "camel-activemq".equals(d) || "camel-johnzon".equals(d) || "camel-stomp".equals(d) + || "camel-websocket".equals(d); + return !bad; + }) .flatMap(p -> getComponentPath(p).stream()) .filter(dir -> Files.isDirectory(dir.resolve("src"))) .map(p -> p.resolve("target/classes"))