[camel] branch CAMEL-16757 updated: CAMEL-16757: camel-core - Global error handling, interceptor in all DSL

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch CAMEL-16757
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/CAMEL-16757 by this push:
     new 0ce9094  CAMEL-16757: camel-core - Global error handling, interceptor 
in all DSL
0ce9094 is described below

commit 0ce90941d0dc4cb2a2dcd3e2e74c14a6eb69ac2b
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Jul 8 16:20:45 2021 +0200

    CAMEL-16757: camel-core - Global error handling, interceptor in all DSL
---
 .../src/main/java/org/apache/camel/builder/RouteBuilder.java   | 10 ----------
 .../org/apache/camel/builder/RouteConfigurationBuilder.java    | 10 ++++++++++
 .../src/main/java/org/apache/camel/model/Model.java            |  4 ++--
 3 files changed, 12 insertions(+), 12 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 1b45106..bc697b1 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
@@ -37,7 +37,6 @@ import org.apache.camel.model.Model;
 import org.apache.camel.model.OnCompletionDefinition;
 import org.apache.camel.model.OnExceptionDefinition;
 import org.apache.camel.model.RouteConfigurationDefinition;
-import org.apache.camel.model.RouteConfigurationsDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.RouteTemplateDefinition;
 import org.apache.camel.model.RouteTemplatesDefinition;
@@ -73,7 +72,6 @@ public abstract class RouteBuilder extends BuilderSupport 
implements RoutesBuild
     private RestConfigurationDefinition restConfiguration;
     private RoutesDefinition routeCollection = new RoutesDefinition();
     private RouteTemplatesDefinition routeTemplateCollection = new 
RouteTemplatesDefinition();
-    RouteConfigurationsDefinition routeConfigurationCollection = new 
RouteConfigurationsDefinition();
 
     public RouteBuilder() {
         this(null);
@@ -674,14 +672,6 @@ public abstract class RouteBuilder extends BuilderSupport 
implements RoutesBuild
         this.routeTemplateCollection = routeTemplateCollection;
     }
 
-    public RouteConfigurationsDefinition getRouteConfigurationCollection() {
-        return routeConfigurationCollection;
-    }
-
-    public void setRouteConfigurationCollection(RouteConfigurationsDefinition 
routeConfigurationCollection) {
-        this.routeConfigurationCollection = routeConfigurationCollection;
-    }
-
     protected void configureRest(RestDefinition rest) {
         // noop
     }
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
index 4467d40..a9cb26e 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
@@ -22,6 +22,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.RouteConfigurationsBuilder;
 import org.apache.camel.model.Model;
 import org.apache.camel.model.RouteConfigurationDefinition;
+import org.apache.camel.model.RouteConfigurationsDefinition;
 
 /**
  * A <a href="http://camel.apache.org/dsl.html";>Java DSL</a> which is used for 
building route configuration(s).
@@ -29,6 +30,7 @@ import org.apache.camel.model.RouteConfigurationDefinition;
 public abstract class RouteConfigurationBuilder extends RouteBuilder 
implements RouteConfigurationsBuilder {
 
     private final AtomicBoolean initializedConfiguration = new AtomicBoolean();
+    private RouteConfigurationsDefinition routeConfigurationCollection = new 
RouteConfigurationsDefinition();
 
     @Override
     public void configure() throws Exception {
@@ -37,6 +39,14 @@ public abstract class RouteConfigurationBuilder extends 
RouteBuilder implements
 
     public abstract void configuration() throws Exception;
 
+    public RouteConfigurationsDefinition getRouteConfigurationCollection() {
+        return routeConfigurationCollection;
+    }
+
+    public void setRouteConfigurationCollection(RouteConfigurationsDefinition 
routeConfigurationCollection) {
+        this.routeConfigurationCollection = routeConfigurationCollection;
+    }
+
     /**
      * Creates a new route configuration
      *
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java 
b/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
index 7f35cb5..225965d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Model.java
@@ -52,14 +52,14 @@ public interface Model {
     /**
      * Adds a collection of route configuration definitions to the context
      *
-     * @param  routesConfigurations    the route configuration(s) definition 
to add
+     * @param routesConfigurations the route configuration(s) definition to add
      */
     void addRouteConfigurations(List<RouteConfigurationDefinition> 
routesConfigurations);
 
     /**
      * Adds a single route configuration definition to the context
      *
-     * @param  routesConfiguration    the route configuration to add
+     * @param routesConfiguration the route configuration to add
      */
     void addRouteConfiguration(RouteConfigurationDefinition 
routesConfiguration);