CAMEL-8670: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/735ca601 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/735ca601 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/735ca601 Branch: refs/heads/master Commit: 735ca601a60d7c4d9da5cc0e0a9a385c391f8814 Parents: 321b0dc Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Apr 23 13:36:06 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 23 13:36:06 2015 +0200 ---------------------------------------------------------------------- .../spring/ws/bean/CamelEndpointMapping.java | 28 +++++++++++--------- ...ndpointMappingResponseHandlingRouteTest.java | 14 +++++----- .../ws/ConsumerEndpointMappingRouteTest.java | 12 ++++----- 3 files changed, 29 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/735ca601/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java index 0bce22c..1359281 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java @@ -16,6 +16,19 @@ */ package org.apache.camel.component.spring.ws.bean; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import javax.xml.namespace.QName; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.stream.XMLStreamException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; + +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + import org.apache.camel.RuntimeCamelException; import org.apache.camel.component.spring.ws.type.EndpointMappingKey; import org.apache.camel.component.spring.ws.type.EndpointMappingType; @@ -24,7 +37,9 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.ws.context.MessageContext; -import org.springframework.ws.server.*; +import org.springframework.ws.server.EndpointInterceptor; +import org.springframework.ws.server.EndpointInvocationChain; +import org.springframework.ws.server.EndpointMapping; import org.springframework.ws.server.endpoint.MessageEndpoint; import org.springframework.ws.server.endpoint.mapping.AbstractEndpointMapping; import org.springframework.ws.server.endpoint.support.PayloadRootUtils; @@ -35,18 +50,7 @@ import org.springframework.ws.transport.WebServiceConnection; import org.springframework.ws.transport.context.TransportContext; import org.springframework.ws.transport.context.TransportContextHolder; import org.springframework.xml.xpath.XPathExpression; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; -import javax.xml.namespace.QName; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.stream.XMLStreamException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * Spring {@link EndpointMapping} for mapping messages to corresponding Camel http://git-wip-us.apache.org/repos/asf/camel/blob/735ca601/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java index b54c342..f5cc01d 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingResponseHandlingRouteTest.java @@ -16,6 +16,13 @@ */ package org.apache.camel.component.spring.ws; +import java.io.StringReader; +import java.io.StringWriter; +import java.net.URI; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + import org.apache.camel.component.spring.ws.utils.TestUtil; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.junit.Before; @@ -27,13 +34,6 @@ import org.springframework.ws.soap.addressing.client.ActionCallback; import org.springframework.ws.soap.addressing.version.Addressing10; import org.springframework.ws.soap.client.core.SoapActionCallback; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import java.io.StringReader; -import java.io.StringWriter; -import java.net.URI; - public class ConsumerEndpointMappingResponseHandlingRouteTest extends CamelSpringTestSupport { private final String xmlRequestForGoogleStockQuote = "<GetQuote xmlns=\"http://www.webserviceX.NET/\"><symbol>GOOG</symbol></GetQuote>"; http://git-wip-us.apache.org/repos/asf/camel/blob/735ca601/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java index e869292..d788aa9 100644 --- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java +++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java @@ -16,6 +16,12 @@ */ package org.apache.camel.component.spring.ws; +import java.io.IOException; +import java.io.StringReader; +import javax.xml.transform.Source; +import javax.xml.transform.TransformerException; +import javax.xml.transform.stream.StreamSource; + import org.apache.camel.EndpointInject; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.spring.CamelSpringTestSupport; @@ -28,12 +34,6 @@ import org.springframework.ws.client.core.SourceExtractor; import org.springframework.ws.client.core.WebServiceTemplate; import org.springframework.ws.soap.client.core.SoapActionCallback; -import javax.xml.transform.Source; -import javax.xml.transform.TransformerException; -import javax.xml.transform.stream.StreamSource; -import java.io.IOException; -import java.io.StringReader; - public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport { private static final SourceExtractor<Object> NOOP_SOURCE_EXTRACTOR = new SourceExtractor<Object>() {