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 33944f12fe2 CAMEL-16834: error handler in model DSL. WIP
33944f12fe2 is described below
commit 33944f12fe2196d7ea8721512f6ab5887c9250a7
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Apr 7 13:09:01 2022 +0200
CAMEL-16834: error handler in model DSL. WIP
---
...eadLetterChannelReifier.java => DeadLetterChannelReifier.java} | 6 ++----
...ltErrorHandlerReifier.java => DefaultErrorHandlerReifier.java} | 6 ++----
...NewErrorHandlerRefReifier.java => ErrorHandlerRefReifier.java} | 6 ++----
.../apache/camel/reifier/errorhandler/ErrorHandlerReifier.java | 8 ++++----
.../{NewNoErrorHandlerReifier.java => NoErrorHandlerReifier.java} | 6 ++----
.../camel/processor/errorhandler/ErrorHandlerSupportTest.java | 4 ++--
.../exceptionpolicy/DefaultExceptionPolicyStrategyTest.java | 4 ++--
7 files changed, 16 insertions(+), 24 deletions(-)
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
similarity index 96%
rename from
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java
rename to
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
index 36708fc3bd6..0ff6709bd88 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDeadLetterChannelReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
@@ -37,11 +37,9 @@ import org.apache.camel.spi.ThreadPoolProfile;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.LoggerFactory;
-public class NewDeadLetterChannelReifier extends
ErrorHandlerReifier<DeadLetterChannelDefinition> {
+public class DeadLetterChannelReifier extends
ErrorHandlerReifier<DeadLetterChannelDefinition> {
- // TODO: Rename when working
-
- public NewDeadLetterChannelReifier(Route route,
DeadLetterChannelDefinition definition) {
+ public DeadLetterChannelReifier(Route route, DeadLetterChannelDefinition
definition) {
super(route, definition);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
similarity index 96%
rename from
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java
rename to
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
index 00bf3661d5b..b0b53f7bca0 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewDefaultErrorHandlerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DefaultErrorHandlerReifier.java
@@ -37,11 +37,9 @@ import org.apache.camel.spi.Language;
import org.apache.camel.spi.ThreadPoolProfile;
import org.slf4j.LoggerFactory;
-public class NewDefaultErrorHandlerReifier extends
ErrorHandlerReifier<DefaultErrorHandlerDefinition> {
+public class DefaultErrorHandlerReifier extends
ErrorHandlerReifier<DefaultErrorHandlerDefinition> {
- // TODO: Rename when working
-
- public NewDefaultErrorHandlerReifier(Route route,
DefaultErrorHandlerDefinition definition) {
+ public DefaultErrorHandlerReifier(Route route,
DefaultErrorHandlerDefinition definition) {
super(route, definition);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewErrorHandlerRefReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
similarity index 90%
rename from
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewErrorHandlerRefReifier.java
rename to
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
index 7959b084a7a..7c7ad90db6d 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewErrorHandlerRefReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerRefReifier.java
@@ -24,11 +24,9 @@ import
org.apache.camel.model.errorhandler.ErrorHandlerHelper;
import org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition;
import org.apache.camel.util.ObjectHelper;
-public class NewErrorHandlerRefReifier extends
ErrorHandlerReifier<ErrorHandlerRefDefinition> {
+public class ErrorHandlerRefReifier extends
ErrorHandlerReifier<ErrorHandlerRefDefinition> {
- // TODO: Rename when working
-
- public NewErrorHandlerRefReifier(Route route, ErrorHandlerFactory
definition) {
+ public ErrorHandlerRefReifier(Route route, ErrorHandlerFactory definition)
{
super(route, (ErrorHandlerRefDefinition) definition);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index 6ce7cdbf6bc..cdb840566b3 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -104,13 +104,13 @@ public abstract class ErrorHandlerReifier<T extends
ErrorHandlerFactory> extends
// }
if (definition instanceof DeadLetterChannelDefinition) {
- return new NewDeadLetterChannelReifier(route,
(DeadLetterChannelDefinition) definition);
+ return new DeadLetterChannelReifier(route,
(DeadLetterChannelDefinition) definition);
} else if (definition instanceof DefaultErrorHandlerDefinition) {
- return new NewDefaultErrorHandlerReifier(route,
(DefaultErrorHandlerDefinition) definition);
+ return new DefaultErrorHandlerReifier(route,
(DefaultErrorHandlerDefinition) definition);
} else if (definition instanceof NoErrorHandlerDefinition) {
- return new NewNoErrorHandlerReifier(route, definition);
+ return new NoErrorHandlerReifier(route, definition);
} else if (definition instanceof ErrorHandlerRefDefinition) {
- return new NewErrorHandlerRefReifier(route, definition);
+ return new ErrorHandlerRefReifier(route, definition);
}
return null;
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
similarity index 87%
rename from
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java
rename to
core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
index 94f89371c8e..4dba81d5c65 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NewNoErrorHandlerReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/NoErrorHandlerReifier.java
@@ -23,11 +23,9 @@ import
org.apache.camel.model.errorhandler.NoErrorHandlerDefinition;
import org.apache.camel.processor.errorhandler.NoErrorHandler;
import org.apache.camel.spi.ErrorHandler;
-public class NewNoErrorHandlerReifier extends
ErrorHandlerReifier<NoErrorHandlerDefinition> {
+public class NoErrorHandlerReifier extends
ErrorHandlerReifier<NoErrorHandlerDefinition> {
- // TODO: Rename when working
-
- public NewNoErrorHandlerReifier(Route route, ErrorHandlerFactory
definition) {
+ public NoErrorHandlerReifier(Route route, ErrorHandlerFactory definition) {
super(route, (NoErrorHandlerDefinition) definition);
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java
index e87b7e49d4b..a89de983635 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/errorhandler/ErrorHandlerSupportTest.java
@@ -25,7 +25,7 @@ import org.apache.camel.Processor;
import org.apache.camel.Route;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.OnExceptionDefinition;
-import org.apache.camel.reifier.errorhandler.NewDefaultErrorHandlerReifier;
+import org.apache.camel.reifier.errorhandler.DefaultErrorHandlerReifier;
import org.apache.camel.spi.ErrorHandler;
import org.junit.jupiter.api.Test;
@@ -81,7 +81,7 @@ public class ErrorHandlerSupportTest extends
ContextTestSupport {
private static void addExceptionPolicy(
ErrorHandlerSupport handlerSupport, Route route,
OnExceptionDefinition exceptionType) {
- new NewDefaultErrorHandlerReifier(route,
null).addExceptionPolicy(handlerSupport, exceptionType);
+ new DefaultErrorHandlerReifier(route,
null).addExceptionPolicy(handlerSupport, exceptionType);
}
private static String getExceptionPolicyFor(ErrorHandlerSupport support,
Throwable childException, int index) {
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java
index 793e37dac33..5802957adc6 100644
---
a/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/DefaultExceptionPolicyStrategyTest.java
@@ -36,7 +36,7 @@ import org.apache.camel.model.OnExceptionDefinition;
import org.apache.camel.processor.errorhandler.DefaultExceptionPolicyStrategy;
import org.apache.camel.processor.errorhandler.ExceptionPolicy;
import org.apache.camel.processor.errorhandler.ExceptionPolicyKey;
-import org.apache.camel.reifier.errorhandler.NewDefaultErrorHandlerReifier;
+import org.apache.camel.reifier.errorhandler.DefaultErrorHandlerReifier;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -56,7 +56,7 @@ public class DefaultExceptionPolicyStrategyTest {
private ExceptionPolicy exceptionPolicy(Class<? extends Throwable>
exceptionClass) {
CamelContext cc = new DefaultCamelContext();
Route context = new DefaultRoute(cc, null, null, null, null, null);
- return new NewDefaultErrorHandlerReifier(context, null)
+ return new DefaultErrorHandlerReifier(context, null)
.createExceptionPolicy(new
OnExceptionDefinition(exceptionClass));
}
