[camel] 01/02: CAMEL-17388: camel-yaml-dsl - Loading kamelet binding error handler DLC renamed to sink

[davsclaus]

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.git

commit a41447304f1325064792477c07b27f56d4f502aa
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Jan 11 15:21:57 2022 +0100

    CAMEL-17388: camel-yaml-dsl - Loading kamelet binding error handler DLC 
renamed to sink
---
 .../java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java   | 8 ++------
 .../org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy     | 4 ++--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index de5750e..0265a3b 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -339,9 +339,9 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
                 String ehName = asText(nt.getKeyNode());
 
                 DefaultErrorHandlerProperties ehb = null;
-                if ("dead-letter-channel".equals(ehName)) {
+                if ("sink".equals(ehName)) {
+                    // a sink is a dead letter queue
                     DeadLetterChannelBuilder dlch = new 
DeadLetterChannelBuilder();
-                    // endpoint
                     MappingNode endpoint = 
asMappingNode(nodeAt(nt.getValueNode(), "/endpoint"));
                     String dlq = extractCamelEndpointUri(endpoint);
                     dlch.setDeadLetterUri(dlq);
@@ -351,10 +351,6 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
                     ehb = new DefaultErrorHandlerBuilder();
                 } else if ("none".equals(ehName)) {
                     route.errorHandler(new NoErrorHandlerBuilder());
-                } else if ("bean".equals(ehName)) {
-                    throw new IllegalArgumentException("Bean error handler is 
not supported");
-                } else if ("ref".equals(ehName)) {
-                    throw new IllegalArgumentException("Ref error handler is 
not supported");
                 }
 
                 // some error handlers support additional parameters
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
index db28d55..b3da18f 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
@@ -330,7 +330,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
                       apiVersion: camel.apache.org/v1alpha1
                       name: log-sink
                   errorHandler:
-                    dead-letter-channel:
+                    sink:
                       endpoint:
                         ref:
                           kind: Kamelet
@@ -396,7 +396,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
                       apiVersion: camel.apache.org/v1alpha1
                       name: log-sink
                   errorHandler:
-                    dead-letter-channel:
+                    sink:
                       endpoint:
                         uri: mock:dead
                       parameters: