You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/06/24 09:16:15 UTC
[camel] 01/03: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8f383b029a232f5ba473a205d3a3ed90b54694aa
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jun 24 10:24:21 2019 +0200
Polished
---
.../reifier/errorhandler/ErrorHandlerReifier.java | 56 +++++++++++-----------
.../src/main/resources/log4j2.properties | 2 +-
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java b/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
index 59a53e3..8f1216c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
+++ b/core/camel-core/src/main/java/org/apache/camel/reifier/errorhandler/ErrorHandlerReifier.java
@@ -17,9 +17,7 @@
package org.apache.camel.reifier.errorhandler;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.function.Function;
import org.apache.camel.CamelContext;
@@ -110,34 +108,34 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerBuilderSupport>
return null;
}
Map<RedeliveryOption, String> policy = new HashMap<>();
- setoption(policy, RedeliveryOption.maximumRedeliveries, definition.getMaximumRedeliveries());
- setoption(policy, RedeliveryOption.redeliveryDelay, definition.getRedeliveryDelay());
- setoption(policy, RedeliveryOption.asyncDelayedRedelivery, definition.getAsyncDelayedRedelivery());
- setoption(policy, RedeliveryOption.backOffMultiplier, definition.getBackOffMultiplier());
- setoption(policy, RedeliveryOption.useExponentialBackOff, definition.getUseExponentialBackOff());
- setoption(policy, RedeliveryOption.collisionAvoidanceFactor, definition.getCollisionAvoidanceFactor());
- setoption(policy, RedeliveryOption.useCollisionAvoidance, definition.getUseCollisionAvoidance());
- setoption(policy, RedeliveryOption.maximumRedeliveryDelay, definition.getMaximumRedeliveryDelay());
- setoption(policy, RedeliveryOption.retriesExhaustedLogLevel, definition.getRetriesExhaustedLogLevel());
- setoption(policy, RedeliveryOption.retryAttemptedLogLevel, definition.getRetryAttemptedLogLevel());
- setoption(policy, RedeliveryOption.retryAttemptedLogInterval, definition.getRetryAttemptedLogInterval());
- setoption(policy, RedeliveryOption.logRetryAttempted, definition.getLogRetryAttempted());
- setoption(policy, RedeliveryOption.logStackTrace, definition.getLogStackTrace());
- setoption(policy, RedeliveryOption.logRetryStackTrace, definition.getLogRetryStackTrace());
- setoption(policy, RedeliveryOption.logHandled, definition.getLogHandled());
- setoption(policy, RedeliveryOption.logNewException, definition.getLogNewException());
- setoption(policy, RedeliveryOption.logContinued, definition.getLogContinued());
- setoption(policy, RedeliveryOption.logExhausted, definition.getLogExhausted());
- setoption(policy, RedeliveryOption.logExhaustedMessageHistory, definition.getLogExhaustedMessageHistory());
- setoption(policy, RedeliveryOption.logExhaustedMessageBody, definition.getLogExhaustedMessageBody());
- setoption(policy, RedeliveryOption.disableRedelivery, definition.getDisableRedelivery());
- setoption(policy, RedeliveryOption.delayPattern, definition.getDelayPattern());
- setoption(policy, RedeliveryOption.allowRedeliveryWhileStopping, definition.getAllowRedeliveryWhileStopping());
- setoption(policy, RedeliveryOption.exchangeFormatterRef, definition.getExchangeFormatterRef());
+ setOption(policy, RedeliveryOption.maximumRedeliveries, definition.getMaximumRedeliveries());
+ setOption(policy, RedeliveryOption.redeliveryDelay, definition.getRedeliveryDelay());
+ setOption(policy, RedeliveryOption.asyncDelayedRedelivery, definition.getAsyncDelayedRedelivery());
+ setOption(policy, RedeliveryOption.backOffMultiplier, definition.getBackOffMultiplier());
+ setOption(policy, RedeliveryOption.useExponentialBackOff, definition.getUseExponentialBackOff());
+ setOption(policy, RedeliveryOption.collisionAvoidanceFactor, definition.getCollisionAvoidanceFactor());
+ setOption(policy, RedeliveryOption.useCollisionAvoidance, definition.getUseCollisionAvoidance());
+ setOption(policy, RedeliveryOption.maximumRedeliveryDelay, definition.getMaximumRedeliveryDelay());
+ setOption(policy, RedeliveryOption.retriesExhaustedLogLevel, definition.getRetriesExhaustedLogLevel());
+ setOption(policy, RedeliveryOption.retryAttemptedLogLevel, definition.getRetryAttemptedLogLevel());
+ setOption(policy, RedeliveryOption.retryAttemptedLogInterval, definition.getRetryAttemptedLogInterval());
+ setOption(policy, RedeliveryOption.logRetryAttempted, definition.getLogRetryAttempted());
+ setOption(policy, RedeliveryOption.logStackTrace, definition.getLogStackTrace());
+ setOption(policy, RedeliveryOption.logRetryStackTrace, definition.getLogRetryStackTrace());
+ setOption(policy, RedeliveryOption.logHandled, definition.getLogHandled());
+ setOption(policy, RedeliveryOption.logNewException, definition.getLogNewException());
+ setOption(policy, RedeliveryOption.logContinued, definition.getLogContinued());
+ setOption(policy, RedeliveryOption.logExhausted, definition.getLogExhausted());
+ setOption(policy, RedeliveryOption.logExhaustedMessageHistory, definition.getLogExhaustedMessageHistory());
+ setOption(policy, RedeliveryOption.logExhaustedMessageBody, definition.getLogExhaustedMessageBody());
+ setOption(policy, RedeliveryOption.disableRedelivery, definition.getDisableRedelivery());
+ setOption(policy, RedeliveryOption.delayPattern, definition.getDelayPattern());
+ setOption(policy, RedeliveryOption.allowRedeliveryWhileStopping, definition.getAllowRedeliveryWhileStopping());
+ setOption(policy, RedeliveryOption.exchangeFormatterRef, definition.getExchangeFormatterRef());
return policy;
}
- private static void setoption(Map<RedeliveryOption, String> policy, RedeliveryOption option, Object value) {
+ private static void setOption(Map<RedeliveryOption, String> policy, RedeliveryOption option, Object value) {
if (value != null) {
policy.put(option, value.toString());
}
@@ -265,8 +263,10 @@ public abstract class ErrorHandlerReifier<T extends ErrorHandlerBuilderSupport>
}
}
+ /**
+ * Note: Not for end users - this method is used internally by camel-blueprint
+ */
public static RedeliveryPolicy createRedeliveryPolicy(RedeliveryPolicyDefinition definition, CamelContext context, RedeliveryPolicy parentPolicy) {
-
RedeliveryPolicy answer;
if (parentPolicy != null) {
answer = parentPolicy.copy();
diff --git a/examples/camel-example-main/src/main/resources/log4j2.properties b/examples/camel-example-main/src/main/resources/log4j2.properties
index d050a4f..c63f861 100644
--- a/examples/camel-example-main/src/main/resources/log4j2.properties
+++ b/examples/camel-example-main/src/main/resources/log4j2.properties
@@ -23,4 +23,4 @@ rootLogger.level = INFO
rootLogger.appenderRef.out.ref = out
logger.camel-main.name = org.apache.camel.main
-logger.camel-main.level = DEBUG
+logger.camel-main.level = INFO