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
The following commit(s) were added to refs/heads/main by this push:
new 36aca8f1a5e Regen
36aca8f1a5e is described below
commit 36aca8f1a5ef7d753c968513841f1616ce481426
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Jan 27 12:07:24 2025 +0100
Regen
---
.../apache/camel/springboot/catalog/components/kamelet.json | 4 ++--
.../camel-kamelet-starter/src/main/docs/kamelet.json | 4 ++--
.../kamelet/springboot/KameletComponentConfiguration.java | 13 +++++++++----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kamelet.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kamelet.json
index 7e21a23f286..41db67910ae 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kamelet.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kamelet.json
@@ -32,7 +32,7 @@
"lazyStartProducer": { "index": 5, "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 [...]
"timeout": { "index": 6, "kind": "property", "displayName": "Timeout",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 30000, "description": "The timeout value to use if block is
enabled." },
"autowiredEnabled": { "index": 7, "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 [...]
- "noErrorHandler": { "index": 8, "kind": "property", "displayName": "No
Error Handler", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Kamelets, by
default, will not do fine-grained error handling, but works in no-error-handler
mode. This can be turned off, to use old behaviour in earlier versions of
Camel." },
+ "noErrorHandler": { "index": 8, "kind": "property", "displayName": "No
Error Handler", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether kamelets
should use error handling or not. By default, the Kamelet uses the same error
handler as from the calling route. This means that if the calling route has
error handling that performs r [...]
"routeTemplateLoaderListener": { "index": 9, "kind": "property",
"displayName": "Route Template Loader Listener", "group": "advanced", "label":
"advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.RouteTemplateLoaderListener", "deprecated": false,
"autowired": true, "secret": false, "description": "To plugin a custom listener
for when the Kamelet component is loading Kamelets from external resources." }
},
"properties": {
@@ -46,6 +46,6 @@
"lazyStartProducer": { "index": 7, "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 produc [...]
"timeout": { "index": 8, "kind": "parameter", "displayName": "Timeout",
"group": "producer (advanced)", "label": "producer,advanced", "required":
false, "type": "integer", "javaType": "long", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 30000, "description": "The timeout
value to use if block is enabled." },
"location": { "index": 9, "kind": "parameter", "displayName": "Location",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Location of the Kamelet to
use which can be specified as a resource from file system, classpath etc. The
location cannot use wildcards, and must refer to a file including extension,
for example file:\/etc\/ [...]
- "noErrorHandler": { "index": 10, "kind": "parameter", "displayName": "No
Error Handler", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Kamelets, by
default, will not do fine-grained error handling, but works in no-error-handler
mode. This can be turned off, to use old behaviour in earlier versions of
Camel." }
+ "noErrorHandler": { "index": 10, "kind": "parameter", "displayName": "No
Error Handler", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether kamelets
should use error handling or not. By default, the Kamelet uses the same error
handler as from the calling route. This means that if the calling route has
error handling that performs [...]
}
}
diff --git
a/components-starter/camel-kamelet-starter/src/main/docs/kamelet.json
b/components-starter/camel-kamelet-starter/src/main/docs/kamelet.json
index 5252a78b2ca..a322ef72788 100644
--- a/components-starter/camel-kamelet-starter/src/main/docs/kamelet.json
+++ b/components-starter/camel-kamelet-starter/src/main/docs/kamelet.json
@@ -62,9 +62,9 @@
{
"name": "camel.component.kamelet.no-error-handler",
"type": "java.lang.Boolean",
- "description": "Kamelets, by default, will not do fine-grained error
handling, but works in no-error-handler mode. This can be turned off, to use
old behaviour in earlier versions of Camel.",
+ "description": "Whether kamelets should use error handling or not. By
default, the Kamelet uses the same error handler as from the calling route.
This means that if the calling route has error handling that performs retries,
or routing to a dead letter channel, then the kamelet route will use this also.
This can be turned off by setting this option to true. If off then the kamelet
route is not using error handling, and any exception thrown will for source
kamelets be logged by the [...]
"sourceType":
"org.apache.camel.component.kamelet.springboot.KameletComponentConfiguration",
- "defaultValue": true
+ "defaultValue": false
},
{
"name": "camel.component.kamelet.route-properties",
diff --git
a/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConfiguration.java
b/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConfiguration.java
index 11a5bd885f2..f2117f3d0e6 100644
---
a/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConfiguration.java
+++
b/components-starter/camel-kamelet-starter/src/main/java/org/apache/camel/component/kamelet/springboot/KameletComponentConfiguration.java
@@ -95,11 +95,16 @@ public class KameletComponentConfiguration
*/
private Boolean autowiredEnabled = true;
/**
- * Kamelets, by default, will not do fine-grained error handling, but works
- * in no-error-handler mode. This can be turned off, to use old behaviour
in
- * earlier versions of Camel.
+ * Whether kamelets should use error handling or not. By default, the
+ * Kamelet uses the same error handler as from the calling route. This
means
+ * that if the calling route has error handling that performs retries, or
+ * routing to a dead letter channel, then the kamelet route will use this
+ * also. This can be turned off by setting this option to true. If off then
+ * the kamelet route is not using error handling, and any exception thrown
+ * will for source kamelets be logged by the consumer, and the sink/action
+ * kamelets will fail processing.
*/
- private Boolean noErrorHandler = true;
+ private Boolean noErrorHandler = false;
/**
* To plugin a custom listener for when the Kamelet component is loading
* Kamelets from external resources. The option is a
