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 e27d0b06419 Fixed CS
e27d0b06419 is described below
commit e27d0b06419fbbd9c5f2a9f8c90850c80779b680
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jan 12 06:44:06 2023 +0100
Fixed CS
---
.../component/cxf/converter/CxfConverter.java | 3 +-
.../camel/component/cxf/jaxrs/CxfConverter.java | 3 +-
.../component/cxf/jaxrs/DefaultCxfRsBinding.java | 3 +-
.../cxf/transport/JaxWSCamelTestSupport.java | 3 +-
.../converter/jaxb/FallbackTypeConverter.java | 1 +
.../camel/converter/jaxb/JaxbDataFormat.java | 3 +-
.../jaxb/mapper/DefaultNamespacePrefixMapper.java | 2 +-
.../converter/jaxb/message/ObjectFactory.java | 1 +
.../org/apache/camel/foo/bar/ObjectFactory.java | 1 +
.../camel/component/jetty/JettyHttpComponent.java | 3 +-
.../camel/component/jetty/rest/MyLoginService.java | 3 +-
.../camel/spring/rmi/RmiRegistryFactoryBean.java | 53 +++++++++++++---------
.../camel/model/language/XPathExpression.java | 2 +
.../AbstractKeyManagersParametersFactoryBean.java | 3 +-
...AbstractTrustManagersParametersFactoryBean.java | 3 +-
.../camel/xml/jaxb/JaxbModelToXMLDumper.java | 2 +
.../infra/jetty/services/JettyConfiguration.java | 3 +-
17 files changed, 59 insertions(+), 33 deletions(-)
diff --git
a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
index 3944bfeabb1..22839302065 100644
---
a/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
+++
b/components/camel-cxf/camel-cxf-common/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
@@ -21,10 +21,11 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
-import javax.xml.namespace.QName;
import jakarta.xml.soap.SOAPException;
import jakarta.xml.soap.SOAPMessage;
+import javax.xml.namespace.QName;
+
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.TypeConverter;
diff --git
a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
index ee34cb91647..8e9fc65ebe6 100644
---
a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
+++
b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfConverter.java
@@ -22,10 +22,11 @@ import java.io.InputStream;
import java.util.Collection;
import jakarta.ws.rs.core.Response;
-import javax.xml.namespace.QName;
import jakarta.xml.soap.SOAPException;
import jakarta.xml.soap.SOAPMessage;
+import javax.xml.namespace.QName;
+
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.TypeConverter;
diff --git
a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
index 9970c2fcbc3..3c29e4d4d4e 100644
---
a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
+++
b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
@@ -25,7 +25,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.TreeMap;
-import javax.security.auth.Subject;
import jakarta.ws.rs.client.Entity;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
@@ -33,6 +32,8 @@ import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Variant;
+import javax.security.auth.Subject;
+
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Message;
diff --git
a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
b/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
index ea75082ccd3..df1f55f9d16 100644
---
a/components/camel-cxf/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelTestSupport.java
+++
b/components/camel-cxf/camel-cxf-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;
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
index 26e2a534328..01309f48ca7 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
+++
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/FallbackTypeConverter.java
@@ -35,6 +35,7 @@ import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.annotation.XmlRootElement;
+
import javax.xml.stream.FactoryConfigurationError;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
index 2a3050bd7aa..dcb0e2c0db6 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
+++
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
@@ -28,7 +28,6 @@ import java.net.URL;
import java.util.Map;
import java.util.Map.Entry;
-import javax.xml.XMLConstants;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
@@ -37,6 +36,8 @@ import jakarta.xml.bind.MarshalException;
import jakarta.xml.bind.Marshaller;
import jakarta.xml.bind.Unmarshaller;
import jakarta.xml.bind.ValidationEvent;
+
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
diff --git
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
index a8e7ef53a22..547f48d7d9d 100644
---
a/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
+++
b/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/mapper/DefaultNamespacePrefixMapper.java
@@ -18,8 +18,8 @@ package org.apache.camel.converter.jaxb.mapper;
import java.util.Map;
-import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
import org.apache.camel.converter.jaxb.JaxbNamespacePrefixMapper;
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
/**
* A namespace prefix mapper which overrides SUN JAXB-RI to allow Camel to
control the prefixes
diff --git
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
index 7b3189c4108..70812c9546e 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/message/ObjectFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.converter.jaxb.message;
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-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
index 86f6729a329..78ed71fa8e5 100644
---
a/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
+++
b/components/camel-jaxb/src/test/java/org/apache/camel/foo/bar/ObjectFactory.java
@@ -19,6 +19,7 @@ package org.apache.camel.foo.bar;
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-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 126cef3ced4..d3d9d518bd1 100644
---
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -31,7 +31,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.management.MBeanServer;
import jakarta.servlet.Filter;
import jakarta.servlet.MultipartConfigElement;
import jakarta.servlet.RequestDispatcher;
@@ -39,6 +38,8 @@ import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import javax.management.MBeanServer;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
index 592576a27d2..68e01e182c5 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/MyLoginService.java
@@ -18,9 +18,10 @@ package org.apache.camel.component.jetty.rest;
import java.security.Principal;
-import javax.security.auth.Subject;
import jakarta.servlet.ServletRequest;
+import javax.security.auth.Subject;
+
import org.eclipse.jetty.security.DefaultIdentityService;
import org.eclipse.jetty.security.IdentityService;
import org.eclipse.jetty.security.LoginService;
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 08d5c331b8c..880157c08b9 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
@@ -1,11 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.camel.spring.rmi;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
@@ -13,6 +23,12 @@ import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RMIServerSocketFactory;
import java.rmi.server.UnicastRemoteObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
public class RmiRegistryFactoryBean implements FactoryBean<Registry>,
InitializingBean, DisposableBean {
private final Log logger = LogFactory.getLog(getClass());
@@ -27,9 +43,9 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
private Registry registry;
- private boolean alwaysCreate = false;
+ private boolean alwaysCreate;
- private boolean created = false;
+ private boolean created;
public String getHost() {
return host;
@@ -84,8 +100,8 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
if (this.clientSocketFactory instanceof RMIServerSocketFactory) {
this.serverSocketFactory = (RMIServerSocketFactory)
this.clientSocketFactory;
}
- if ((this.clientSocketFactory != null && this.serverSocketFactory ==
null) ||
- (this.clientSocketFactory == null && this.serverSocketFactory
!= null)) {
+ if (this.clientSocketFactory != null && this.serverSocketFactory ==
null ||
+ this.clientSocketFactory == null && this.serverSocketFactory
!= null) {
throw new IllegalArgumentException(
"Both RMIClientSocketFactory and RMIServerSocketFactory or
none required");
}
@@ -117,9 +133,7 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
Registry reg = LocateRegistry.getRegistry(registryHost,
registryPort, clientSocketFactory);
testRegistry(reg);
return reg;
- }
-
- else {
+ } else {
return getRegistry(registryPort, clientSocketFactory,
serverSocketFactory);
}
}
@@ -151,8 +165,7 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
Registry reg = LocateRegistry.getRegistry(null,
registryPort, clientSocketFactory);
testRegistry(reg);
return reg;
- }
- catch (RemoteException ex) {
+ } catch (RemoteException ex) {
logger.debug("RMI registry access threw exception", ex);
logger.info("Could not detect RMI registry - creating new
one");
// Assume no registry found -> create new one.
@@ -160,9 +173,7 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
return LocateRegistry.createRegistry(registryPort,
clientSocketFactory, serverSocketFactory);
}
}
- }
-
- else {
+ } else {
return getRegistry(registryPort);
}
}
@@ -188,8 +199,7 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
Registry reg = LocateRegistry.getRegistry(registryPort);
testRegistry(reg);
return reg;
- }
- catch (RemoteException ex) {
+ } catch (RemoteException ex) {
logger.debug("RMI registry access threw exception", ex);
logger.info("Could not detect RMI registry - creating new
one");
// Assume no registry found -> create new one.
@@ -217,14 +227,13 @@ public class RmiRegistryFactoryBean implements
FactoryBean<Registry>, Initializi
}
public Class<? extends Registry> getObjectType() {
- return (this.registry != null ? this.registry.getClass() :
Registry.class);
+ return this.registry != null ? this.registry.getClass() :
Registry.class;
}
public boolean isSingleton() {
return true;
}
-
/**
* Unexport the RMI registry on bean factory shutdown,
* provided that this bean actually created a registry.
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
index b8f8d3f7e97..835283ba74c 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
@@ -21,6 +21,8 @@ import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlTransient;
+
+// TODO: camel4
import javax.xml.xpath.XPathFactory;
import org.apache.camel.Expression;
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractKeyManagersParametersFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractKeyManagersParametersFactoryBean.java
index c90a7414d63..afeab2d4101 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractKeyManagersParametersFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractKeyManagersParametersFactoryBean.java
@@ -16,12 +16,13 @@
*/
package org.apache.camel.core.xml.util.jsse;
-import javax.net.ssl.KeyManager;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlTransient;
+import javax.net.ssl.KeyManager;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.support.jsse.KeyManagersParameters;
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractTrustManagersParametersFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractTrustManagersParametersFactoryBean.java
index 901fe64f869..98ca0ee142c 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractTrustManagersParametersFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractTrustManagersParametersFactoryBean.java
@@ -16,12 +16,13 @@
*/
package org.apache.camel.core.xml.util.jsse;
-import javax.net.ssl.TrustManager;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
import jakarta.xml.bind.annotation.XmlAttribute;
import jakarta.xml.bind.annotation.XmlTransient;
+import javax.net.ssl.TrustManager;
+
import org.apache.camel.spi.Metadata;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.jsse.TrustManagersParameters;
diff --git
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
index 46915dc3c96..ff4344d7a16 100644
---
a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
+++
b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbModelToXMLDumper.java
@@ -30,6 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.Marshaller;
+
+// TODO: camel4
import javax.xml.transform.OutputKeys;
import javax.xml.transform.TransformerException;
diff --git
a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
index e536bf253bb..e4654f429ea 100644
---
a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
+++
b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
@@ -25,9 +25,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.function.Consumer;
-import javax.net.ssl.SSLContext;
import jakarta.servlet.Servlet;
+import javax.net.ssl.SSLContext;
+
import org.apache.camel.util.KeyValueHolder;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
