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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 9299a8c0808 [create-pull-request] automated change 9299a8c0808 is described below commit 9299a8c0808515a13ce5bb5c27c1a1815be0f5ff Author: oscerd <osc...@users.noreply.github.com> AuthorDate: Sat Nov 26 01:19:21 2022 +0000 [create-pull-request] automated change --- .../springboot/catalog/components/xquery.json | 1 + .../camel/springboot/catalog/languages/bean.json | 1 + .../springboot/catalog/languages/datasonnet.json | 2 +- .../camel/springboot/catalog/languages/groovy.json | 1 + .../springboot/catalog/languages/hl7terser.json | 3 ++ .../camel/springboot/catalog/languages/joor.json | 2 +- .../camel/springboot/catalog/languages/jq.json | 3 +- .../camel/springboot/catalog/languages/js.json | 1 - .../springboot/catalog/languages/jsonpath.json | 5 +- .../camel/springboot/catalog/languages/mvel.json | 1 + .../camel/springboot/catalog/languages/ognl.json | 1 + .../camel/springboot/catalog/languages/python.json | 1 - .../camel/springboot/catalog/languages/spel.json | 1 + .../camel/springboot/catalog/languages/xpath.json | 3 +- .../camel/springboot/catalog/languages/xquery.json | 4 +- .../springboot/catalog/languages/xtokenize.json | 3 +- .../camel-core-starter/src/main/docs/core.json | 6 +++ .../springboot/TokenizeLanguageConfiguration.java | 13 +++++ .../camel-hl7-starter/src/main/docs/hl7.json | 12 +++++ .../springboot/Hl7TerserLanguageConfiguration.java | 26 ++++++++++ .../src/main/docs/javascript.json | 6 --- .../JavaScriptLanguageConfiguration.java | 13 ----- .../camel-jq-starter/src/main/docs/jq.json | 6 +++ .../jq/springboot/JqLanguageConfiguration.java | 13 +++++ .../src/main/docs/jsonpath.json | 8 +++- .../springboot/JsonPathLanguageConfiguration.java | 30 ++++++++---- .../camel-python-starter/src/main/docs/python.json | 6 --- .../springboot/PythonLanguageConfiguration.java | 13 ----- .../camel-saxon-starter/src/main/docs/saxon.json | 6 +++ .../springboot/XQueryLanguageConfiguration.java | 13 +++++ .../camel-stax-starter/src/main/docs/stax.json | 6 +++ .../XMLTokenizeLanguageConfiguration.java | 13 +++++ .../camel-xpath-starter/src/main/docs/xpath.json | 6 +++ .../springboot/XPathLanguageConfiguration.java | 13 +++++ tooling/camel-spring-boot-dependencies/pom.xml | 56 +++++++++++----------- 35 files changed, 213 insertions(+), 85 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xquery.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xquery.json index 91bc7b4c1d7..9b5417a02ed 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xquery.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xquery.json @@ -34,6 +34,7 @@ "allowStAX": { "kind": "parameter", "displayName": "Allow St AX", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow using StAX mode" }, "headerName": { "kind": "parameter", "displayName": "Header Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a Camel Message header as the input source instead of Message body." }, "namespacePrefixes": { "kind": "parameter", "displayName": "Namespace Prefixes", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "description": "Allows to control which namespace prefixes to use for a set of namespace mappings" }, + "propertyName": { "kind": "parameter", "displayName": "Property Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a Camel Exchange property as the input source instead of Message body. It has a lower precedent than the name of header if both are set." }, "resultsFormat": { "kind": "parameter", "displayName": "Results Format", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xquery.ResultFormat", "enum": [ "Bytes", "BytesSource", "DOM", "DOMSource", "List", "String", "StringSource" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "DOM", "description": "What output result to use" }, "resultType": { "kind": "parameter", "displayName": "Result Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.Class<java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "What output result to use defined as a class" }, "stripsAllWhiteSpace": { "kind": "parameter", "displayName": "Strips All White Space", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to strip all whitespaces" }, diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json index 298dae89b8b..e64731b1fb2 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json @@ -20,6 +20,7 @@ "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of method to call" }, "beanType": { "kind": "attribute", "displayName": "Bean Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class name (fully qualified) of the bean to use Will lookup in registry and if there is a single instance of the same type, then the existing bean is used, otherwise a new bean is created (requires a default no-arg constructor)." }, "scope": { "kind": "attribute", "displayName": "Scope", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent th [...] + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/datasonnet.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/datasonnet.json index c0dfd14090e..a2734385567 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/datasonnet.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/datasonnet.json @@ -19,7 +19,7 @@ "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, "bodyMediaType": { "kind": "attribute", "displayName": "Body Media Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The String representation of the message's body MediaType" }, "outputMediaType": { "kind": "attribute", "displayName": "Output Media Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The String representation of the MediaType to output" }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is com.datasonnet.document.Document" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/groovy.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/groovy.json index 461851d3617..03bb9dc9ca6 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/groovy.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/groovy.json @@ -17,6 +17,7 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/hl7terser.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/hl7terser.json index 4a96a1f8717..0a5bbe887bd 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/hl7terser.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/hl7terser.json @@ -17,6 +17,9 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, + "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, + "propertyName": { "kind": "attribute", "displayName": "Property Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set." }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json index 8af63338f86..7707f324c52 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/joor.json @@ -19,7 +19,7 @@ "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the expression should be pre compiled once during initialization phase. If this is turned off, then the expression is reloaded and compiled on each evaluation." }, "singleQuotes": { "kind": "attribute", "displayName": "Single Quotes", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether single quotes can be used as replacement for double quotes. This is convenient when you need to work with strings inside strings." }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jq.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jq.json index 12481e46eb1..24ce756d725 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jq.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jq.json @@ -17,8 +17,9 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, + "propertyName": { "kind": "attribute", "displayName": "Property Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set." }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/js.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/js.json index c9ea615f6b7..d52a936ddc9 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/js.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/js.json @@ -18,7 +18,6 @@ "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json index 7ff44dee74d..44e4735027d 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/jsonpath.json @@ -17,14 +17,15 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, - "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" }, "suppressExceptions": { "kind": "attribute", "displayName": "Suppress Exceptions", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to suppress exceptions such as PathNotFoundException." }, "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" }, "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." }, "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." }, "unpackArray": { "kind": "attribute", "displayName": "Unpack Array", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to unpack a single element json-array into an object." }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." }, + "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, + "propertyName": { "kind": "attribute", "displayName": "Property Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set." }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/mvel.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/mvel.json index e90d37eb57d..ec3135d9576 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/mvel.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/mvel.json @@ -17,6 +17,7 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/ognl.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/ognl.json index 85abb34362c..fccb6424936 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/ognl.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/ognl.json @@ -17,6 +17,7 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/python.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/python.json index d591dbbbd30..7dd74861e32 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/python.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/python.json @@ -18,7 +18,6 @@ "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/spel.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/spel.json index 33782c85bf0..82ac8d813c0 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/spel.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/spel.json @@ -17,6 +17,7 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xpath.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xpath.json index 81ce1e0f829..6c000cec143 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xpath.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xpath.json @@ -23,10 +23,11 @@ "factoryRef": { "kind": "attribute", "displayName": "Factory Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom XPathFactory to lookup in the registry" }, "objectModel": { "kind": "attribute", "displayName": "Object Model", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The XPath object model to use" }, "logNamespaces": { "kind": "attribute", "displayName": "Log Namespaces", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to log namespaces which can assist during troubleshooting" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "threadSafety": { "kind": "attribute", "displayName": "Thread Safety", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable thread-safety for the returned result of the xpath expression. This applies to when using NODESET as the result type, and the returned set has multiple elements. In this situation there can be thread-safety iss [...] "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to enable pre-compiling the xpath expression during initialization phase. pre-compile is enabled by default. This can be used to turn off, for example in cases the compilation phase is desired at the starting phase, such as i [...] "namespace": { "kind": "element", "displayName": "Namespace", "label": "common", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Injects the XML Namespaces of prefix - uri mappings" }, + "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, + "propertyName": { "kind": "attribute", "displayName": "Property Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xquery.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xquery.json index 657cee2145f..f43a35b4d39 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xquery.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xquery.json @@ -17,10 +17,12 @@ }, "properties": { "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" }, + "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class of the result type (type from output)" }, "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" }, - "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" }, "configurationRef": { "kind": "attribute", "displayName": "Configuration Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Reference to a saxon configuration instance in the registry to use for xquery (requires camel-saxon). This may be needed to add custom functions to a saxon configuration, so these custom functions can be used in xquery expressions." }, "namespace": { "kind": "element", "displayName": "Namespace", "label": "common", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Injects the XML Namespaces of prefix - uri mappings" }, + "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, + "propertyName": { "kind": "attribute", "displayName": "Property Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json index b1fb5af437d..24ee0e103f5 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/xtokenize.json @@ -16,10 +16,11 @@ "modelJavaType": "org.apache.camel.model.language.XMLTokenizerExpression" }, "properties": { - "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." }, "mode": { "kind": "attribute", "displayName": "Mode", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "i", "w", "u", "t" ], "deprecated": false, "autowired": false, "secret": false, "description": "The extraction mode. The available extraction modes are: i - injecting the contextual namespace bindings into the extracted token (default) w - wrapping the extracted token in its ancestor context u - unwrapping the extracted token to its c [...] "group": { "kind": "attribute", "displayName": "Group", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together" }, "namespace": { "kind": "element", "displayName": "Namespace", "label": "common", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Injects the XML Namespaces of prefix - uri mappings" }, + "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set." }, + "propertyName": { "kind": "attribute", "displayName": "Property Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set." }, "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" }, "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" } } diff --git a/components-starter/camel-core-starter/src/main/docs/core.json b/components-starter/camel-core-starter/src/main/docs/core.json index 230339b8167..a3a5e759ecc 100644 --- a/components-starter/camel-core-starter/src/main/docs/core.json +++ b/components-starter/camel-core-starter/src/main/docs/core.json @@ -499,6 +499,12 @@ "description": "Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter.", "sourceType": "org.apache.camel.language.tokenizer.springboot.TokenizeLanguageConfiguration" }, + { + "name": "camel.language.tokenize.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.language.tokenizer.springboot.TokenizeLanguageConfiguration" + }, { "name": "camel.language.tokenize.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java index 4b2c4a52ee0..c0933d3a591 100644 --- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java +++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageConfiguration.java @@ -41,6 +41,11 @@ public class TokenizeLanguageConfiguration * token will be used as the delimiter. */ private String groupDelimiter; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks @@ -55,6 +60,14 @@ public class TokenizeLanguageConfiguration this.groupDelimiter = groupDelimiter; } + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-hl7-starter/src/main/docs/hl7.json b/components-starter/camel-hl7-starter/src/main/docs/hl7.json index ed6f4ec183e..d55f4936959 100644 --- a/components-starter/camel-hl7-starter/src/main/docs/hl7.json +++ b/components-starter/camel-hl7-starter/src/main/docs/hl7.json @@ -53,6 +53,18 @@ "description": "Whether to enable auto configuration of the hl7terser language. This is enabled by default.", "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration" }, + { + "name": "camel.language.hl7terser.header-name", + "type": "java.lang.String", + "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set.", + "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration" + }, + { + "name": "camel.language.hl7terser.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.component.hl7.springboot.Hl7TerserLanguageConfiguration" + }, { "name": "camel.language.hl7terser.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageConfiguration.java b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageConfiguration.java index 778a6e83e4a..9252f5acd4d 100644 --- a/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageConfiguration.java +++ b/components-starter/camel-hl7-starter/src/main/java/org/apache/camel/component/hl7/springboot/Hl7TerserLanguageConfiguration.java @@ -37,12 +37,38 @@ public class Hl7TerserLanguageConfiguration * enabled by default. */ private Boolean enabled; + /** + * Name of header to use as input, instead of the message body It has as + * higher precedent than the propertyName if both are set. + */ + private String headerName; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks */ private Boolean trim = true; + public String getHeaderName() { + return headerName; + } + + public void setHeaderName(String headerName) { + this.headerName = headerName; + } + + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-javascript-starter/src/main/docs/javascript.json b/components-starter/camel-javascript-starter/src/main/docs/javascript.json index 7d47631fb5d..4031b42948c 100644 --- a/components-starter/camel-javascript-starter/src/main/docs/javascript.json +++ b/components-starter/camel-javascript-starter/src/main/docs/javascript.json @@ -24,12 +24,6 @@ "description": "Whether to enable auto configuration of the js language. This is enabled by default.", "sourceType": "org.apache.camel.language.js.springboot.JavaScriptLanguageConfiguration" }, - { - "name": "camel.language.js.header-name", - "type": "java.lang.String", - "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set.", - "sourceType": "org.apache.camel.language.js.springboot.JavaScriptLanguageConfiguration" - }, { "name": "camel.language.js.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageConfiguration.java b/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageConfiguration.java index d8843ce688a..bf50770ee0d 100644 --- a/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageConfiguration.java +++ b/components-starter/camel-javascript-starter/src/main/java/org/apache/camel/language/js/springboot/JavaScriptLanguageConfiguration.java @@ -36,25 +36,12 @@ public class JavaScriptLanguageConfiguration * by default. */ private Boolean enabled; - /** - * Name of header to use as input, instead of the message body It has as - * higher precedent than the propertyName if both are set. - */ - private String headerName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks */ private Boolean trim = true; - public String getHeaderName() { - return headerName; - } - - public void setHeaderName(String headerName) { - this.headerName = headerName; - } - public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-jq-starter/src/main/docs/jq.json b/components-starter/camel-jq-starter/src/main/docs/jq.json index 3df2cc6ba14..c9ebaa0f818 100644 --- a/components-starter/camel-jq-starter/src/main/docs/jq.json +++ b/components-starter/camel-jq-starter/src/main/docs/jq.json @@ -30,6 +30,12 @@ "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set.", "sourceType": "org.apache.camel.language.jq.springboot.JqLanguageConfiguration" }, + { + "name": "camel.language.jq.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.language.jq.springboot.JqLanguageConfiguration" + }, { "name": "camel.language.jq.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageConfiguration.java b/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageConfiguration.java index 55fb50b3f63..348573e15f2 100644 --- a/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageConfiguration.java +++ b/components-starter/camel-jq-starter/src/main/java/org/apache/camel/language/jq/springboot/JqLanguageConfiguration.java @@ -41,6 +41,11 @@ public class JqLanguageConfiguration * higher precedent than the propertyName if both are set. */ private String headerName; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks @@ -55,6 +60,14 @@ public class JqLanguageConfiguration this.headerName = headerName; } + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json b/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json index ffd37aed658..a997b562550 100644 --- a/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json +++ b/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json @@ -41,7 +41,7 @@ { "name": "camel.language.jsonpath.header-name", "type": "java.lang.String", - "description": "Name of header to use as input, instead of the message body", + "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set.", "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration" }, { @@ -50,6 +50,12 @@ "description": "To configure additional options on JSONPath. Multiple values can be separated by comma.", "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration" }, + { + "name": "camel.language.jsonpath.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration" + }, { "name": "camel.language.jsonpath.suppress-exceptions", "type": "java.lang.Boolean", diff --git a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java index 4046c22743d..674b681849f 100644 --- a/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java +++ b/components-starter/camel-jsonpath-starter/src/main/java/org/apache/camel/jsonpath/springboot/JsonPathLanguageConfiguration.java @@ -57,15 +57,21 @@ public class JsonPathLanguageConfiguration * Whether to unpack a single element json-array into an object. */ private Boolean unpackArray = false; - /** - * Name of header to use as input, instead of the message body - */ - private String headerName; /** * To configure additional options on JSONPath. Multiple values can be * separated by comma. */ private String option; + /** + * Name of header to use as input, instead of the message body It has as + * higher precedent than the propertyName if both are set. + */ + private String headerName; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks @@ -112,6 +118,14 @@ public class JsonPathLanguageConfiguration this.unpackArray = unpackArray; } + public String getOption() { + return option; + } + + public void setOption(String option) { + this.option = option; + } + public String getHeaderName() { return headerName; } @@ -120,12 +134,12 @@ public class JsonPathLanguageConfiguration this.headerName = headerName; } - public String getOption() { - return option; + public String getPropertyName() { + return propertyName; } - public void setOption(String option) { - this.option = option; + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; } public Boolean getTrim() { diff --git a/components-starter/camel-python-starter/src/main/docs/python.json b/components-starter/camel-python-starter/src/main/docs/python.json index e022db12176..18ca25421de 100644 --- a/components-starter/camel-python-starter/src/main/docs/python.json +++ b/components-starter/camel-python-starter/src/main/docs/python.json @@ -24,12 +24,6 @@ "description": "Whether to enable auto configuration of the python language. This is enabled by default.", "sourceType": "org.apache.camel.language.python.springboot.PythonLanguageConfiguration" }, - { - "name": "camel.language.python.header-name", - "type": "java.lang.String", - "description": "Name of header to use as input, instead of the message body It has as higher precedent than the propertyName if both are set.", - "sourceType": "org.apache.camel.language.python.springboot.PythonLanguageConfiguration" - }, { "name": "camel.language.python.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageConfiguration.java b/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageConfiguration.java index 338d0d87113..b5ac13075c0 100644 --- a/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageConfiguration.java +++ b/components-starter/camel-python-starter/src/main/java/org/apache/camel/language/python/springboot/PythonLanguageConfiguration.java @@ -36,25 +36,12 @@ public class PythonLanguageConfiguration * enabled by default. */ private Boolean enabled; - /** - * Name of header to use as input, instead of the message body It has as - * higher precedent than the propertyName if both are set. - */ - private String headerName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks */ private Boolean trim = true; - public String getHeaderName() { - return headerName; - } - - public void setHeaderName(String headerName) { - this.headerName = headerName; - } - public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-saxon-starter/src/main/docs/saxon.json b/components-starter/camel-saxon-starter/src/main/docs/saxon.json index 27163e82cf6..adbb2fff724 100644 --- a/components-starter/camel-saxon-starter/src/main/docs/saxon.json +++ b/components-starter/camel-saxon-starter/src/main/docs/saxon.json @@ -97,6 +97,12 @@ "description": "Injects the XML Namespaces of prefix - uri mappings", "sourceType": "org.apache.camel.language.xquery.springboot.XQueryLanguageConfiguration" }, + { + "name": "camel.language.xquery.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.language.xquery.springboot.XQueryLanguageConfiguration" + }, { "name": "camel.language.xquery.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageConfiguration.java b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageConfiguration.java index 83bdd009714..8c0e419e82b 100644 --- a/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageConfiguration.java +++ b/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageConfiguration.java @@ -54,6 +54,11 @@ public class XQueryLanguageConfiguration * Injects the XML Namespaces of prefix - uri mappings */ private List<PropertyDefinition> namespace; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks @@ -84,6 +89,14 @@ public class XQueryLanguageConfiguration this.namespace = namespace; } + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-stax-starter/src/main/docs/stax.json b/components-starter/camel-stax-starter/src/main/docs/stax.json index 6ab62f26c1a..4b131b06158 100644 --- a/components-starter/camel-stax-starter/src/main/docs/stax.json +++ b/components-starter/camel-stax-starter/src/main/docs/stax.json @@ -72,6 +72,12 @@ "description": "Injects the XML Namespaces of prefix - uri mappings", "sourceType": "org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration" }, + { + "name": "camel.language.xtokenize.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration" + }, { "name": "camel.language.xtokenize.trim", "type": "java.lang.Boolean", diff --git a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java index cf15a15eca9..56506cf39cb 100644 --- a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java +++ b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/language/xtokenizer/springboot/XMLTokenizeLanguageConfiguration.java @@ -50,6 +50,11 @@ public class XMLTokenizeLanguageConfiguration * Injects the XML Namespaces of prefix - uri mappings */ private List<PropertyDefinition> namespace; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks @@ -72,6 +77,14 @@ public class XMLTokenizeLanguageConfiguration this.namespace = namespace; } + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + public Boolean getTrim() { return trim; } diff --git a/components-starter/camel-xpath-starter/src/main/docs/xpath.json b/components-starter/camel-xpath-starter/src/main/docs/xpath.json index b2ad3495f88..89f93b9b1a8 100644 --- a/components-starter/camel-xpath-starter/src/main/docs/xpath.json +++ b/components-starter/camel-xpath-starter/src/main/docs/xpath.json @@ -62,6 +62,12 @@ "sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration", "defaultValue": true }, + { + "name": "camel.language.xpath.property-name", + "type": "java.lang.String", + "description": "Name of property to use as input, instead of the message body. It has a lower precedent than the headerName if both are set.", + "sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration" + }, { "name": "camel.language.xpath.saxon", "type": "java.lang.Boolean", diff --git a/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageConfiguration.java b/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageConfiguration.java index ba9c4e653db..2e171093e6d 100644 --- a/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageConfiguration.java +++ b/components-starter/camel-xpath-starter/src/main/java/org/apache/camel/language/xpath/springboot/XPathLanguageConfiguration.java @@ -83,6 +83,11 @@ public class XPathLanguageConfiguration * Injects the XML Namespaces of prefix - uri mappings */ private List<PropertyDefinition> namespace; + /** + * Name of property to use as input, instead of the message body. It has a + * lower precedent than the headerName if both are set. + */ + private String propertyName; /** * Whether to trim the value to remove leading and trailing whitespaces and * line breaks @@ -153,6 +158,14 @@ public class XPathLanguageConfiguration this.namespace = namespace; } + public String getPropertyName() { + return propertyName; + } + + public void setPropertyName(String propertyName) { + this.propertyName = propertyName; + } + public Boolean getTrim() { return trim; } diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 2ed7521ee11..ef0df5657f1 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4373,142 +4373,142 @@ <dependency> <groupId>org.apache.cxf.services.sts</groupId> <artifactId>cxf-services-sts-core</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf.services.ws-discovery</groupId> <artifactId>cxf-services-ws-discovery-api</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-core</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-xml</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-databinding-jaxb</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-features-clustering</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-features-logging</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-simple</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-management</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-extension-providers</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-security-oauth2</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-service-description-swagger</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http-jetty</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-jms</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-local</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-addr</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-mex</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-rm</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-security-oauth2</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-wsdl</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-testutils</artifactId> - <version>3.5.3</version> + <version>3.5.4</version> </dependency> <dependency> <groupId>org.apache.ftpserver</groupId>