You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/08 08:21:59 UTC

[camel] branch master updated: Fixed wrong camel-spring-ws documentation for messageIdStrategy as its for consumer and not producer

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 6787498  Fixed wrong camel-spring-ws documentation for messageIdStrategy as its for consumer and not producer
6787498 is described below

commit 678749846e1120d7446a66d9e676cdded63fe25f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 8 10:21:15 2020 +0200

    Fixed wrong camel-spring-ws documentation for messageIdStrategy as its for consumer and not producer
---
 .../camel/component/spring/ws/spring-ws.json       | 10 +--
 .../src/main/docs/spring-ws-component.adoc         | 10 +--
 .../spring/ws/SpringWebserviceConfiguration.java   | 26 +++----
 .../SpringWebserviceEndpointBuilderFactory.java    | 88 +++++++++++++---------
 4 files changed, 72 insertions(+), 62 deletions(-)

diff --git a/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json b/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json
index 5d6426a..4a6d8f4 100644
--- a/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json
+++ b/components/camel-spring-ws/src/generated/resources/org/apache/camel/component/spring/ws/spring-ws.json
@@ -37,18 +37,18 @@
     "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
     "endpointDispatcher": { "kind": "parameter", "displayName": "Endpoint Dispatcher", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.spring.ws.bean.CamelEndpointDispatcher", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Spring org.springframework.ws.server.endpoint.MessageEndpoin [...]
     "endpointMapping": { "kind": "parameter", "displayName": "Endpoint Mapping", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.spring.ws.bean.CamelSpringWSEndpointMapping", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Reference to an instance of org.apache.camel.component.spring [...]
+    "messageIdStrategy": { "kind": "parameter", "displayName": "Message Id Strategy", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.springframework.ws.soap.addressing.messageid.MessageIdStrategy", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom MessageIdStrategy to control gene [...]
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "allowResponseAttachmentOverride": { "kind": "parameter", "displayName": "Allow Response Attachment Override", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to override soap response attachments in in\/out exchange w [...]
     "allowResponseHeaderOverride": { "kind": "parameter", "displayName": "Allow Response Header Override", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to override soap response header in in\/out exchange with header in [...]
-    "faultAction": { "kind": "parameter", "displayName": "Fault Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the faultAction response WS-Addressing Fault Action header that is provided by the method." },
-    "faultTo": { "kind": "parameter", "displayName": "Fault To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the faultAction response WS-Addressing FaultTo header that is provided by the method." },
+    "faultAction": { "kind": "parameter", "displayName": "Fault Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the faultAction response WS-Addressing Fault Action header that is provided by the method. See org.spri [...]
+    "faultTo": { "kind": "parameter", "displayName": "Fault To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the faultAction response WS-Addressing FaultTo header that is provided by the method. See org.springframework.w [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
     "messageFactory": { "kind": "parameter", "displayName": "Message Factory", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.springframework.ws.WebServiceMessageFactory", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom WebServiceMessageFactory. For example when you want Apache  [...]
-    "messageIdStrategy": { "kind": "parameter", "displayName": "Message Id Strategy", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.springframework.ws.soap.addressing.messageid.MessageIdStrategy", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom MessageIdStrategy to control gene [...]
     "messageSender": { "kind": "parameter", "displayName": "Message Sender", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.springframework.ws.transport.WebServiceMessageSender", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom WebServiceMessageSender. For example to perform auth [...]
-    "outputAction": { "kind": "parameter", "displayName": "Output Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the response WS-Addressing Action header that is provided by the method." },
-    "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the replyTo response WS-Addressing ReplyTo header that is provided by the method." },
+    "outputAction": { "kind": "parameter", "displayName": "Output Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the response WS-Addressing Action header that is provided by the method. See org.springframework.ws.s [...]
+    "replyTo": { "kind": "parameter", "displayName": "Reply To", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Signifies the value for the replyTo response WS-Addressing ReplyTo header that is provided by the method. See org.springframework.ws.so [...]
     "soapAction": { "kind": "parameter", "displayName": "Soap Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "SOAP action to include inside a SOAP request when accessing remote web services" },
     "timeout": { "kind": "parameter", "displayName": "Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see URLConnection.setReadTimeout() and CommonsHtt [...]
     "webServiceTemplate": { "kind": "parameter", "displayName": "Web Service Template", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.springframework.ws.client.core.WebServiceTemplate", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom WebServiceTemplate. This allows for full con [...]
diff --git a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
index 46ab6bd..7c1f8d8 100644
--- a/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
+++ b/components/camel-spring-ws/src/main/docs/spring-ws-component.adoc
@@ -142,18 +142,18 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *endpointDispatcher* (consumer) | Spring org.springframework.ws.server.endpoint.MessageEndpoint for dispatching messages received by Spring-WS to a Camel endpoint, to integrate with existing (legacy) endpoint mappings like PayloadRootQNameEndpointMapping, SoapActionEndpointMapping, etc. |  | CamelEndpointDispatcher
 | *endpointMapping* (consumer) | Reference to an instance of org.apache.camel.component.spring.ws.bean.CamelEndpointMapping in the Registry/ApplicationContext. Only one bean is required in the registry to serve all Camel/Spring-WS endpoints. This bean is auto-discovered by the MessageDispatcher and used to map requests to Camel endpoints based on characteristics specified on the endpoint (like root QName, SOAP action, etc) |  | CamelSpringWSEndpointMapping
+| *messageIdStrategy* (consumer) | Option to provide a custom MessageIdStrategy to control generation of WS-Addressing unique message ids. |  | MessageIdStrategy
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. There are 3 enums and the value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *allowResponseAttachment Override* (producer) | Option to override soap response attachments in in/out exchange with attachments from the actual service layer. If the invoked service appends or rewrites the soap attachments this option when set to true, allows the modified soap attachments to be overwritten in in/out message attachments | false | boolean
 | *allowResponseHeaderOverride* (producer) | Option to override soap response header in in/out exchange with header info from the actual service layer. If the invoked service appends or rewrites the soap header this option when set to true, allows the modified soap header to be overwritten in in/out message headers | false | boolean
-| *faultAction* (producer) | Signifies the value for the faultAction response WS-Addressing Fault Action header that is provided by the method. |  | URI
-| *faultTo* (producer) | Signifies the value for the faultAction response WS-Addressing FaultTo header that is provided by the method. |  | URI
+| *faultAction* (producer) | Signifies the value for the faultAction response WS-Addressing Fault Action header that is provided by the method. See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details. |  | URI
+| *faultTo* (producer) | Signifies the value for the faultAction response WS-Addressing FaultTo header that is provided by the method. See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details. |  | URI
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *messageFactory* (producer) | Option to provide a custom WebServiceMessageFactory. For example when you want Apache Axiom to handle web service messages instead of SAAJ. |  | WebServiceMessageFactory
-| *messageIdStrategy* (producer) | Option to provide a custom MessageIdStrategy to control generation of unique message ids. |  | MessageIdStrategy
 | *messageSender* (producer) | Option to provide a custom WebServiceMessageSender. For example to perform authentication or use alternative transports |  | WebServiceMessageSender
-| *outputAction* (producer) | Signifies the value for the response WS-Addressing Action header that is provided by the method. |  | URI
-| *replyTo* (producer) | Signifies the value for the replyTo response WS-Addressing ReplyTo header that is provided by the method. |  | URI
+| *outputAction* (producer) | Signifies the value for the response WS-Addressing Action header that is provided by the method. See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details. |  | URI
+| *replyTo* (producer) | Signifies the value for the replyTo response WS-Addressing ReplyTo header that is provided by the method. See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details. |  | URI
 | *soapAction* (producer) | SOAP action to include inside a SOAP request when accessing remote web services |  | String
 | *timeout* (producer) | Sets the socket read timeout (in milliseconds) while invoking a webservice using the producer, see URLConnection.setReadTimeout() and CommonsHttpMessageSender.setReadTimeout(). This option works when using the built-in message sender implementations: CommonsHttpMessageSender and HttpUrlConnectionMessageSender. One of these implementations will be used by default for HTTP based services unless you customize the Spring WS configuration options supplied to the compo [...]
 | *webServiceTemplate* (producer) | Option to provide a custom WebServiceTemplate. This allows for full control over client-side web services handling; like adding a custom interceptor or specifying a fault resolver, message sender or message factory. |  | WebServiceTemplate
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 837a496..c61bb31 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
@@ -32,7 +32,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.ws.WebServiceMessageFactory;
 import org.springframework.ws.client.core.WebServiceTemplate;
 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.xml.xpath.XPathExpression;
 
@@ -68,8 +67,6 @@ public class SpringWebserviceConfiguration {
     @UriParam(label = "producer")
     private URI replyTo;
     @UriParam(label = "producer")
-    private MessageIdStrategy messageIdStrategy;
-    @UriParam(label = "producer")
     private int timeout = -1;
     @UriParam(label = "producer")
     private boolean allowResponseHeaderOverride;
@@ -88,6 +85,8 @@ public class SpringWebserviceConfiguration {
     private CamelSpringWSEndpointMapping endpointMapping;
     @UriParam(label = "consumer")
     private CamelEndpointDispatcher endpointDispatcher;
+    @UriParam(label = "consumer")
+    private MessageIdStrategy messageIdStrategy;
 
     public WebServiceTemplate getWebServiceTemplate() {
         return webServiceTemplate;
@@ -308,7 +307,7 @@ public class SpringWebserviceConfiguration {
     /**
      * Signifies the value for the response WS-Addressing <code>Action</code> header that is provided by the method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setOutputAction(URI outputAction) {
         this.outputAction = outputAction;
@@ -328,7 +327,7 @@ public class SpringWebserviceConfiguration {
      * Signifies the value for the faultAction response WS-Addressing <code>Fault Action</code> header that is provided
      * by the method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setFaultAction(String fault) throws URISyntaxException {
         if (StringUtils.hasText(fault)) {
@@ -340,7 +339,7 @@ public class SpringWebserviceConfiguration {
      * Signifies the value for the faultAction response WS-Addressing <code>Fault Action</code> header that is provided
      * by the method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setFaultAction(URI fault) {
         this.faultAction = fault;
@@ -354,7 +353,7 @@ public class SpringWebserviceConfiguration {
      * Signifies the value for the faultAction response WS-Addressing <code>FaultTo</code> header that is provided by
      * the method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setFaultTo(String faultTo) throws URISyntaxException {
         if (StringUtils.hasText(faultTo)) {
@@ -366,7 +365,7 @@ public class SpringWebserviceConfiguration {
      * Signifies the value for the faultAction response WS-Addressing <code>FaultTo</code> header that is provided by
      * the method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setFaultTo(URI faultTo) {
         this.faultTo = faultTo;
@@ -380,7 +379,7 @@ public class SpringWebserviceConfiguration {
      * Signifies the value for the replyTo response WS-Addressing <code>ReplyTo</code> header that is provided by the
      * method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setReplyTo(String replyToAction) throws URISyntaxException {
         if (StringUtils.hasText(replyToAction)) {
@@ -392,7 +391,7 @@ public class SpringWebserviceConfiguration {
      * Signifies the value for the replyTo response WS-Addressing <code>ReplyTo</code> header that is provided by the
      * method.
      *
-     * @see {@link Action}
+     * See org.springframework.ws.soap.addressing.server.annotation.Action annotation for more details.
      */
     public void setReplyTo(URI replyToAction) {
         this.replyTo = replyToAction;
@@ -415,7 +414,7 @@ public class SpringWebserviceConfiguration {
     }
 
     /**
-     * Option to provide a custom MessageIdStrategy to control generation of unique message ids.
+     * Option to provide a custom MessageIdStrategy to control generation of WS-Addressing unique message ids.
      */
     public void setMessageIdStrategy(MessageIdStrategy messageIdStrategy) {
         this.messageIdStrategy = messageIdStrategy;
@@ -429,8 +428,6 @@ public class SpringWebserviceConfiguration {
      * Option to override soap response header in in/out exchange with header info from the actual service layer. If the
      * invoked service appends or rewrites the soap header this option when set to true, allows the modified soap header
      * to be overwritten in in/out message headers
-     * 
-     * @param allowResponseHeaderOverride - true, will override header with spring-ws response message header
      */
     public void setAllowResponseHeaderOverride(boolean allowResponseHeaderOverride) {
         this.allowResponseHeaderOverride = allowResponseHeaderOverride;
@@ -444,9 +441,6 @@ public class SpringWebserviceConfiguration {
      * Option to override soap response attachments in in/out exchange with attachments from the actual service layer.
      * If the invoked service appends or rewrites the soap attachments this option when set to true, allows the modified
      * soap attachments to be overwritten in in/out message attachments
-     * 
-     * @param allowResponseAttachmentOverride - true, will override attachments with spring-ws response message
-     *                                        attachments
      */
     public void setAllowResponseAttachmentOverride(boolean allowResponseAttachmentOverride) {
         this.allowResponseAttachmentOverride = allowResponseAttachmentOverride;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
index 97943879..1ec85a8 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
@@ -179,6 +179,34 @@ public interface SpringWebserviceEndpointBuilderFactory {
             return this;
         }
         /**
+         * Option to provide a custom MessageIdStrategy to control generation of
+         * WS-Addressing unique message ids.
+         * 
+         * The option is a:
+         * <code>org.springframework.ws.soap.addressing.messageid.MessageIdStrategy</code> type.
+         * 
+         * Group: consumer
+         */
+        default SpringWebserviceEndpointConsumerBuilder messageIdStrategy(
+                Object messageIdStrategy) {
+            doSetProperty("messageIdStrategy", messageIdStrategy);
+            return this;
+        }
+        /**
+         * Option to provide a custom MessageIdStrategy to control generation of
+         * WS-Addressing unique message ids.
+         * 
+         * The option will be converted to a
+         * <code>org.springframework.ws.soap.addressing.messageid.MessageIdStrategy</code> type.
+         * 
+         * Group: consumer
+         */
+        default SpringWebserviceEndpointConsumerBuilder messageIdStrategy(
+                String messageIdStrategy) {
+            doSetProperty("messageIdStrategy", messageIdStrategy);
+            return this;
+        }
+        /**
          * To configure security using SSLContextParameters.
          * 
          * The option is a:
@@ -438,7 +466,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the faultAction response WS-Addressing Fault
-         * Action header that is provided by the method.
+         * Action header that is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option is a: <code>java.net.URI</code> type.
          * 
@@ -451,7 +481,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the faultAction response WS-Addressing Fault
-         * Action header that is provided by the method.
+         * Action header that is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option will be converted to a <code>java.net.URI</code> type.
          * 
@@ -464,7 +496,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the faultAction response WS-Addressing
-         * FaultTo header that is provided by the method.
+         * FaultTo header that is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option is a: <code>java.net.URI</code> type.
          * 
@@ -476,7 +510,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the faultAction response WS-Addressing
-         * FaultTo header that is provided by the method.
+         * FaultTo header that is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option will be converted to a <code>java.net.URI</code> type.
          * 
@@ -557,34 +593,6 @@ public interface SpringWebserviceEndpointBuilderFactory {
             return this;
         }
         /**
-         * Option to provide a custom MessageIdStrategy to control generation of
-         * unique message ids.
-         * 
-         * The option is a:
-         * <code>org.springframework.ws.soap.addressing.messageid.MessageIdStrategy</code> type.
-         * 
-         * Group: producer
-         */
-        default SpringWebserviceEndpointProducerBuilder messageIdStrategy(
-                Object messageIdStrategy) {
-            doSetProperty("messageIdStrategy", messageIdStrategy);
-            return this;
-        }
-        /**
-         * Option to provide a custom MessageIdStrategy to control generation of
-         * unique message ids.
-         * 
-         * The option will be converted to a
-         * <code>org.springframework.ws.soap.addressing.messageid.MessageIdStrategy</code> type.
-         * 
-         * Group: producer
-         */
-        default SpringWebserviceEndpointProducerBuilder messageIdStrategy(
-                String messageIdStrategy) {
-            doSetProperty("messageIdStrategy", messageIdStrategy);
-            return this;
-        }
-        /**
          * Option to provide a custom WebServiceMessageSender. For example to
          * perform authentication or use alternative transports.
          * 
@@ -616,7 +624,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the response WS-Addressing Action header that
-         * is provided by the method.
+         * is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option is a: <code>java.net.URI</code> type.
          * 
@@ -629,7 +639,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the response WS-Addressing Action header that
-         * is provided by the method.
+         * is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option will be converted to a <code>java.net.URI</code> type.
          * 
@@ -642,7 +654,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the replyTo response WS-Addressing ReplyTo
-         * header that is provided by the method.
+         * header that is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option is a: <code>java.net.URI</code> type.
          * 
@@ -654,7 +668,9 @@ public interface SpringWebserviceEndpointBuilderFactory {
         }
         /**
          * Signifies the value for the replyTo response WS-Addressing ReplyTo
-         * header that is provided by the method.
+         * header that is provided by the method. See
+         * org.springframework.ws.soap.addressing.server.annotation.Action
+         * annotation for more details.
          * 
          * The option will be converted to a <code>java.net.URI</code> type.
          *