This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4af58d50f6f8 CAMEL-27034: camel-spring-ws - outputAction and
faultAction are consumer options (#30223)
4af58d50f6f8 is described below
commit 4af58d50f6f8b18b5be9a26d95ecfb3dde923c01
Author: Saravanakumar Selvaraj <[email protected]>
AuthorDate: Tue Nov 17 08:59:09 2026 +0000
CAMEL-27034: camel-spring-ws - outputAction and faultAction are consumer
options (#30223)
…mer options
outputAction and faultAction had the label producer, but only the consumer
uses them: WSACamelEndpointMapping reads them
for the WS-Addressing Action header of the response and of a SOAP fault
that the consumer returns. So the Endpoint DSL
had their methods only in the producer builder, and in consumer-only mode
the endpoint validation of the catalog
reported them on a consumer URI.
Both options now have the label consumer, their fields move to the consumer
part of SpringWebserviceConfiguration, and
their descriptions no longer end with "The producer does not use it.". The
component JSON, its catalog copy and the
Endpoint DSL are regenerated, so the methods move to
SpringWebserviceEndpointConsumerBuilder. A new test of
CamelCatalogTest validates the two options in consumer-only and in
producer-only mode, and the upgrade guide of 4.24 has
a section on the change.
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.../apache/camel/catalog/components/spring-ws.json | 20 +--
.../org/apache/camel/catalog/CamelCatalogTest.java | 17 +++
.../camel/component/spring/ws/spring-ws.json | 20 +--
.../spring/ws/SpringWebserviceConfiguration.java | 24 ++--
.../ROOT/pages/camel-4x-upgrade-guide-4_24.adoc | 10 ++
.../SpringWebserviceEndpointBuilderFactory.java | 144 ++++++++++-----------
6 files changed, 131 insertions(+), 104 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
index b1492bbc1a49..c9993b1fae98 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-ws.json
@@ -55,16 +55,16 @@
"endpointDispatcher": { "index": 6, "kind": "parameter", "displayName":
"Endpoint Dispatcher", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.spring.ws.bean.CamelEndpointDispatcher",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The
org.apache.camel.compone [...]
"endpointMapping": { "index": 7, "kind": "parameter", "displayName":
"Endpoint Mapping", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.spring.ws.bean.CamelSpringWSEndpointMapping",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The
org.apache.camel.componen [...]
"expression": { "index": 8, "kind": "parameter", "displayName":
"Expression", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The XPath expression to
use when option type=xpathresult. Then this option is required to be c [...]
- "bridgeErrorHandler": { "index": 9, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 10, "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, "autowired": 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 de [...]
- "exchangePattern": { "index": 11, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
- "allowResponseAttachmentOverride": { "index": 12, "kind": "parameter",
"displayName": "Allow Response Attachment Override", "group": "producer",
"label": "producer", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the
attachments o [...]
- "allowResponseHeaderOverride": { "index": 13, "kind": "parameter",
"displayName": "Allow Response Header Override", "group": "producer", "label":
"producer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the SOAP
header of the re [...]
- "faultAction": { "index": 14, "kind": "parameter", "displayName": "Fault
Action", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of a SOAP fault that the consumer returns. Only used when endp [...]
- "faultTo": { "index": 15, "kind": "parameter", "displayName": "Fault To",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.net.URI", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The address of the
WS-Addressing FaultTo header of the request that the producer sends. Only used
when [...]
- "messageFactory": { "index": 16, "kind": "parameter", "displayName":
"Message Factory", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.WebServiceMessageFactory", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Option to provide a
custom WebServiceMessageFactory." },
- "messageSender": { "index": 17, "kind": "parameter", "displayName":
"Message Sender", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.transport.WebServiceMessageSender", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "To use a custom
org.springframework.ws.transpo [...]
- "outputAction": { "index": 18, "kind": "parameter", "displayName": "Output
Action", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of the response that the consumer returns. Only used when en [...]
+ "faultAction": { "index": 9, "kind": "parameter", "displayName": "Fault
Action", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of a SOAP fault that the consumer returns. Only used when endpo [...]
+ "outputAction": { "index": 10, "kind": "parameter", "displayName": "Output
Action", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of the response that the consumer returns. Only used when en [...]
+ "bridgeErrorHandler": { "index": 11, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
+ "exceptionHandler": { "index": 12, "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, "autowired": 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 de [...]
+ "exchangePattern": { "index": 13, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
+ "allowResponseAttachmentOverride": { "index": 14, "kind": "parameter",
"displayName": "Allow Response Attachment Override", "group": "producer",
"label": "producer", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the
attachments o [...]
+ "allowResponseHeaderOverride": { "index": 15, "kind": "parameter",
"displayName": "Allow Response Header Override", "group": "producer", "label":
"producer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the SOAP
header of the re [...]
+ "faultTo": { "index": 16, "kind": "parameter", "displayName": "Fault To",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.net.URI", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The address of the
WS-Addressing FaultTo header of the request that the producer sends. Only used
when [...]
+ "messageFactory": { "index": 17, "kind": "parameter", "displayName":
"Message Factory", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.WebServiceMessageFactory", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Option to provide a
custom WebServiceMessageFactory." },
+ "messageSender": { "index": 18, "kind": "parameter", "displayName":
"Message Sender", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.transport.WebServiceMessageSender", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "To use a custom
org.springframework.ws.transpo [...]
"replyTo": { "index": 19, "kind": "parameter", "displayName": "Reply To",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.net.URI", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The address of the
WS-Addressing ReplyTo header of the request that the producer sends. Only used
when [...]
"soapAction": { "index": 20, "kind": "parameter", "displayName": "Soap
Action", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The SOAP action of the
request that the producer sends. The CamelSpringWebserviceSoapAction [...]
"timeout": { "index": 21, "kind": "parameter", "displayName": "Timeout",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The socket read timeout
in milliseconds for the requests that the producer sends. Only applied to a
message sen [...]
diff --git
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index e6fdb4a424ec..03144d2c6643 100644
---
a/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++
b/catalog/camel-catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -1729,6 +1729,23 @@ public class CamelCatalogTest {
assertEquals("delete", result.getNotProducerOnly().iterator().next());
}
+ @Test
+ public void testValidateEndpointSpringWsConsumerOptions() {
+ String uri =
"spring-ws:action:http://example.com/GetFoo?endpointMapping=#wsaEndpointMapping"
+ +
"&outputAction=http://example.com/GetFooResponse&faultAction=http://example.com/GetFooFault";
+ EndpointValidationResult result =
catalog.validateEndpointProperties(uri, false, true, false);
+ assertTrue(result.isSuccess(), result.summaryErrorMessage(false));
+
+ uri =
"spring-ws:http://example.com/ws?outputAction=http://example.com/GetFooResponse"
+ + "&faultAction=http://example.com/GetFooFault";
+ result = catalog.validateEndpointProperties(uri, false, false, true);
+ assertFalse(result.isSuccess());
+
+ assertEquals(2, result.getNotProducerOnly().size());
+ assertTrue(result.getNotProducerOnly().contains("outputAction"));
+ assertTrue(result.getNotProducerOnly().contains("faultAction"));
+ }
+
@Test
public void testNettyHttpDynamicToIssue() throws Exception {
String uri =
"netty-http:http://10.192.1.10:8080/client/alerts/summary?throwExceptionOnFailure=false";
diff --git
a/components/camel-spring-parent/camel-spring-ws/src/generated/resources/META-INF/org/apache/camel/component/spring/ws/spring-ws.json
b/components/camel-spring-parent/camel-spring-ws/src/generated/resources/META-INF/org/apache/camel/component/spring/ws/spring-ws.json
index b1492bbc1a49..c9993b1fae98 100644
---
a/components/camel-spring-parent/camel-spring-ws/src/generated/resources/META-INF/org/apache/camel/component/spring/ws/spring-ws.json
+++
b/components/camel-spring-parent/camel-spring-ws/src/generated/resources/META-INF/org/apache/camel/component/spring/ws/spring-ws.json
@@ -55,16 +55,16 @@
"endpointDispatcher": { "index": 6, "kind": "parameter", "displayName":
"Endpoint Dispatcher", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.spring.ws.bean.CamelEndpointDispatcher",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The
org.apache.camel.compone [...]
"endpointMapping": { "index": 7, "kind": "parameter", "displayName":
"Endpoint Mapping", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.spring.ws.bean.CamelSpringWSEndpointMapping",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The
org.apache.camel.componen [...]
"expression": { "index": 8, "kind": "parameter", "displayName":
"Expression", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The XPath expression to
use when option type=xpathresult. Then this option is required to be c [...]
- "bridgeErrorHandler": { "index": 9, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 10, "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, "autowired": 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 de [...]
- "exchangePattern": { "index": 11, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
- "allowResponseAttachmentOverride": { "index": 12, "kind": "parameter",
"displayName": "Allow Response Attachment Override", "group": "producer",
"label": "producer", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the
attachments o [...]
- "allowResponseHeaderOverride": { "index": 13, "kind": "parameter",
"displayName": "Allow Response Header Override", "group": "producer", "label":
"producer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the SOAP
header of the re [...]
- "faultAction": { "index": 14, "kind": "parameter", "displayName": "Fault
Action", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of a SOAP fault that the consumer returns. Only used when endp [...]
- "faultTo": { "index": 15, "kind": "parameter", "displayName": "Fault To",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.net.URI", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The address of the
WS-Addressing FaultTo header of the request that the producer sends. Only used
when [...]
- "messageFactory": { "index": 16, "kind": "parameter", "displayName":
"Message Factory", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.WebServiceMessageFactory", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Option to provide a
custom WebServiceMessageFactory." },
- "messageSender": { "index": 17, "kind": "parameter", "displayName":
"Message Sender", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.transport.WebServiceMessageSender", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "To use a custom
org.springframework.ws.transpo [...]
- "outputAction": { "index": 18, "kind": "parameter", "displayName": "Output
Action", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of the response that the consumer returns. Only used when en [...]
+ "faultAction": { "index": 9, "kind": "parameter", "displayName": "Fault
Action", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of a SOAP fault that the consumer returns. Only used when endpo [...]
+ "outputAction": { "index": 10, "kind": "parameter", "displayName": "Output
Action", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.net.URI", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The WS-Addressing Action
header of the response that the consumer returns. Only used when en [...]
+ "bridgeErrorHandler": { "index": 11, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
+ "exceptionHandler": { "index": 12, "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, "autowired": 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 de [...]
+ "exchangePattern": { "index": 13, "kind": "parameter", "displayName":
"Exchange Pattern", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ],
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
+ "allowResponseAttachmentOverride": { "index": 14, "kind": "parameter",
"displayName": "Allow Response Attachment Override", "group": "producer",
"label": "producer", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the
attachments o [...]
+ "allowResponseHeaderOverride": { "index": 15, "kind": "parameter",
"displayName": "Allow Response Header Override", "group": "producer", "label":
"producer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Whether to copy the SOAP
header of the re [...]
+ "faultTo": { "index": 16, "kind": "parameter", "displayName": "Fault To",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.net.URI", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The address of the
WS-Addressing FaultTo header of the request that the producer sends. Only used
when [...]
+ "messageFactory": { "index": 17, "kind": "parameter", "displayName":
"Message Factory", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.WebServiceMessageFactory", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "Option to provide a
custom WebServiceMessageFactory." },
+ "messageSender": { "index": 18, "kind": "parameter", "displayName":
"Message Sender", "group": "producer", "label": "producer", "required": false,
"type": "object", "javaType":
"org.springframework.ws.transport.WebServiceMessageSender", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "To use a custom
org.springframework.ws.transpo [...]
"replyTo": { "index": 19, "kind": "parameter", "displayName": "Reply To",
"group": "producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.net.URI", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The address of the
WS-Addressing ReplyTo header of the request that the producer sends. Only used
when [...]
"soapAction": { "index": 20, "kind": "parameter", "displayName": "Soap
Action", "group": "producer", "label": "producer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The SOAP action of the
request that the producer sends. The CamelSpringWebserviceSoapAction [...]
"timeout": { "index": 21, "kind": "parameter", "displayName": "Timeout",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.spring.ws.SpringWebserviceConfiguration",
"configurationField": "configuration", "description": "The socket read timeout
in milliseconds for the requests that the producer sends. Only applied to a
message sen [...]
diff --git
a/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
b/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
index f2dff8f5ba20..40f02b174e9a 100644
---
a/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
+++
b/components/camel-spring-parent/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceConfiguration.java
@@ -87,18 +87,6 @@ public class SpringWebserviceConfiguration {
+ " request that the producer sends. If neither is
set, the producer adds no WS-Addressing"
+ " headers.")
private URI wsAddressingAction;
- @UriParam(label = "producer",
- description = "The WS-Addressing Action header of the response
that the consumer returns. Only used when"
- + " endpointMapping is a WSACamelEndpointMapping.
If not set, the Action header of the request"
- + " followed by the outputActionSuffix of the
WSACamelEndpointMapping is used, and that suffix is"
- + " Response by default. The producer does not use
it.")
- private URI outputAction;
- @UriParam(label = "producer",
- description = "The WS-Addressing Action header of a SOAP fault
that the consumer returns. Only used when"
- + " endpointMapping is a WSACamelEndpointMapping.
If not set, the Action header of the request"
- + " followed by the faultActionSuffix of the
WSACamelEndpointMapping is used, and that suffix is"
- + " Response by default. The producer does not use
it.")
- private URI faultAction;
@UriParam(label = "producer",
description = "The address of the WS-Addressing FaultTo header
of the request that the producer sends. Only used"
+ " when the wsAddressingAction option or the
CamelSpringWebserviceAddressingAction header is set."
@@ -171,6 +159,18 @@ public class SpringWebserviceConfiguration {
+ " a SoapActionEndpointMapping, maps requests to
this bean. When type is beanname, the component"
+ " sets this option to the
CamelEndpointDispatcher bean in the registry whose name is lookupKey.")
private CamelEndpointDispatcher endpointDispatcher;
+ @UriParam(label = "consumer",
+ description = "The WS-Addressing Action header of the response
that the consumer returns. Only used when"
+ + " endpointMapping is a WSACamelEndpointMapping.
If not set, the Action header of the request"
+ + " followed by the outputActionSuffix of the
WSACamelEndpointMapping is used, and that suffix is"
+ + " Response by default.")
+ private URI outputAction;
+ @UriParam(label = "consumer",
+ description = "The WS-Addressing Action header of a SOAP fault
that the consumer returns. Only used when"
+ + " endpointMapping is a WSACamelEndpointMapping.
If not set, the Action header of the request"
+ + " followed by the faultActionSuffix of the
WSACamelEndpointMapping is used, and that suffix is"
+ + " Response by default.")
+ private URI faultAction;
public WebServiceTemplate getWebServiceTemplate() {
return webServiceTemplate;
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
index f4f9b9c3dc2d..2aa30d446426 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_24.adoc
@@ -7700,6 +7700,16 @@ conversion error. Previously it gave an empty SOAP body.
A reply body that is an
The `spring-ws` producer now sends a `File` body, the file of a `file` or
`ftp` consumer, and an `InputStream` body
(also when stream caching is off) as XML. Previously these failed with an
`InvalidPayloadException`.
+=== camel-spring-ws - outputAction and faultAction are consumer options
+
+The `outputAction` and `faultAction` options of the `spring-ws` endpoint now
have the label `consumer` instead of
+`producer`, as only the consumer uses them. In the Endpoint DSL, both methods
moved from
+`SpringWebserviceEndpointProducerBuilder` to
`SpringWebserviceEndpointConsumerBuilder` and return the consumer builder.
+A call of one of them on the producer builder no longer compiles, and neither
does
+`to(springWs(...).outputAction(...))`. Code compiled against an earlier
version that calls one of them must be
+recompiled. Remove the two options from producer endpoints: they had no effect
there, and the endpoint validation of the
+catalog now reports them in producer-only mode. The behavior of the component
at runtime does not change.
+
=== camel-ignite - cache PUT of a Map, the existing query results, RUN bodies
and missing operations
With `fireExistingQueryResults=true`, the `ignite-cache` consumer now sends
each entry that the initial query finds
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
index 6eb186c8eba5..75851c573fe0 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SpringWebserviceEndpointBuilderFactory.java
@@ -233,6 +233,78 @@ public interface SpringWebserviceEndpointBuilderFactory {
doSetProperty("expression", expression);
return this;
}
+ /**
+ * The WS-Addressing Action header of a SOAP fault that the consumer
+ * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
+ * If not set, the Action header of the request followed by the
+ * faultActionSuffix of the WSACamelEndpointMapping is used, and that
+ * suffix is Response by default.
+ *
+ * The option is a: <code>java.net.URI</code> type.
+ *
+ * Group: consumer
+ *
+ * @param faultAction the value to set
+ * @return the dsl builder
+ */
+ default SpringWebserviceEndpointConsumerBuilder
faultAction(java.net.URI faultAction) {
+ doSetProperty("faultAction", faultAction);
+ return this;
+ }
+ /**
+ * The WS-Addressing Action header of a SOAP fault that the consumer
+ * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
+ * If not set, the Action header of the request followed by the
+ * faultActionSuffix of the WSACamelEndpointMapping is used, and that
+ * suffix is Response by default.
+ *
+ * The option will be converted to a <code>java.net.URI</code> type.
+ *
+ * Group: consumer
+ *
+ * @param faultAction the value to set
+ * @return the dsl builder
+ */
+ default SpringWebserviceEndpointConsumerBuilder faultAction(String
faultAction) {
+ doSetProperty("faultAction", faultAction);
+ return this;
+ }
+ /**
+ * The WS-Addressing Action header of the response that the consumer
+ * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
+ * If not set, the Action header of the request followed by the
+ * outputActionSuffix of the WSACamelEndpointMapping is used, and that
+ * suffix is Response by default.
+ *
+ * The option is a: <code>java.net.URI</code> type.
+ *
+ * Group: consumer
+ *
+ * @param outputAction the value to set
+ * @return the dsl builder
+ */
+ default SpringWebserviceEndpointConsumerBuilder
outputAction(java.net.URI outputAction) {
+ doSetProperty("outputAction", outputAction);
+ return this;
+ }
+ /**
+ * The WS-Addressing Action header of the response that the consumer
+ * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
+ * If not set, the Action header of the request followed by the
+ * outputActionSuffix of the WSACamelEndpointMapping is used, and that
+ * suffix is Response by default.
+ *
+ * The option will be converted to a <code>java.net.URI</code> type.
+ *
+ * Group: consumer
+ *
+ * @param outputAction the value to set
+ * @return the dsl builder
+ */
+ default SpringWebserviceEndpointConsumerBuilder outputAction(String
outputAction) {
+ doSetProperty("outputAction", outputAction);
+ return this;
+ }
/**
* To use a custom org.apache.camel.support.jsse.SSLContextParameters
* for the HTTPS requests that the producer sends. Only applied to a
@@ -603,42 +675,6 @@ public interface SpringWebserviceEndpointBuilderFactory {
doSetProperty("allowResponseHeaderOverride",
allowResponseHeaderOverride);
return this;
}
- /**
- * The WS-Addressing Action header of a SOAP fault that the consumer
- * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
- * If not set, the Action header of the request followed by the
- * faultActionSuffix of the WSACamelEndpointMapping is used, and that
- * suffix is Response by default. The producer does not use it.
- *
- * The option is a: <code>java.net.URI</code> type.
- *
- * Group: producer
- *
- * @param faultAction the value to set
- * @return the dsl builder
- */
- default SpringWebserviceEndpointProducerBuilder
faultAction(java.net.URI faultAction) {
- doSetProperty("faultAction", faultAction);
- return this;
- }
- /**
- * The WS-Addressing Action header of a SOAP fault that the consumer
- * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
- * If not set, the Action header of the request followed by the
- * faultActionSuffix of the WSACamelEndpointMapping is used, and that
- * suffix is Response by default. The producer does not use it.
- *
- * The option will be converted to a <code>java.net.URI</code> type.
- *
- * Group: producer
- *
- * @param faultAction the value to set
- * @return the dsl builder
- */
- default SpringWebserviceEndpointProducerBuilder faultAction(String
faultAction) {
- doSetProperty("faultAction", faultAction);
- return this;
- }
/**
* The address of the WS-Addressing FaultTo header of the request that
* the producer sends. Only used when the wsAddressingAction option or
@@ -751,42 +787,6 @@ public interface SpringWebserviceEndpointBuilderFactory {
doSetProperty("messageSender", messageSender);
return this;
}
- /**
- * The WS-Addressing Action header of the response that the consumer
- * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
- * If not set, the Action header of the request followed by the
- * outputActionSuffix of the WSACamelEndpointMapping is used, and that
- * suffix is Response by default. The producer does not use it.
- *
- * The option is a: <code>java.net.URI</code> type.
- *
- * Group: producer
- *
- * @param outputAction the value to set
- * @return the dsl builder
- */
- default SpringWebserviceEndpointProducerBuilder
outputAction(java.net.URI outputAction) {
- doSetProperty("outputAction", outputAction);
- return this;
- }
- /**
- * The WS-Addressing Action header of the response that the consumer
- * returns. Only used when endpointMapping is a
WSACamelEndpointMapping.
- * If not set, the Action header of the request followed by the
- * outputActionSuffix of the WSACamelEndpointMapping is used, and that
- * suffix is Response by default. The producer does not use it.
- *
- * The option will be converted to a <code>java.net.URI</code> type.
- *
- * Group: producer
- *
- * @param outputAction the value to set
- * @return the dsl builder
- */
- default SpringWebserviceEndpointProducerBuilder outputAction(String
outputAction) {
- doSetProperty("outputAction", outputAction);
- return this;
- }
/**
* The address of the WS-Addressing ReplyTo header of the request that
* the producer sends. Only used when the wsAddressingAction option or