You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2021/03/25 11:07:50 UTC
[camel] branch master updated: CAMEL-16401: Ensure Route Templates
inherit the error handler from the RouteBuilder
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 742c96f CAMEL-16401: Ensure Route Templates inherit the error handler from the RouteBuilder
742c96f is described below
commit 742c96fe8b7cc56860c2082697195155f8050008
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Thu Mar 25 11:22:07 2021 +0100
CAMEL-16401: Ensure Route Templates inherit the error handler from the RouteBuilder
---
.../org/apache/camel/builder/RouteBuilder.java | 1 +
.../camel/model/RouteTemplatesDefinition.java | 24 +++++++--
.../builder/RouteTemplateErrorHandlerTest.java | 61 ++++++++++++++++++++++
3 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 9f3d919..5f9c6db 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -506,6 +506,7 @@ public abstract class RouteBuilder extends BuilderSupport implements RoutesBuild
public void setErrorHandlerBuilder(ErrorHandlerBuilder errorHandlerBuilder) {
super.setErrorHandlerBuilder(errorHandlerBuilder);
getRouteCollection().setErrorHandlerFactory(getErrorHandlerBuilder());
+ getRouteTemplateCollection().setErrorHandlerFactory(getErrorHandlerBuilder());
}
/**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
index d90426d..c06a722 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import org.apache.camel.CamelContext;
+import org.apache.camel.ErrorHandlerFactory;
import org.apache.camel.spi.Metadata;
/**
@@ -40,6 +41,8 @@ public class RouteTemplatesDefinition extends OptionalIdentifiedDefinition<Route
private List<RouteTemplateDefinition> routeTemplates = new ArrayList<>();
@XmlTransient
private CamelContext camelContext;
+ @XmlTransient
+ private ErrorHandlerFactory errorHandlerFactory;
public RouteTemplatesDefinition() {
}
@@ -68,7 +71,7 @@ public class RouteTemplatesDefinition extends OptionalIdentifiedDefinition<Route
}
/**
- * The rest services
+ * The route templates
*/
public void setRouteTemplates(List<RouteTemplateDefinition> routeTemplates) {
this.routeTemplates = routeTemplates;
@@ -82,6 +85,14 @@ public class RouteTemplatesDefinition extends OptionalIdentifiedDefinition<Route
this.camelContext = camelContext;
}
+ public ErrorHandlerFactory getErrorHandlerFactory() {
+ return errorHandlerFactory;
+ }
+
+ public void setErrorHandlerFactory(ErrorHandlerFactory errorHandlerFactory) {
+ this.errorHandlerFactory = errorHandlerFactory;
+ }
+
// Fluent API
// -------------------------------------------------------------------------
@@ -99,9 +110,9 @@ public class RouteTemplatesDefinition extends OptionalIdentifiedDefinition<Route
/**
* Adds the {@link RouteTemplatesDefinition}
*/
- public RouteTemplateDefinition routeTemplate(RouteTemplateDefinition rest) {
- getRouteTemplates().add(rest);
- return rest;
+ public RouteTemplateDefinition routeTemplate(RouteTemplateDefinition template) {
+ getRouteTemplates().add(template);
+ return template;
}
// Implementation methods
@@ -109,6 +120,11 @@ public class RouteTemplatesDefinition extends OptionalIdentifiedDefinition<Route
protected RouteTemplateDefinition createRouteTemplate() {
RouteTemplateDefinition template = new RouteTemplateDefinition();
+ ErrorHandlerFactory handler = getErrorHandlerFactory();
+ if (handler != null) {
+ template.getRoute().setErrorHandlerFactoryIfNull(handler);
+ }
+
return template;
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java
new file mode 100644
index 0000000..182928d
--- /dev/null
+++ b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateErrorHandlerTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.builder;
+
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.util.CollectionHelper.mapOf;
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RouteTemplateErrorHandlerTest {
+ @Test
+ public void testDefineRouteTemplate() throws Exception {
+ try (DefaultCamelContext context = new DefaultCamelContext()) {
+ context.getRegistry().bind("myErrorHandler", new NoErrorHandlerBuilder());
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ errorHandler("myErrorHandler");
+
+ routeTemplate("myTemplate")
+ .templateParameter("foo")
+ .templateParameter("bar")
+ .from("direct:{{foo}}")
+ .to("mock:{{bar}}");
+
+ from("direct:_r")
+ .to("mock:_r");
+ }
+ });
+
+ assertThat(context.getRouteDefinitions()).first().satisfies(d -> {
+ assertThat(d.getErrorHandlerFactory()).isInstanceOfSatisfying(ErrorHandlerBuilderRef.class, r -> {
+ assertThat(r.getRef()).isEqualTo("myErrorHandler");
+ });
+ });
+
+ assertThat(context.getRouteTemplateDefinitions()).first().satisfies(d -> {
+ assertThat(d.route().getErrorHandlerFactory()).isInstanceOfSatisfying(ErrorHandlerBuilderRef.class, r -> {
+ assertThat(r.getRef()).isEqualTo("myErrorHandler");
+ });
+ });
+
+ context.addRouteFromTemplate("myTemplate", "", mapOf("", ""));
+ }
+ }
+}