[camel] branch errorhandler-in-dsl updated: CAMEL-16834: error handler in model DSL. WIP

[davsclaus]

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

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


The following commit(s) were added to refs/heads/errorhandler-in-dsl by this 
push:
     new 8db664f14b5 CAMEL-16834: error handler in model DSL. WIP
8db664f14b5 is described below

commit 8db664f14b59a3018d03c5ea557ed9e08afa7c2a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu Apr 7 11:43:41 2022 +0200

    CAMEL-16834: error handler in model DSL. WIP
---
 .../src/main/java/org/apache/camel/model/RouteDefinition.java           | 2 --
 .../src/main/java/org/apache/camel/model/RouteTemplatesDefinition.java  | 1 -
 .../src/main/java/org/apache/camel/model/RoutesDefinition.java          | 1 -
 3 files changed, 4 deletions(-)

diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
index 1fb31671a2c..3b1c3326e4c 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -78,9 +78,7 @@ public class RouteDefinition extends 
OutputDefinition<RouteDefinition>
     private String shutdownRoute;
     private String shutdownRunningTask;
     private String errorHandlerRef;
-    @Deprecated
     private ErrorHandlerFactory errorHandlerFactory;
-    private ErrorHandlerDefinition errorHandler;
     // keep state whether the error handler is context scoped or not
     // (will by default be context scoped of no explicit error handler
     // configured)
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 2dd38bd1f18..efe03c984bf 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
@@ -42,7 +42,6 @@ public class RouteTemplatesDefinition extends 
OptionalIdentifiedDefinition<Route
     @XmlTransient
     private CamelContext camelContext;
     @XmlTransient
-    @Deprecated
     private ErrorHandlerFactory errorHandlerFactory;
 
     @XmlElementRef
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
index a803c37cd3f..f53235dc458 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutesDefinition.java
@@ -63,7 +63,6 @@ public class RoutesDefinition extends 
OptionalIdentifiedDefinition<RoutesDefinit
     @XmlTransient
     private CamelContext camelContext;
     @XmlTransient
-    @Deprecated
     private ErrorHandlerFactory errorHandlerFactory;
     @XmlTransient
     private Resource resource;