CAMEL-7999: More components include documentation
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3ccb5144 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3ccb5144 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3ccb5144 Branch: refs/heads/master Commit: 3ccb514404c5bbfb3a26ae9cdb7b5a1c5450359f Parents: aed118a Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Jan 5 11:31:49 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jan 5 11:31:49 2015 +0100 ---------------------------------------------------------------------- .../spring/ws/SpringWebserviceComponent.java | 6 +- .../ws/SpringWebserviceConfiguration.java | 80 ++++++++++++-------- .../spring/ws/SpringWebserviceEndpoint.java | 4 + .../spring/ws/type/EndpointMappingKey.java | 5 ++ 4 files changed, 62 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3ccb5144/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java index ee5efc4..0bf52a9 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceComponent.java @@ -32,6 +32,7 @@ import org.apache.camel.component.spring.ws.type.EndpointMappingKey; import org.apache.camel.component.spring.ws.type.EndpointMappingType; import org.apache.camel.converter.jaxp.XmlConverter; import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.impl.UriEndpointComponent; import org.apache.camel.util.CamelContextHelper; import org.apache.camel.util.EndpointHelper; import org.apache.camel.util.UnsafeUriCharactersEncoder; @@ -46,14 +47,15 @@ import org.springframework.xml.xpath.XPathExpressionFactory; /** * Apache Camel component for working with Spring Web Services (a.k.a Spring-WS). */ -public class SpringWebserviceComponent extends DefaultComponent { +public class SpringWebserviceComponent extends UriEndpointComponent { private static final Logger LOG = LoggerFactory.getLogger(SpringWebserviceComponent.class); public SpringWebserviceComponent() { + super(SpringWebserviceEndpoint.class); } public SpringWebserviceComponent(CamelContext context) { - super(context); + super(context, SpringWebserviceEndpoint.class); } @Deprecated http://git-wip-us.apache.org/repos/asf/camel/blob/3ccb5144/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java index fef36bc..61fa3d0 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java @@ -25,31 +25,49 @@ import org.apache.camel.component.spring.ws.filter.MessageFilter; import org.apache.camel.component.spring.ws.filter.impl.BasicMessageFilter; import org.apache.camel.component.spring.ws.type.EndpointMappingKey; import org.apache.camel.converter.jaxp.XmlConverter; +import org.apache.camel.spi.UriParam; +import org.apache.camel.spi.UriParams; import org.apache.camel.util.jsse.SSLContextParameters; import org.springframework.util.StringUtils; import org.springframework.ws.client.core.WebServiceTemplate; -import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy; +import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy; import org.springframework.ws.soap.addressing.server.annotation.Action; -import org.springframework.ws.transport.WebServiceMessageSender; +import org.springframework.ws.transport.WebServiceMessageSender; +@UriParams public class SpringWebserviceConfiguration { + @UriParam + private EndpointMappingKey endpointMappingKey; + /* Producer configuration */ + @UriParam private WebServiceTemplate webServiceTemplate; + @UriParam private String soapAction; + @UriParam private URI wsAddressingAction; + @UriParam private URI outputAction; + @UriParam private URI faultAction; + @UriParam private URI faultTo; + @UriParam private URI replyTo; - private WebServiceMessageSender replyToMessageSender; - private MessageIdStrategy messageIdStrategy; + @UriParam + private WebServiceMessageSender replyToMessageSender; + @UriParam + private MessageIdStrategy messageIdStrategy; + @UriParam private int timeout = -1; /* Consumer configuration */ + @UriParam private CamelSpringWSEndpointMapping endpointMapping; + @UriParam private CamelEndpointDispatcher endpointDispatcher; - private EndpointMappingKey endpointMappingKey; + @UriParam private SSLContextParameters sslContextParameters; private XmlConverter xmlConverter; @@ -257,30 +275,30 @@ public class SpringWebserviceConfiguration { this.replyTo = replyToAction; } - /** * @return Returns the replyToMessageSender for wsa:replyTo. - */ - public WebServiceMessageSender getMessageSender() { - return replyToMessageSender; - } - - /** - * @param replyToMessageSender The replyToMessageSender for wsa:replyTo to set. - */ - public void setMessageSender(WebServiceMessageSender messageSender) { - this.replyToMessageSender = messageSender; - } - - /** * @return Returns the messageIdStrategy. - */ - public MessageIdStrategy getMessageIdStrategy() { - return messageIdStrategy; - } - - /** - * @param messageIdStrategy The messageIdStrategy to set. - */ - public void setMessageIdStrategy(MessageIdStrategy messageIdStrategy) { - this.messageIdStrategy = messageIdStrategy; - } - + /** * @return Returns the replyToMessageSender for wsa:replyTo. + */ + public WebServiceMessageSender getMessageSender() { + return replyToMessageSender; + } + + /** + * @param messageSender The replyToMessageSender for wsa:replyTo to set. + */ + public void setMessageSender(WebServiceMessageSender messageSender) { + this.replyToMessageSender = messageSender; + } + + /** * @return Returns the messageIdStrategy. + */ + public MessageIdStrategy getMessageIdStrategy() { + return messageIdStrategy; + } + + /** + * @param messageIdStrategy The messageIdStrategy to set. + */ + public void setMessageIdStrategy(MessageIdStrategy messageIdStrategy) { + this.messageIdStrategy = messageIdStrategy; + } + } http://git-wip-us.apache.org/repos/asf/camel/blob/3ccb5144/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java index 6f21080..1084cd3 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java @@ -21,9 +21,13 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; +import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; +@UriEndpoint(scheme = "spring-ws", consumerClass = SpringWebserviceConsumer.class, label = "http,soap,webservice") public class SpringWebserviceEndpoint extends DefaultEndpoint { + @UriParam private SpringWebserviceConfiguration configuration; public SpringWebserviceEndpoint(Component component, String uri, SpringWebserviceConfiguration configuration) { http://git-wip-us.apache.org/repos/asf/camel/blob/3ccb5144/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingKey.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingKey.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingKey.java index e8ebb48..7c8391c 100644 --- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingKey.java +++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/type/EndpointMappingKey.java @@ -16,10 +16,15 @@ */ package org.apache.camel.component.spring.ws.type; +import org.apache.camel.spi.UriParams; +import org.apache.camel.spi.UriPath; import org.springframework.xml.xpath.XPathExpression; +@UriParams public class EndpointMappingKey { + @UriPath private EndpointMappingType type; + @UriPath private String lookupKey; /* expression in case type is 'xpath' */
