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
commit df1f34f7f47387b73ea43a70093543d7ed29faca Author: Claus Ibsen <[email protected]> AuthorDate: Tue May 28 05:48:42 2019 +0200 Fixed CS --- .../src/test/java/org/apache/camel/converter/StringSourceTest.java | 2 +- .../test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java | 2 +- .../test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java | 5 ++--- .../src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java | 2 +- .../camel/processor/MultiCastParallelAndStreamCachingTest.java | 3 +-- .../apache/camel/processor/StreamSourceContentBasedRouterTest.java | 4 ++-- .../apache/camel/processor/ValidatingProcessorFromSourceTest.java | 3 ++- .../java/org/apache/camel/processor/ValidatingProcessorTest.java | 3 ++- .../src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java index e78c464..0d0378e 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/StringSourceTest.java @@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.TypeConverter; import org.apache.camel.impl.converter.DefaultTypeConverter; import org.apache.camel.impl.engine.DefaultClassResolver; @@ -29,6 +28,7 @@ import org.apache.camel.impl.engine.DefaultFactoryFinderResolver; import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.util.ReflectionInjector; +import org.apache.camel.util.xml.StringSource; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java index f7003e6..6990474 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/BytesSourceTest.java @@ -16,8 +16,8 @@ */ package org.apache.camel.converter.jaxp; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.ContextTestSupport; +import org.apache.camel.util.xml.BytesSource; import org.junit.Test; public class BytesSourceTest extends ContextTestSupport { diff --git a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java index 2ef19c3..1f33e39 100644 --- a/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/converter/jaxp/XmlConverterTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ package org.apache.camel.converter.jaxp; + import java.io.File; import java.io.InputStream; import java.io.Reader; import java.nio.ByteBuffer; import java.util.Properties; - import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; @@ -32,15 +32,14 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import org.xml.sax.InputSource; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.support.DefaultExchange; +import org.apache.camel.util.xml.BytesSource; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java index 7c52965..39ec63b 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/LogDebugBodyStreamsTest.java @@ -21,9 +21,9 @@ import java.io.InputStream; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.util.xml.StringSource; import org.junit.Test; public class LogDebugBodyStreamsTest extends ContextTestSupport { diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java index 679ed26..c5788a5 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/MultiCastParallelAndStreamCachingTest.java @@ -21,17 +21,16 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; - import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.util.IOHelper; +import org.apache.camel.util.xml.StringSource; import org.junit.Test; /** diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/StreamSourceContentBasedRouterTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/StreamSourceContentBasedRouterTest.java index cf969dd..c5c0950 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/StreamSourceContentBasedRouterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/StreamSourceContentBasedRouterTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ package org.apache.camel.processor; -import java.io.StringReader; +import java.io.StringReader; import javax.xml.transform.stream.StreamSource; import org.apache.camel.ContextTestSupport; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.util.xml.StringSource; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorFromSourceTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorFromSourceTest.java index 3889613..42ce3c9 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorFromSourceTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorFromSourceTest.java @@ -15,10 +15,11 @@ * limitations under the License. */ package org.apache.camel.processor; + import java.io.File; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.support.processor.validation.ValidatingProcessor; +import org.apache.camel.util.xml.StringSource; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java index cd4f26a..cb0b0fa0 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/ValidatingProcessorTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ package org.apache.camel.processor; + import java.io.File; import org.apache.camel.ContextTestSupport; import org.apache.camel.RuntimeCamelException; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.ValidationException; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.support.processor.validation.NoXmlBodyValidationException; import org.apache.camel.support.processor.validation.SchemaValidationException; import org.apache.camel.support.processor.validation.ValidatingProcessor; +import org.apache.camel.util.xml.StringSource; import org.junit.Before; import org.junit.Test; diff --git a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java index 6d848ee..ce70472 100644 --- a/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java +++ b/core/camel-jaxp/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java @@ -66,15 +66,15 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.Converter; import org.apache.camel.Exchange; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.support.CamelContextHelper; import org.apache.camel.support.builder.xml.StAX2SAXSource; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; import org.apache.camel.util.StringHelper; +import org.apache.camel.util.xml.BytesSource; +import org.apache.camel.util.xml.StringSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
