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 2024/02/08 15:55:23 UTC
(camel-spring-boot) 02/02: CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 2a24f464bb6b4db62a6ea0691aa000903fd1e4f3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Feb 8 16:55:12 2024 +0100
CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.
---
.../camel/springboot/catalog/components/kudu.json | 3 +-
.../springboot/catalog/components/xquery.json | 64 +++++++++++-----------
.../camel/springboot/catalog/languages/xpath.json | 8 +--
.../camel/springboot/catalog/languages/xquery.json | 8 +--
.../springboot/catalog/languages/xtokenize.json | 8 +--
.../src/main/docs/jsonpath.json | 16 +-----
.../springboot/test/JsonPathHeaderNameTest.java | 5 +-
.../test/JsonPathTransformHeaderNameTest.java | 4 +-
.../SpringJsonPathTransformHeaderNameTest.xml | 2 +-
.../camel-kudu-starter/src/main/docs/kudu.json | 6 ++
.../springboot/KuduComponentAutoConfiguration.java | 2 +-
.../springboot/KuduComponentConfiguration.java | 15 +++++
.../kudu/springboot/KuduComponentConverter.java | 63 +++++++++++++++++++++
...rk.boot.autoconfigure.AutoConfiguration.imports | 3 +-
.../camel-saxon-starter/src/main/docs/saxon.json | 10 +---
.../springboot/XQueryLanguageConfiguration.java | 27 +++------
...XQueryHeaderNameResultTypeAndNamespaceTest.java | 4 +-
.../xquery/springboot/XQueryHeaderNameTest.java | 9 ++-
.../camel-stax-starter/src/main/docs/stax.json | 10 +---
.../XMLTokenizeLanguageConfiguration.java | 27 +++------
.../camel-xpath-starter/src/main/docs/xpath.json | 18 ++----
.../springboot/XPathLanguageConfiguration.java | 27 +++------
22 files changed, 186 insertions(+), 153 deletions(-)
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
index 7fa43b22683..a702ba886a8 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
@@ -24,7 +24,8 @@
},
"componentProperties": {
"lazyStartProducer": { "index": 0, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
- "autowiredEnabled": { "index": 1, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
+ "autowiredEnabled": { "index": 1, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...]
+ "kuduClient": { "index": 2, "kind": "property", "displayName": "Kudu Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.kudu.client.KuduClient", "deprecated": false, "autowired": true, "secret": false, "description": "To use an existing Kudu client instance, instead of creating a client per endpoint. This allows you to customize various aspects to the client configuration." }
},
"headers": {
"CamelKuduSchema": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "org.apache.kudu.Schema", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The schema", "constantName": "org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_SCHEMA" },
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 fee2dbe38a0..9e02593c3e6 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
@@ -33,38 +33,36 @@
"properties": {
"resourceUri": { "index": 0, "kind": "path", "displayName": "Resource Uri", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the template to load from classpath or file system" },
"allowStAX": { "index": 1, "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": { "index": 2, "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": { "index": 3, "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": { "index": 4, "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." },
- "resultsFormat": { "index": 5, "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": { "index": 6, "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": { "index": 7, "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" },
- "variableName": { "index": 8, "kind": "parameter", "displayName": "Variable Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a variable as the input source instead of Message body." },
- "sendEmptyMessageWhenIdle": { "index": 9, "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
- "bridgeErrorHandler": { "index": 10, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
- "exceptionHandler": { "index": 11, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By de [...]
- "exchangePattern": { "index": 12, "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." },
- "pollStrategy": { "index": 13, "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the po [...]
- "lazyStartProducer": { "index": 14, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
- "configuration": { "index": 15, "kind": "parameter", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom Saxon configuration" },
- "configurationProperties": { "index": 16, "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "To set custom Saxon configuration properties" },
- "moduleURIResolver": { "index": 17, "kind": "parameter", "displayName": "Module URIResolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.lib.ModuleURIResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use the custom ModuleURIResolver" },
- "parameters": { "index": 18, "kind": "parameter", "displayName": "Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "Additional parameters" },
- "properties": { "index": 19, "kind": "parameter", "displayName": "Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "description": "Properties to configure the serialization parameters" },
- "staticQueryContext": { "index": 20, "kind": "parameter", "displayName": "Static Query Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.query.StaticQueryContext", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom Saxon StaticQueryContext" },
- "backoffErrorThreshold": { "index": 21, "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
- "backoffIdleThreshold": { "index": 22, "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
- "backoffMultiplier": { "index": 23, "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is h [...]
- "delay": { "index": 24, "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "description": "Milliseconds before the next poll." },
- "greedy": { "index": 25, "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
- "initialDelay": { "index": 26, "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "Milliseconds before the first poll starts." },
- "repeatCount": { "index": 27, "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
- "runLoggingLevel": { "index": 28, "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the l [...]
- "scheduledExecutorService": { "index": 29, "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "autowired": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
- "scheduler": { "index": 30, "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler" },
- "schedulerProperties": { "index": 31, "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
- "startScheduler": { "index": 32, "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the scheduler should be auto started." },
- "timeUnit": { "index": 33, "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
- "useFixedDelay": { "index": 34, "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
+ "namespacePrefixes": { "index": 2, "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" },
+ "resultsFormat": { "index": 3, "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": { "index": 4, "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" },
+ "source": { "index": 5, "kind": "parameter", "displayName": "Source", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body." },
+ "stripsAllWhiteSpace": { "index": 6, "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" },
+ "sendEmptyMessageWhenIdle": { "index": 7, "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
+ "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 (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
+ "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." },
+ "pollStrategy": { "index": 11, "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the po [...]
+ "lazyStartProducer": { "index": 12, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
+ "configuration": { "index": 13, "kind": "parameter", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom Saxon configuration" },
+ "configurationProperties": { "index": 14, "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "To set custom Saxon configuration properties" },
+ "moduleURIResolver": { "index": 15, "kind": "parameter", "displayName": "Module URIResolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.lib.ModuleURIResolver", "deprecated": false, "autowired": false, "secret": false, "description": "To use the custom ModuleURIResolver" },
+ "parameters": { "index": 16, "kind": "parameter", "displayName": "Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "autowired": false, "secret": false, "description": "Additional parameters" },
+ "properties": { "index": 17, "kind": "parameter", "displayName": "Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "autowired": false, "secret": false, "description": "Properties to configure the serialization parameters" },
+ "staticQueryContext": { "index": 18, "kind": "parameter", "displayName": "Static Query Context", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "net.sf.saxon.query.StaticQueryContext", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom Saxon StaticQueryContext" },
+ "backoffErrorThreshold": { "index": 19, "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
+ "backoffIdleThreshold": { "index": 20, "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
+ "backoffMultiplier": { "index": 21, "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is h [...]
+ "delay": { "index": 22, "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "description": "Milliseconds before the next poll." },
+ "greedy": { "index": 23, "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
+ "initialDelay": { "index": 24, "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "Milliseconds before the first poll starts." },
+ "repeatCount": { "index": 25, "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
+ "runLoggingLevel": { "index": 26, "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the l [...]
+ "scheduledExecutorService": { "index": 27, "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "autowired": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
+ "scheduler": { "index": 28, "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler" },
+ "schedulerProperties": { "index": 29, "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
+ "startScheduler": { "index": 30, "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the scheduler should be auto started." },
+ "timeUnit": { "index": 31, "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
+ "useFixedDelay": { "index": 32, "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
}
}
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 8aec341be9d..540ca0695cc 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
@@ -27,10 +27,8 @@
"threadSafety": { "index": 8, "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 threa [...]
"preCompile": { "index": 9, "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 phas [...]
"namespace": { "index": 10, "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" },
- "variableName": { "index": 11, "kind": "attribute", "displayName": "Variable Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of variable to use as input, instead of the message body" },
- "headerName": { "index": 12, "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" },
- "propertyName": { "index": 13, "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." },
- "resultType": { "index": 14, "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": { "index": 15, "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" }
+ "source": { "index": 11, "kind": "attribute", "displayName": "Source", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body." },
+ "resultType": { "index": 12, "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": { "index": 13, "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" }
}
}
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 dc9ead9b093..3de49483de6 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
@@ -20,10 +20,8 @@
"expression": { "index": 1, "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" },
"configurationRef": { "index": 2, "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": { "index": 3, "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" },
- "variableName": { "index": 4, "kind": "attribute", "displayName": "Variable Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of variable to use as input, instead of the message body" },
- "headerName": { "index": 5, "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" },
- "propertyName": { "index": 6, "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." },
- "resultType": { "index": 7, "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": { "index": 8, "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" }
+ "source": { "index": 4, "kind": "attribute", "displayName": "Source", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body." },
+ "resultType": { "index": 5, "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": { "index": 6, "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" }
}
}
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 a0a8a19ca66..b7e12d40d37 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
@@ -21,10 +21,8 @@
"mode": { "index": 2, "kind": "attribute", "displayName": "Mode", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "i", "w", "u", "t" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "i", "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 to [...]
"group": { "index": 3, "kind": "attribute", "displayName": "Group", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together" },
"namespace": { "index": 4, "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" },
- "variableName": { "index": 5, "kind": "attribute", "displayName": "Variable Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of variable to use as input, instead of the message body" },
- "headerName": { "index": 6, "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" },
- "propertyName": { "index": 7, "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." },
- "resultType": { "index": 8, "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": { "index": 9, "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" }
+ "source": { "index": 5, "kind": "attribute", "displayName": "Source", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body." },
+ "resultType": { "index": 6, "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": { "index": 7, "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" }
}
}
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 70fc6291c20..53552c8460e 100644
--- a/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json
+++ b/components-starter/camel-jsonpath-starter/src/main/docs/jsonpath.json
@@ -38,12 +38,6 @@
"description": "Whether to enable auto configuration of the jsonpath language. This is enabled by default.",
"sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration"
},
- {
- "name": "camel.language.jsonpath.header-name",
- "type": "java.lang.String",
- "description": "Name of header to use as input, instead of the message body",
- "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration"
- },
{
"name": "camel.language.jsonpath.option",
"type": "java.lang.String",
@@ -51,9 +45,9 @@
"sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration"
},
{
- "name": "camel.language.jsonpath.property-name",
+ "name": "camel.language.jsonpath.source",
"type": "java.lang.String",
- "description": "Name of property to use as input, instead of the message body.",
+ "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body.",
"sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration"
},
{
@@ -77,12 +71,6 @@
"sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration",
"defaultValue": false
},
- {
- "name": "camel.language.jsonpath.variable-name",
- "type": "java.lang.String",
- "description": "Name of variable to use as input, instead of the message body",
- "sourceType": "org.apache.camel.jsonpath.springboot.JsonPathLanguageConfiguration"
- },
{
"name": "camel.language.jsonpath.write-as-string",
"type": "java.lang.Boolean",
diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java
index 22aecff69d4..30c5a829efe 100644
--- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java
+++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathHeaderNameTest.java
@@ -76,8 +76,11 @@ public class JsonPathHeaderNameTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ var jp = expression().jsonpath().expression("$..store.book.length()").resultType(int.class)
+ .source("header:myHeader").end();
+
from("direct:start")
- .setHeader("number").jsonpath("$..store.book.length()", false, int.class, "myHeader")
+ .setHeader("number", jp)
.to("mock:result");
}
};
diff --git a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java
index 235789e7bd1..5ac48b81424 100644
--- a/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java
+++ b/components-starter/camel-jsonpath-starter/src/test/java/org/apache/camel/component/jsonpath/springboot/test/JsonPathTransformHeaderNameTest.java
@@ -81,8 +81,10 @@ public class JsonPathTransformHeaderNameTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ var jp = expression().jsonpath().expression("$.store.book[*].author").source("header:myHeader").end();
+
from("direct:start")
- .transform().jsonpath("$.store.book[*].author", false, null, "myHeader")
+ .transform(jp)
.to("mock:authors");
}
};
diff --git a/components-starter/camel-jsonpath-starter/src/test/resources/routes/SpringJsonPathTransformHeaderNameTest.xml b/components-starter/camel-jsonpath-starter/src/test/resources/routes/SpringJsonPathTransformHeaderNameTest.xml
index 6bc7616fc34..9e8db3db599 100644
--- a/components-starter/camel-jsonpath-starter/src/test/resources/routes/SpringJsonPathTransformHeaderNameTest.xml
+++ b/components-starter/camel-jsonpath-starter/src/test/resources/routes/SpringJsonPathTransformHeaderNameTest.xml
@@ -22,7 +22,7 @@
<route>
<from uri="direct:start"/>
<transform>
- <jsonpath headerName="myHeader">$.store.book[*].author</jsonpath>
+ <jsonpath source="header:myHeader">$.store.book[*].author</jsonpath>
</transform>
<to uri="mock:authors"/>
</route>
diff --git a/components-starter/camel-kudu-starter/src/main/docs/kudu.json b/components-starter/camel-kudu-starter/src/main/docs/kudu.json
index 640cf217c2b..d03ba058cfd 100644
--- a/components-starter/camel-kudu-starter/src/main/docs/kudu.json
+++ b/components-starter/camel-kudu-starter/src/main/docs/kudu.json
@@ -31,6 +31,12 @@
"description": "Whether to enable auto configuration of the kudu component. This is enabled by default.",
"sourceType": "org.apache.camel.component.kudu.springboot.KuduComponentConfiguration"
},
+ {
+ "name": "camel.component.kudu.kudu-client",
+ "type": "org.apache.kudu.client.KuduClient",
+ "description": "To use an existing Kudu client instance, instead of creating a client per endpoint. This allows you to customize various aspects to the client configuration. The option is a org.apache.kudu.client.KuduClient type.",
+ "sourceType": "org.apache.camel.component.kudu.springboot.KuduComponentConfiguration"
+ },
{
"name": "camel.component.kudu.lazy-start-producer",
"type": "java.lang.Boolean",
diff --git a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java
index 132de82afd5..025973bc55c 100644
--- a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java
+++ b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentAutoConfiguration.java
@@ -42,7 +42,7 @@ import org.springframework.context.annotation.Lazy;
@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class)
@EnableConfigurationProperties({ComponentConfigurationProperties.class,KuduComponentConfiguration.class})
@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.kudu"})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfigureAfter({CamelAutoConfiguration.class, KuduComponentConverter.class})
public class KuduComponentAutoConfiguration {
@Autowired
diff --git a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java
index 6dba2866ad6..f7477d170b9 100644
--- a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java
+++ b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.kudu.springboot;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.apache.kudu.client.KuduClient;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -55,6 +56,12 @@ public class KuduComponentConfiguration
* etc.
*/
private Boolean autowiredEnabled = true;
+ /**
+ * To use an existing Kudu client instance, instead of creating a client per
+ * endpoint. This allows you to customize various aspects to the client
+ * configuration. The option is a org.apache.kudu.client.KuduClient type.
+ */
+ private KuduClient kuduClient;
public Boolean getLazyStartProducer() {
return lazyStartProducer;
@@ -71,4 +78,12 @@ public class KuduComponentConfiguration
public void setAutowiredEnabled(Boolean autowiredEnabled) {
this.autowiredEnabled = autowiredEnabled;
}
+
+ public KuduClient getKuduClient() {
+ return kuduClient;
+ }
+
+ public void setKuduClient(KuduClient kuduClient) {
+ this.kuduClient = kuduClient;
+ }
}
\ No newline at end of file
diff --git a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java
new file mode 100644
index 00000000000..656bdd8e17f
--- /dev/null
+++ b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConverter.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.kudu.springboot;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationPropertiesBinding;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.GenericConverter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Configuration(proxyBeanMethods = false)
+@ConfigurationPropertiesBinding
+@Component
+public class KuduComponentConverter implements GenericConverter {
+
+ @Autowired
+ private ApplicationContext applicationContext;
+
+ public Set<ConvertiblePair> getConvertibleTypes() {
+ Set<ConvertiblePair> answer = new LinkedHashSet<>();
+ answer.add(new ConvertiblePair(String.class, org.apache.kudu.client.KuduClient.class));
+ return answer;
+ }
+
+ public Object convert(
+ Object source,
+ TypeDescriptor sourceType,
+ TypeDescriptor targetType) {
+ if (source == null) {
+ return null;
+ }
+ String ref = source.toString();
+ if (!ref.startsWith("#")) {
+ return null;
+ }
+ ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1);
+ switch (targetType.getName()) {
+ case "org.apache.kudu.client.KuduClient": return applicationContext.getBean(ref, org.apache.kudu.client.KuduClient.class);
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/components-starter/camel-kudu-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-kudu-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
index 369863bef67..11cb947e2b9 100644
--- a/components-starter/camel-kudu-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ b/components-starter/camel-kudu-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -15,4 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-org.apache.camel.component.kudu.springboot.KuduComponentAutoConfiguration
\ No newline at end of file
+org.apache.camel.component.kudu.springboot.KuduComponentAutoConfiguration
+org.apache.camel.component.kudu.springboot.KuduComponentConverter
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 472aab309a3..e6bdb5d47dc 100644
--- a/components-starter/camel-saxon-starter/src/main/docs/saxon.json
+++ b/components-starter/camel-saxon-starter/src/main/docs/saxon.json
@@ -98,9 +98,9 @@
"sourceType": "org.apache.camel.language.xquery.springboot.XQueryLanguageConfiguration"
},
{
- "name": "camel.language.xquery.property-name",
+ "name": "camel.language.xquery.source",
"type": "java.lang.String",
- "description": "Name of property to use as input, instead of the message body.",
+ "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body.",
"sourceType": "org.apache.camel.language.xquery.springboot.XQueryLanguageConfiguration"
},
{
@@ -109,12 +109,6 @@
"description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks",
"sourceType": "org.apache.camel.language.xquery.springboot.XQueryLanguageConfiguration",
"defaultValue": true
- },
- {
- "name": "camel.language.xquery.variable-name",
- "type": "java.lang.String",
- "description": "Name of variable to use as input, instead of the message body",
- "sourceType": "org.apache.camel.language.xquery.springboot.XQueryLanguageConfiguration"
}
],
"hints": []
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 229aab0c969..fab2923cdce 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
@@ -48,13 +48,12 @@ public class XQueryLanguageConfiguration
*/
private List<PropertyDefinition> namespace;
/**
- * Name of variable to use as input, instead of the message body
+ * Source to use, instead of message body. You can prefix with variable:,
+ * header:, or property: to specify kind of source. Otherwise, the source is
+ * assumed to be a variable. Use empty or null to use default source, which
+ * is the message body.
*/
- private String variableName;
- /**
- * Name of property to use as input, instead of the message body.
- */
- private String propertyName;
+ private String source;
/**
* Whether to trim the value to remove leading and trailing whitespaces and
* line breaks
@@ -77,20 +76,12 @@ public class XQueryLanguageConfiguration
this.namespace = namespace;
}
- public String getVariableName() {
- return variableName;
- }
-
- public void setVariableName(String variableName) {
- this.variableName = variableName;
- }
-
- public String getPropertyName() {
- return propertyName;
+ public String getSource() {
+ return source;
}
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
+ public void setSource(String source) {
+ this.source = source;
}
public Boolean getTrim() {
diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java
index 55e3209da1f..7658ae0ae50 100644
--- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java
+++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameResultTypeAndNamespaceTest.java
@@ -79,9 +79,11 @@ public class XQueryHeaderNameResultTypeAndNamespaceTest {
@Override
public void configure() throws Exception {
Namespaces ns = new Namespaces("c", "http://acme.com/cheese");
+ var xq = expression().xquery().expression("/c:number = 55").namespaces(ns).resultType(Integer.class)
+ .source("header:cheeseDetails").end();
from("direct:in").choice()
- .when().xquery("/c:number = 55", Integer.class, ns, "cheeseDetails")
+ .when(xq)
.to("mock:55")
.otherwise()
.to("mock:other")
diff --git a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java
index c39b1e37083..3407b30becc 100644
--- a/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java
+++ b/components-starter/camel-saxon-starter/src/test/java/org/apache/camel/language/xquery/springboot/XQueryHeaderNameTest.java
@@ -110,11 +110,16 @@ public class XQueryHeaderNameTest {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ var premium = expression().xquery().expression("/invoice/@orderType = 'premium'")
+ .source("header:invoiceDetails").end();
+ var standard = expression().xquery().expression("/invoice/@orderType = 'standard'")
+ .source("header:invoiceDetails").end();
+
from("direct:in")
.choice()
- .when().xquery("/invoice/@orderType = 'premium'", "invoiceDetails")
+ .when(premium)
.to("mock:premium")
- .when().xquery("/invoice/@orderType = 'standard'", "invoiceDetails")
+ .when(standard)
.to("mock:standard")
.otherwise()
.to("mock:unknown")
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 1c273c898b4..6eb2646bee4 100644
--- a/components-starter/camel-stax-starter/src/main/docs/stax.json
+++ b/components-starter/camel-stax-starter/src/main/docs/stax.json
@@ -74,9 +74,9 @@
"sourceType": "org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
},
{
- "name": "camel.language.xtokenize.property-name",
+ "name": "camel.language.xtokenize.source",
"type": "java.lang.String",
- "description": "Name of property to use as input, instead of the message body.",
+ "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body.",
"sourceType": "org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
},
{
@@ -85,12 +85,6 @@
"description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks",
"sourceType": "org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration",
"defaultValue": true
- },
- {
- "name": "camel.language.xtokenize.variable-name",
- "type": "java.lang.String",
- "description": "Name of variable to use as input, instead of the message body",
- "sourceType": "org.apache.camel.language.xtokenizer.springboot.XMLTokenizeLanguageConfiguration"
}
],
"hints": []
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 197573605b7..216727f3e0b 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
@@ -49,13 +49,12 @@ public class XMLTokenizeLanguageConfiguration
*/
private List<PropertyDefinition> namespace;
/**
- * Name of variable to use as input, instead of the message body
+ * Source to use, instead of message body. You can prefix with variable:,
+ * header:, or property: to specify kind of source. Otherwise, the source is
+ * assumed to be a variable. Use empty or null to use default source, which
+ * is the message body.
*/
- private String variableName;
- /**
- * Name of property to use as input, instead of the message body.
- */
- private String propertyName;
+ private String source;
/**
* Whether to trim the value to remove leading and trailing whitespaces and
* line breaks
@@ -78,20 +77,12 @@ public class XMLTokenizeLanguageConfiguration
this.namespace = namespace;
}
- public String getVariableName() {
- return variableName;
- }
-
- public void setVariableName(String variableName) {
- this.variableName = variableName;
- }
-
- public String getPropertyName() {
- return propertyName;
+ public String getSource() {
+ return source;
}
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
+ public void setSource(String source) {
+ this.source = source;
}
public Boolean getTrim() {
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 a14ffaf1f7a..85d779c7ded 100644
--- a/components-starter/camel-xpath-starter/src/main/docs/xpath.json
+++ b/components-starter/camel-xpath-starter/src/main/docs/xpath.json
@@ -62,12 +62,6 @@
"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.",
- "sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration"
- },
{
"name": "camel.language.xpath.result-q-name",
"type": "java.lang.String",
@@ -82,6 +76,12 @@
"sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration",
"defaultValue": false
},
+ {
+ "name": "camel.language.xpath.source",
+ "type": "java.lang.String",
+ "description": "Source to use, instead of message body. You can prefix with variable:, header:, or property: to specify kind of source. Otherwise, the source is assumed to be a variable. Use empty or null to use default source, which is the message body.",
+ "sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration"
+ },
{
"name": "camel.language.xpath.thread-safety",
"type": "java.lang.Boolean",
@@ -95,12 +95,6 @@
"description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks",
"sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration",
"defaultValue": true
- },
- {
- "name": "camel.language.xpath.variable-name",
- "type": "java.lang.String",
- "description": "Name of variable to use as input, instead of the message body",
- "sourceType": "org.apache.camel.language.xpath.springboot.XPathLanguageConfiguration"
}
],
"hints": []
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 626d43acd47..35b1e7ef5e5 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
@@ -86,13 +86,12 @@ public class XPathLanguageConfiguration
*/
private List<PropertyDefinition> namespace;
/**
- * Name of variable to use as input, instead of the message body
+ * Source to use, instead of message body. You can prefix with variable:,
+ * header:, or property: to specify kind of source. Otherwise, the source is
+ * assumed to be a variable. Use empty or null to use default source, which
+ * is the message body.
*/
- private String variableName;
- /**
- * Name of property to use as input, instead of the message body.
- */
- private String propertyName;
+ private String source;
/**
* Whether to trim the value to remove leading and trailing whitespaces and
* line breaks
@@ -171,20 +170,12 @@ public class XPathLanguageConfiguration
this.namespace = namespace;
}
- public String getVariableName() {
- return variableName;
- }
-
- public void setVariableName(String variableName) {
- this.variableName = variableName;
- }
-
- public String getPropertyName() {
- return propertyName;
+ public String getSource() {
+ return source;
}
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
+ public void setSource(String source) {
+ this.source = source;
}
public Boolean getTrim() {