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 9008caab173f51dbcfdbf3a10c1a4953d48180ef Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue May 28 06:10:15 2019 +0200 Fixed CS --- .../org/apache/camel/component/cxf/converter/CachedCxfPayload.java | 2 +- .../src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java | 2 +- .../main/java/org/apache/camel/component/xquery/XQueryBuilder.java | 4 ++-- .../java/org/apache/camel/converter/saxon/SaxonConverterTest.java | 2 +- .../org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java | 2 +- .../camel/component/xmlsecurity/processor/XmlSignatureProcessor.java | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java index 27cec31..5335d75 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CachedCxfPayload.java @@ -38,10 +38,10 @@ import org.apache.camel.Exchange; import org.apache.camel.StreamCache; import org.apache.camel.component.cxf.CxfPayload; import org.apache.camel.converter.stream.CachedOutputStream; -import org.apache.camel.util.xml.StreamSourceCache; import org.apache.camel.support.builder.xml.StAX2SAXSource; import org.apache.camel.support.builder.xml.XMLConverterHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.xml.StreamSourceCache; import org.apache.cxf.staxutils.StaxSource; import org.apache.cxf.staxutils.StaxUtils; import org.slf4j.Logger; diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java index 71eed49..b4a91f8 100644 --- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java +++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java @@ -25,10 +25,10 @@ import javax.xml.transform.stream.StreamSource; import org.apache.camel.CamelContext; 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.test.junit4.CamelTestSupport; +import org.apache.camel.util.xml.StringSource; import org.junit.Test; import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge; diff --git a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java index 6bbdb39..5cf7fc4 100644 --- a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java +++ b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java @@ -61,7 +61,6 @@ import net.sf.saxon.value.Int64Value; import net.sf.saxon.value.IntegerValue; import net.sf.saxon.value.ObjectValue; import net.sf.saxon.value.StringValue; -import org.apache.camel.util.xml.BytesSource; import org.apache.camel.Exchange; import org.apache.camel.Expression; import org.apache.camel.Message; @@ -69,11 +68,12 @@ import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.Predicate; import org.apache.camel.Processor; import org.apache.camel.RuntimeExpressionException; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.spi.NamespaceAware; import org.apache.camel.support.MessageHelper; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.xml.BytesSource; +import org.apache.camel.util.xml.StringSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java index d903112..4749df1 100644 --- a/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java +++ b/components/camel-saxon/src/test/java/org/apache/camel/converter/saxon/SaxonConverterTest.java @@ -33,10 +33,10 @@ import net.sf.saxon.om.NodeInfo; import net.sf.saxon.trans.XPathException; import net.sf.saxon.xpath.XPathEvaluator; import org.apache.camel.Exchange; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.language.xpath.DefaultNamespaceContext; import org.apache.camel.support.DefaultExchange; import org.apache.camel.test.junit4.CamelTestSupport; +import org.apache.camel.util.xml.StringSource; import org.junit.Before; import org.junit.Test; diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java index 504eb11..b509ee3 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ProducerLocalRouteTest.java @@ -23,8 +23,8 @@ import org.apache.camel.ExchangePattern; import org.apache.camel.Message; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; -import org.apache.camel.util.xml.StringSource; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.util.xml.StringSource; import org.junit.Test; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureProcessor.java index 1ade0e6..eddebb7 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureProcessor.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureProcessor.java @@ -27,7 +27,7 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.xml.sax.SAXException; -import org.apache.camel.util.xml.BytesSource; + import org.apache.camel.Message; import org.apache.camel.Processor; import org.apache.camel.component.validator.DefaultLSResourceResolver; @@ -36,6 +36,7 @@ import org.apache.camel.component.xmlsecurity.api.XmlSignatureException; import org.apache.camel.support.ResourceHelper; import org.apache.camel.util.IOHelper; import org.apache.camel.util.ObjectHelper; +import org.apache.camel.util.xml.BytesSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory;