This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 723f091 Fixed CS 723f091 is described below commit 723f09181dd2c7b1e8fab8573d20dd947bf26704 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Wed Feb 5 08:13:00 2020 +0100 Fixed CS --- .../cxf/common/header/CxfHeaderHelperTest.java | 1 + .../camel/component/netty/NettyConcurrentTest.java | 1 - .../camel/component/netty/NettyTCPAsyncTest.java | 2 +- .../camel/component/netty/NettyTCPChainedTest.java | 2 +- .../netty/NettyTransferExchangeOptionTest.java | 1 - .../component/netty/ObjectSerializationTest.java | 1 - .../management/DefaultManagementObjectStrategy.java | 2 +- .../apache/camel/xml/jaxb/JaxbModelToXMLDumper.java | 21 ++++++++++++--------- .../xml/jaxb/JaxbXMLRoutesDefinitionLoader.java | 17 +++++++++-------- 9 files changed, 25 insertions(+), 23 deletions(-) diff --git a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java index f1512e1..a127908 100644 --- a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java +++ b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelperTest.java @@ -23,6 +23,7 @@ import java.util.Map; import java.util.TreeMap; import junit.framework.TestCase; + import org.apache.camel.Exchange; import org.apache.camel.component.cxf.common.message.CxfConstants; import org.apache.camel.impl.DefaultCamelContext; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java index 64a15c2..72984b3 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.TimeUnit; import io.netty.channel.ChannelHandler; import io.netty.handler.codec.serialization.ClassResolvers; - import org.apache.camel.BindToRegistry; import org.apache.camel.Exchange; import org.apache.camel.Processor; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java index 10cc2d9..b7565d5 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java @@ -20,7 +20,6 @@ import java.io.FileInputStream; import java.io.InputStream; import io.netty.channel.ChannelHandler; - import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; @@ -33,6 +32,7 @@ import org.apache.camel.util.IOHelper; import org.junit.Test; public class NettyTCPAsyncTest extends BaseNettyTest { + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java index d2df52c..25fce4e 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPChainedTest.java @@ -20,7 +20,6 @@ import java.io.FileInputStream; import java.io.InputStream; import io.netty.channel.ChannelHandler; - import org.apache.camel.BindToRegistry; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; @@ -39,6 +38,7 @@ import org.junit.Test; * {@link io.netty.util.concurrent.BlockingOperationException} is thrown by netty. */ public class NettyTCPChainedTest extends BaseNettyTest { + @EndpointInject("mock:result") protected MockEndpoint resultEndpoint; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java index ebfc2d7..9807b5b 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTransferExchangeOptionTest.java @@ -20,7 +20,6 @@ import java.nio.charset.Charset; import io.netty.channel.ChannelHandler; import io.netty.handler.codec.serialization.ClassResolvers; - import org.apache.camel.BindToRegistry; import org.apache.camel.Endpoint; import org.apache.camel.Exchange; diff --git a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java index 94a2baf..2014745 100644 --- a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java +++ b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ObjectSerializationTest.java @@ -21,7 +21,6 @@ import java.util.Properties; import io.netty.channel.ChannelHandler; import io.netty.handler.codec.serialization.ClassResolvers; - import org.apache.camel.BindToRegistry; import org.apache.camel.CamelExecutionException; import org.apache.camel.Exchange; diff --git a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java index c4f29e3..8b0d476 100644 --- a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java +++ b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java @@ -161,9 +161,9 @@ import org.apache.camel.spi.ManagementObjectStrategy; import org.apache.camel.spi.RouteContext; import org.apache.camel.support.ScheduledPollConsumer; import org.apache.camel.support.processor.MarshalProcessor; +import org.apache.camel.support.processor.PredicateValidatingProcessor; import org.apache.camel.support.processor.ThroughputLogger; import org.apache.camel.support.processor.UnmarshalProcessor; -import org.apache.camel.support.processor.PredicateValidatingProcessor; /** * Default {@link org.apache.camel.spi.ManagementObjectStrategy}. 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 518c4ae..921c8a2 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 @@ -16,11 +16,7 @@ */ package org.apache.camel.xml.jaxb; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.TransformerException; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.StringWriter; @@ -32,6 +28,17 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.transform.OutputKeys; +import javax.xml.transform.TransformerException; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + import org.apache.camel.CamelContext; import org.apache.camel.DelegateEndpoint; import org.apache.camel.Endpoint; @@ -49,10 +56,6 @@ import org.apache.camel.spi.ModelToXMLDumper; import org.apache.camel.spi.NamespaceAware; import org.apache.camel.spi.TypeConverterRegistry; import org.apache.camel.util.xml.XmlLineNumberParser; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs; diff --git a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java index 1404e8a..45c7c07 100644 --- a/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java +++ b/core/camel-xml-jaxb/src/main/java/org/apache/camel/xml/jaxb/JaxbXMLRoutesDefinitionLoader.java @@ -16,10 +16,6 @@ */ package org.apache.camel.xml.jaxb; -import javax.xml.bind.Binder; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import java.io.IOException; import java.io.InputStream; import java.util.Iterator; @@ -27,6 +23,15 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import javax.xml.bind.Binder; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Unmarshaller; + +import org.w3c.dom.Document; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + import org.apache.camel.CamelContext; import org.apache.camel.Expression; import org.apache.camel.ExtendedCamelContext; @@ -44,10 +49,6 @@ import org.apache.camel.spi.NamespaceAware; import org.apache.camel.spi.TypeConverterRegistry; import org.apache.camel.spi.XMLRoutesDefinitionLoader; import org.apache.camel.util.ObjectHelper; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;