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 2023/06/09 09:38:30 UTC
[camel] branch camel-3.x updated: CAMEL-19426: camel-spring-ws - Fix wrong uri syntax path param
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new e7bf8c06459 CAMEL-19426: camel-spring-ws - Fix wrong uri syntax path param
e7bf8c06459 is described below
commit e7bf8c06459aa93287c03c213d6b38d1a0671931
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 9 11:35:02 2023 +0200
CAMEL-19426: camel-spring-ws - Fix wrong uri syntax path param
---
.../camel/component/spring/ws/SpringWebserviceEndpointConfigurer.java | 3 +++
.../camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java | 1 -
.../resources/org/apache/camel/component/spring/ws/spring-ws.json | 2 +-
.../camel/component/spring/ws/SpringWebserviceConfiguration.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointConfigurer.java b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointConfigurer.java
index d644072f8a2..63f94150a7a 100644
--- a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointConfigurer.java
+++ b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointConfigurer.java
@@ -35,6 +35,7 @@ public class SpringWebserviceEndpointConfigurer extends PropertyConfigurerSuppor
case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
case "exchangepattern":
case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
+ case "expression": target.getConfiguration().setExpression(property(camelContext, java.lang.String.class, value)); return true;
case "faultaction":
case "faultAction": target.getConfiguration().setFaultAction(property(camelContext, java.net.URI.class, value)); return true;
case "faultto":
@@ -83,6 +84,7 @@ public class SpringWebserviceEndpointConfigurer extends PropertyConfigurerSuppor
case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
case "exchangepattern":
case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+ case "expression": return java.lang.String.class;
case "faultaction":
case "faultAction": return java.net.URI.class;
case "faultto":
@@ -132,6 +134,7 @@ public class SpringWebserviceEndpointConfigurer extends PropertyConfigurerSuppor
case "exceptionHandler": return target.getExceptionHandler();
case "exchangepattern":
case "exchangePattern": return target.getExchangePattern();
+ case "expression": return target.getConfiguration().getExpression();
case "faultaction":
case "faultAction": return target.getConfiguration().getFaultAction();
case "faultto":
diff --git a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java
index edcad73860e..5561216d786 100644
--- a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java
+++ b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriFactory.java
@@ -67,7 +67,6 @@ public class SpringWebserviceEndpointUriFactory extends org.apache.camel.support
uri = buildPathParameter(syntax, uri, "type", null, false, copy);
uri = buildPathParameter(syntax, uri, "lookupKey", null, false, copy);
uri = buildPathParameter(syntax, uri, "webServiceEndpointUri", null, false, copy);
- uri = buildPathParameter(syntax, uri, "expression", null, false, copy);
uri = buildQueryParameters(uri, copy, encode);
return uri;
}
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 f6a8f41e6ec..725e07148d3 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
@@ -40,11 +40,11 @@
"type": { "kind": "path", "displayName": "Type", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.spring.ws.type.EndpointMappingType", "enum": [ "ROOT_QNAME", "ACTION", "TO", "SOAP_ACTION", "XPATHRESULT", "URI", "URI_PATH", "BEANNAME" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configu [...]
"lookupKey": { "kind": "path", "displayName": "Lookup Key", "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": "Endpoint mapping key if endpoint mapping is used" },
"webServiceEndpointUri": { "kind": "path", "displayName": "Web Service Endpoint Uri", "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 default Web Service endpoint uri to use for the producer." },
- "expression": { "kind": "path", "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 configured." },
"messageFilter": { "kind": "parameter", "displayName": "Message Filter", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.spring.ws.filter.MessageFilter", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom MessageFilter. For example when you want [...]
"messageIdStrategy": { "kind": "parameter", "displayName": "Message Id Strategy", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.springframework.ws.soap.addressing.messageid.MessageIdStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Option to provide a custom MessageIdStrategy [...]
"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, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Spring org.springframework.ws.server.end [...]
"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, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.spring.ws.SpringWebserviceConfiguration", "configurationField": "configuration", "description": "Reference to an instance of org.apache.ca [...]
+ "expression": { "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 configured." },
"bridgeErrorHandler": { "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 occurred while the consumer is trying to pickup incoming messages, or the likes, will now [...]
"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, "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 default the con [...]
"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, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
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 6af8514f715..339d223868a 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
@@ -81,7 +81,7 @@ public class SpringWebserviceConfiguration {
private EndpointMappingType endpointMappingType;
@UriPath(label = "consumer", name = "lookupKey")
private String endpointMappingLookupKey;
- @UriPath(label = "consumer")
+ @UriParam(label = "consumer")
private String expression;
private transient XPathExpression xPathExpression;
@UriParam(label = "consumer")