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 2017/11/23 08:12:37 UTC
[camel] 02/02: CAMEL-12004: Polished. This closes #2093
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 22ac8c00db676ccc01d1a44ec206ee17790b46b0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Nov 23 09:11:56 2017 +0100
CAMEL-12004: Polished. This closes #2093
---
.../test/java/org/apache/camel/LanguageTestSupport.java | 4 +---
.../camel/component/jms/reply/QueueReplyManager.java | 14 +++++---------
.../apache/camel/spring/spi/TransactionErrorHandler.java | 2 +-
.../org/apache/camel/test/junit4/LanguageTestSupport.java | 4 +---
4 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java b/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
index 8aaf2b4..cc00ca6 100644
--- a/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
@@ -94,9 +94,7 @@ public abstract class LanguageTestSupport extends ExchangeTestSupport {
} else {
value = expression.evaluate(exchange, Object.class);
}
- if (log.isDebugEnabled()) {
- log.debug("Evaluated expression: {} on exchange: {} result: {}", expression, exchange, value);
- }
+ log.debug("Evaluated expression: {} on exchange: {} result: {}", expression, exchange, value);
return value;
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index 7d15be2..5fec7f0 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -131,9 +131,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
answer = new SharedQueueMessageListenerContainer(endpoint, fixedMessageSelector);
// must use cache level consumer for fixed message selector
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
- if (log.isDebugEnabled()) {
- log.debug("Using shared queue: " + endpoint.getReplyTo() + " with fixed message selector [" + fixedMessageSelector + "] as reply listener: " + answer);
- }
+ log.debug("Using shared queue: {} with fixed message selector [{}] as reply listener: {}", endpoint.getReplyTo(), fixedMessageSelector, answer);
} else {
// use a dynamic message selector which will select the message we want to receive as reply
dynamicMessageSelector = new MessageSelectorCreator(correlation);
@@ -141,7 +139,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
// must use cache level session for dynamic message selector,
// as otherwise the dynamic message selector will not be updated on-the-fly
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_SESSION);
- log.debug("Using shared queue: " + endpoint.getReplyTo() + " with dynamic message selector as reply listener: " + answer);
+ log.debug("Using shared queue: {} with dynamic message selector as reply listener: {}", endpoint.getReplyTo(), answer);
}
// shared is not as fast as temporary or exclusive, so log this so the end user may be aware of this
log.warn("{} is using a shared reply queue, which is not as fast as alternatives."
@@ -150,7 +148,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
answer = new ExclusiveQueueMessageListenerContainer(endpoint);
// must use cache level consumer for exclusive as there is no message selector
answer.setCacheLevel(DefaultMessageListenerContainer.CACHE_CONSUMER);
- log.debug("Using exclusive queue:" + endpoint.getReplyTo() + " as reply listener: " + answer);
+ log.debug("Using exclusive queue: {} as reply listener: {}", endpoint.getReplyTo(), answer);
} else {
throw new IllegalArgumentException("ReplyToType " + type + " is not supported for reply queues");
}
@@ -158,7 +156,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
String replyToCacheLevelName = endpoint.getConfiguration().getReplyToCacheLevelName();
if (replyToCacheLevelName != null) {
answer.setCacheLevelName(replyToCacheLevelName);
- log.debug("Setting the replyCacheLevel to be " + replyToCacheLevelName);
+ log.debug("Setting the replyCacheLevel to be {}", replyToCacheLevelName);
}
DestinationResolver resolver = endpoint.getDestinationResolver();
@@ -208,9 +206,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
}
// set task executor
if (endpoint.getTaskExecutor() != null) {
- if (log.isDebugEnabled()) {
- log.debug("Using custom TaskExecutor: {} on listener container: {}", endpoint.getTaskExecutor(), answer);
- }
+ log.debug("Using custom TaskExecutor: {} on listener container: {}", endpoint.getTaskExecutor(), answer);
answer.setTaskExecutor(endpoint.getTaskExecutor());
}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
index f10aeef..653ea84 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandler.java
@@ -154,7 +154,7 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler {
if (log.isDebugEnabled()) {
// log exception if there was a cause exception so we have the stack trace
Exception cause = exchange.getException();
- if (cause != null && log.isDebugEnabled()) {
+ if (cause != null) {
log.debug("Transaction rollback (" + transactionKey + ") redelivered(" + redelivered + ") for "
+ ids + " due exchange was marked for rollbackOnlyLast and caught: ", cause);
} else {
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
index 1b5e236..05e7633 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java
@@ -85,9 +85,7 @@ public abstract class LanguageTestSupport extends ExchangeTestSupport {
} else {
value = expression.evaluate(exchange, Object.class);
}
- if (log.isDebugEnabled()) {
- log.debug("Evaluated expression: " + expression + " on exchange: " + exchange + " result: " + value);
- }
+ log.debug("Evaluated expression: {} on exchange: {} result: {}", expression, exchange, value);
assertTrue("Expression: " + expression + " on Exchange: " + exchange,
expectedValue.equals(value) || orThisExpectedValue.equals(value));
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.