This is an automated email from the ASF dual-hosted git repository. acosentino 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 03122a586f0 Regen for commit 5ed505c278d6c61c6a3e2af4e33bb49fa0d014e4 03122a586f0 is described below commit 03122a586f073b400537bb2048935af8a0e71031 Author: davsclaus <davscl...@users.noreply.github.com> AuthorDate: Fri Jun 9 10:30:16 2023 +0000 Regen for commit 5ed505c278d6c61c6a3e2af4e33bb49fa0d014e4 Signed-off-by: GitHub <nore...@github.com> --- .../apache/camel/catalog/components/spring-ws.json | 10 ++++----- .../apache/camel/catalog/schemas/camel-spring.xsd | 8 +++----- .../builder/endpoint/StaticEndpointBuilders.java | 8 -------- .../SpringWebserviceEndpointBuilderFactory.java | 24 ++++++++++++++-------- .../java/org/apache/camel/main/KameletMain.java | 2 +- 5 files changed, 25 insertions(+), 27 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 166b5d29ac2..b0de584237e 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 @@ -40,11 +40,11 @@ "type": { "index": 0, "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", "configurationFiel [...] "lookupKey": { "index": 1, "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": { "index": 2, "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": { "index": 3, "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 config [...] - "messageFilter": { "index": 4, "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 wh [...] - "messageIdStrategy": { "index": 5, "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 Messa [...] - "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": "Spring org.springframework.w [...] - "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": "Reference to an instance of o [...] + "messageFilter": { "index": 3, "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 wh [...] + "messageIdStrategy": { "index": 4, "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 Messa [...] + "endpointDispatcher": { "index": 5, "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.w [...] + "endpointMapping": { "index": 6, "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 o [...] + "expression": { "index": 7, "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": 8, "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 lik [...] "exceptionHandler": { "index": 9, "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 def [...] "exchangePattern": { "index": 10, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "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." }, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 21689220767..23facf71a00 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -13834,11 +13834,7 @@ Reference to the rest-dsl. <xs:extension base="tns:noOutputDefinition"> - <xs:sequence> - - <xs:element minOccurs="0" name="loggingLevel" type="xs:string"/> - - </xs:sequence> + <xs:sequence/> <xs:attribute name="resumeStrategy" type="xs:string" use="required"> <xs:annotation> @@ -13848,6 +13844,8 @@ Sets the resume strategy to use. </xs:annotation> </xs:attribute> + <xs:attribute name="loggingLevel" type="xs:string"/> + <xs:attribute name="intermittent" type="xs:string"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index d45086899e7..48a5c7b4933 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -13151,10 +13151,6 @@ public class StaticEndpointBuilders { * Path parameter: webServiceEndpointUri * The default Web Service endpoint uri to use for the producer. * - * Path parameter: expression - * The XPath expression to use when option type=xpathresult. Then this - * option is required to be configured. - * * @param path type:lookupKey:webServiceEndpointUri * @return the dsl builder */ @@ -13194,10 +13190,6 @@ public class StaticEndpointBuilders { * Path parameter: webServiceEndpointUri * The default Web Service endpoint uri to use for the producer. * - * Path parameter: expression - * The XPath expression to use when option type=xpathresult. Then this - * option is required to be configured. - * * @param componentName to use a custom component name for the endpoint * instead of the default name * @param path type:lookupKey:webServiceEndpointUri 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 7e3a8eb386f..a7101a0b489 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 @@ -193,6 +193,22 @@ public interface SpringWebserviceEndpointBuilderFactory { doSetProperty("endpointMapping", endpointMapping); return this; } + /** + * The XPath expression to use when option type=xpathresult. Then this + * option is required to be configured. + * + * The option is a: <code>java.lang.String</code> type. + * + * Group: consumer + * + * @param expression the value to set + * @return the dsl builder + */ + default SpringWebserviceEndpointConsumerBuilder expression( + String expression) { + doSetProperty("expression", expression); + return this; + } /** * To configure security using SSLContextParameters. * @@ -1133,10 +1149,6 @@ public interface SpringWebserviceEndpointBuilderFactory { * Path parameter: webServiceEndpointUri * The default Web Service endpoint uri to use for the producer. * - * Path parameter: expression - * The XPath expression to use when option type=xpathresult. Then this - * option is required to be configured. - * * @param path type:lookupKey:webServiceEndpointUri * @return the dsl builder */ @@ -1176,10 +1188,6 @@ public interface SpringWebserviceEndpointBuilderFactory { * Path parameter: webServiceEndpointUri * The default Web Service endpoint uri to use for the producer. * - * Path parameter: expression - * The XPath expression to use when option type=xpathresult. Then this - * option is required to be configured. - * * @param componentName to use a custom component name for the endpoint * instead of the default name * @param path type:lookupKey:webServiceEndpointUri diff --git a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java index 2ea86e2cfcd..65db3209e72 100644 --- a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java +++ b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java @@ -475,7 +475,7 @@ public class KameletMain extends MainCommandLineSupport { answer.getCamelContextExtension().setBootstrapFactoryFinder(ff); ff = ffr.resolveDefaultFactoryFinder(classResolver); answer.getCamelContextExtension().setDefaultFactoryFinder(ff); - + answer.getCamelContextExtension().addContextPlugin(ComponentResolver.class, new DependencyDownloaderComponentResolver(answer, stub)); answer.getCamelContextExtension().addContextPlugin(UriFactoryResolver.class,