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
The following commit(s) were added to refs/heads/master by this push:
new a6596f5 (chore) Cleaned up log messages (#4453)
a6596f5 is described below
commit a6596f5ff168bb578517ce4b1ca56355a432a685
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Thu Oct 15 12:50:47 2020 +0200
(chore) Cleaned up log messages (#4453)
- toString is called by default when calling the logging method
- removed unnecessary format call as not specifier was provided
- replaced concatenations with log markers
- removed unnecessary debugging guards
Components:
camel-exec, camel-google-pub-sub, camel-hdfs, camel-jsonpath,
camel-kubernetes, camel-lucene, camel-mail, camel-mina, camel-mllp,
camel-mock, camel-mybatis, camel-netty, camel-openapi-java,
camel-pulsar, camel-resteasy, camel-sip, camel-snmp, camel-snmp,
camel-soroush, camel-spring-ws, camel-spring, camel-sql,
camel-test-junit5, camel-test-spring-junit5, camel-test-spring,
camel-test, camel-vertx, camel-websocket, camel-xmlsecurity,
camel-xmpp, camel-xpath, camel-zookeeper, core/camel-api,
core/camel-base, core/camel-support, core/camel-util,
tooling/maven/camel-api-component-maven-plugin
---
.../exec/impl/DefaultExecCommandExecutor.java | 4 +--
.../google/pubsub/GooglePubsubProducer.java | 4 +--
.../apache/camel/component/hdfs/HdfsComponent.java | 2 +-
.../org/apache/camel/jsonpath/JsonPathEngine.java | 5 +--
.../cluster/lock/ConfigMapLockUtils.java | 4 +--
.../camel/component/lucene/LuceneIndexer.java | 5 +--
.../component/mail/DefaultJavaMailSender.java | 2 +-
.../apache/camel/component/mina/MinaConsumer.java | 5 +--
.../apache/camel/component/mina/MinaProducer.java | 5 +--
.../component/mllp/MllpTcpServerConsumer.java | 8 ++---
.../apache/camel/component/mock/MockEndpoint.java | 2 +-
.../camel/component/mybatis/MyBatisConsumer.java | 4 +--
.../ClientModeTCPNettyServerBootstrapFactory.java | 4 +--
.../camel/component/netty/NettyProducer.java | 2 +-
.../apache/camel/openapi/RestOpenApiProcessor.java | 2 +-
.../camel/component/pulsar/utils/PulsarUtils.java | 5 ++-
.../camel/component/resteasy/ResteasyProducer.java | 6 ++--
.../camel/component/sip/SipConfiguration.java | 4 +--
.../sip/listener/SipPresenceAgentListener.java | 2 +-
.../apache/camel/component/snmp/SnmpOIDPoller.java | 2 +-
.../soap/name/ServiceInterfaceStrategy.java | 4 +--
.../component/SoroushBotSendMessageProducer.java | 4 +--
.../utils/MultiQueueWithTopicThreadPool.java | 11 +++----
.../spring/ws/bean/CamelDirectConnection.java | 2 +-
.../camel/component/event/EventComponent.java | 2 +-
.../camel/spring/CamelBeanPostProcessor.java | 6 ++--
.../apache/camel/spring/SpringCamelContext.java | 4 +--
.../camel/spring/spi/TransactionErrorHandler.java | 6 ++--
.../org/apache/camel/spring/util/MainRunner.java | 6 ++--
.../aggregate/jdbc/JdbcAggregationRepository.java | 8 ++---
.../org/apache/camel/test/junit5/TestSupport.java | 12 +++----
.../test/spring/junit5/RouteCoverageDumper.java | 2 +-
.../junit5/StopWatchTestExecutionListener.java | 5 ++-
.../camel/test/spring/RouteCoverageDumper.java | 2 +-
.../spring/StopWatchTestExecutionListener.java | 5 ++-
.../org/apache/camel/test/junit4/TestSupport.java | 12 +++----
.../camel/component/vertx/VertxComponent.java | 5 ++-
.../component/websocket/WebsocketComponent.java | 4 +--
.../api/DefaultXmlSignature2Message.java | 3 +-
.../apache/camel/component/xmpp/XmppBinding.java | 8 ++---
.../language/xpath/MessageVariableResolver.java | 2 +-
.../ZookeeperGroupListenerSupport.java | 10 +++---
.../component/zookeeper/ConnectionHolder.java | 5 ++-
.../apache/camel/support/jsse/JsseParameters.java | 6 ++--
.../apache/camel/support/service/BaseService.java | 16 ++++-----
.../converter/AnnotationTypeConverterLoader.java | 38 ++++++++++++----------
.../camel/impl/engine/DefaultConsumerTemplate.java | 5 ++-
.../engine/DefaultPackageScanClassResolver.java | 20 +++++-------
.../camel/impl/engine/DefaultReactiveExecutor.java | 6 ++--
.../engine/LimitedPollingConsumerPollStrategy.java | 4 +--
.../converter/stream/FileInputStreamCache.java | 2 +-
.../apache/camel/support/ChildServiceSupport.java | 8 ++---
.../org/apache/camel/support/EndpointHelper.java | 2 +-
.../camel/support/EventDrivenPollingConsumer.java | 4 +--
.../apache/camel/support/IntrospectionSupport.java | 2 +-
.../camel/support/ScheduledPollConsumer.java | 2 +-
.../apache/camel/support/TimerListenerManager.java | 4 +--
.../org/apache/camel/support/UnitOfWorkHelper.java | 10 +++---
.../java/org/apache/camel/util/ObjectHelper.java | 10 +++---
.../maven/JavaSourceApiMethodGeneratorMojo.java | 6 ++--
60 files changed, 169 insertions(+), 181 deletions(-)
diff --git
a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
index 570521f..91bd423 100644
---
a/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
+++
b/components/camel-exec/src/main/java/org/apache/camel/component/exec/impl/DefaultExecCommandExecutor.java
@@ -75,7 +75,7 @@ public class DefaultExecCommandExecutor implements
ExecCommandExecutor {
return result;
} catch (ExecuteException ee) {
- LOG.error("ExecException while executing command: {} - {}",
command.toString(), ee.getMessage());
+ LOG.error("ExecException while executing command: {} - {}",
command, ee.getMessage());
InputStream stdout = out.size() == 0 ? null : new
ByteArrayInputStream(out.toByteArray());
InputStream stderr = err.size() == 0 ? null : new
ByteArrayInputStream(err.toByteArray());
@@ -102,7 +102,7 @@ public class DefaultExecCommandExecutor implements
ExecCommandExecutor {
return result;
}
// invalid working dir
- LOG.error("IOException while executing command: {} - {}",
command.toString(), ioe.getMessage());
+ LOG.error("IOException while executing command: {} - {}", command,
ioe.getMessage());
throw new ExecException("Unable to execute command " + command,
stdout, stderr, exitValue, ioe);
} finally {
// the inputStream must be closed after the execution
diff --git
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
index 123f130..0ea84d8 100644
---
a/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
+++
b/components/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubProducer.java
@@ -60,8 +60,8 @@ public class GooglePubsubProducer extends DefaultProducer {
public void process(Exchange exchange) throws Exception {
if (logger.isDebugEnabled()) {
- logger.debug("uploader thread/id: " +
Thread.currentThread().getId() + " / " + exchange.getExchangeId()
- + " . api call completed.");
+ logger.debug("uploader thread/id: {} / {}. api call completed.",
Thread.currentThread().getId(),
+ exchange.getExchangeId());
}
if (exchange.getIn().getBody() instanceof List) {
diff --git
a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
index 5d03d7a..01a8810 100644
---
a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
+++
b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsComponent.java
@@ -53,7 +53,7 @@ public class HdfsComponent extends DefaultComponent {
URL.setURLStreamHandlerFactory(new FsUrlStreamHandlerFactory());
} catch (Throwable e) {
// ignore as its most likely already set
- LOG.debug("Cannot set URLStreamHandlerFactory due " +
e.getMessage() + ". This exception will be ignored.", e);
+ LOG.debug("Cannot set URLStreamHandlerFactory due {}. This
exception will be ignored.", e.getMessage(), e);
}
}
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
index 8f1d3ab..11999d2 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
@@ -277,8 +277,9 @@ public class JsonPathEngine {
}
}
} catch (Throwable e) {
- LOG.debug("Cannot load " + JACKSON_JSON_ADAPTER + " from
classpath to enable JacksonJsonAdapter due "
- + e.getMessage() + ". JacksonJsonAdapter is not
enabled.",
+ LOG.debug(
+ "Cannot load {} from classpath to enable
JacksonJsonAdapter due {}. JacksonJsonAdapter is not enabled.",
+ JACKSON_JSON_ADAPTER, e.getMessage(),
e);
}
initJsonAdapter = true;
diff --git
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
index c914026..ee14a84 100644
---
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
+++
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/cluster/lock/ConfigMapLockUtils.java
@@ -70,7 +70,7 @@ public final class ConfigMapLockUtils {
try {
return new SimpleDateFormat(DATE_TIME_FORMAT).format(date);
} catch (Exception e) {
- LOG.warn("Unable to format date '" + date + "' using format " +
DATE_TIME_FORMAT, e);
+ LOG.warn("Unable to format date '{}' using format {}", date,
DATE_TIME_FORMAT, e);
}
return null;
@@ -85,7 +85,7 @@ public final class ConfigMapLockUtils {
try {
return new SimpleDateFormat(DATE_TIME_FORMAT).parse(timestamp);
} catch (Exception e) {
- LOG.warn("Unable to parse time string '" + timestamp + "' using
format " + DATE_TIME_FORMAT, e);
+ LOG.warn("Unable to parse time string '{}' using format {}",
timestamp, DATE_TIME_FORMAT, e);
}
return null;
diff --git
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
index 0c0c42c..1952a5a 100644
---
a/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
+++
b/components/camel-lucene/src/main/java/org/apache/camel/component/lucene/LuceneIndexer.java
@@ -144,8 +144,9 @@ public class LuceneIndexer {
LOG.trace("Added {} successfully", file);
}
} else {
- LOG.warn("Directory/File " + file.getAbsolutePath() + " could not
be read."
- + " This directory will not be indexed. Please check
permissions and rebuild indexes.");
+ LOG.warn("Directory/File {} could not be read."
+ + " This directory will not be indexed. Please check
permissions and rebuild indexes.",
+ file.getAbsolutePath());
}
}
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
index f8373d2..010446f 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/DefaultJavaMailSender.java
@@ -167,7 +167,7 @@ public class DefaultJavaMailSender implements
JavaMailSender {
try {
transport.close();
} catch (MessagingException e) {
- LOG.warn("Error closing transport to host " + host + ". This
exception will be ignored.", e);
+ LOG.warn("Error closing transport to host {}. This exception
will be ignored.", host, e);
}
}
}
diff --git
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
index 8ab8c50..53775c0 100644
---
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
+++
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaConsumer.java
@@ -288,8 +288,9 @@ public class MinaConsumer extends DefaultConsumer {
}
appendIoFiltersToChain(filters, acceptor.getFilterChain());
if (configuration.getSslContextParameters() != null) {
- LOG.warn("Using datagram protocol, " + configuration.getProtocol()
- + ", but an SSLContextParameters instance was provided.
SSLContextParameters is only supported on the TCP protocol.");
+ LOG.warn("Using datagram protocol, {}, but an SSLContextParameters
instance was provided. "
+ + "SSLContextParameters is only supported on the TCP
protocol.",
+ configuration.getProtocol());
}
}
diff --git
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
index 1c641cc..36d9b07 100644
---
a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
+++
b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaProducer.java
@@ -389,8 +389,9 @@ public class MinaProducer extends DefaultProducer {
}
appendIoFiltersToChain(filters, connector.getFilterChain());
if (configuration.getSslContextParameters() != null) {
- LOG.warn("Using datagram protocol, " + configuration.getProtocol()
- + ", but an SSLContextParameters instance was provided.
SSLContextParameters is only supported on the TCP protocol.");
+ LOG.warn("Using datagram protocol, {}, but an SSLContextParameters
instance was provided. "
+ + "SSLContextParameters is only supported on the TCP
protocol.",
+ configuration.getProtocol());
}
configureDataGramCodecFactory("MinaProducer", connector,
configuration);
// set connect timeout to mina in seconds
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
index 818e0ef..0702678 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpServerConsumer.java
@@ -522,10 +522,10 @@ public class MllpTcpServerConsumer extends
DefaultConsumer {
=
exchange.getProperty(MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE, String.class);
if (null != acknowledgementTypeProperty
&&
!acknowledgementTypeProperty.equals(acknowledgementMessageType)) {
- log.warn(
- "Acknowledgement type found in message ["
+ acknowledgementMessageType + "] does not match "
- + MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE
+ " exchange property value ["
- + acknowledgementTypeProperty + "] -
using value found in message");
+ log.warn("Acknowledgement type found in message
[{}] does not match {} exchange property "
+ + "value [{}] - using value found in
message",
+ acknowledgementMessageType,
MllpConstants.MLLP_ACKNOWLEDGEMENT_TYPE,
+ acknowledgementTypeProperty);
}
}
}
diff --git
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
index c793d7e..a84a8c9 100644
---
a/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
+++
b/components/camel-mock/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
@@ -1567,7 +1567,7 @@ public class MockEndpoint extends DefaultEndpoint
implements BrowsableEndpoint,
} catch (AssertionError e) {
failFastAssertionError = e;
// signal latch we are done as we are failing fast
- LOG.debug("Assertion failed fast on {} received
exchange due to ", index, e.getMessage());
+ LOG.debug("Assertion failed fast on {} received
exchange due to {}", index, e.getMessage());
while (latch != null && latch.getCount() > 0) {
latch.countDown();
}
diff --git
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
index 6afc581..45bfca1 100644
---
a/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
+++
b/components/camel-mybatis/src/main/java/org/apache/camel/component/mybatis/MyBatisConsumer.java
@@ -109,8 +109,8 @@ public class MyBatisConsumer extends
ScheduledBatchPollingConsumer {
// limit if needed
if (maxMessagesPerPoll > 0 && total > maxMessagesPerPoll) {
- LOG.debug("Limiting to maximum messages to poll " +
maxMessagesPerPoll + " as there were " + total
- + " messages in this poll.");
+ LOG.debug("Limiting to maximum messages to poll {} as there were
{} messages in this poll.",
+ maxMessagesPerPoll, total);
total = maxMessagesPerPoll;
}
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
index 5c7f64b..a9cf8aa 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/ClientModeTCPNettyServerBootstrapFactory.java
@@ -213,8 +213,8 @@ public class ClientModeTCPNettyServerBootstrapFactory
extends ServiceSupport imp
LOG.trace("Re-connecting to {} if needed",
configuration.getAddress());
doReconnectIfNeeded();
} catch (Exception e) {
- LOG.warn("Error during re-connect to " +
configuration.getAddress() + ". Will attempt again in "
- + configuration.getReconnectInterval() + "
millis. This exception is ignored.",
+ LOG.warn("Error during re-connect to {}. Will attempt
again in {} millis. This exception is ignored.",
+ configuration.getAddress(),
configuration.getReconnectInterval(),
e);
}
}
diff --git
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
index 1b57399..0b74d89 100644
---
a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
+++
b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
@@ -516,7 +516,7 @@ public class NettyProducer extends DefaultAsyncProducer {
pool.invalidateObject(channelFuture);
}
} catch (Exception e) {
- LOG.warn("Error returning channel to pool " + channel + ". This
exception will be ignored.", e);
+ LOG.warn("Error returning channel to pool {}. This exception will
be ignored.", channel, e);
}
}
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
index aec99fd..94ae818 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiProcessor.java
@@ -124,7 +124,7 @@ public class RestOpenApiProcessor implements Processor {
}
}
} catch (Exception e) {
- LOG.warn("Error rendering OpenApi API due " + e.getMessage(), e);
+ LOG.warn("Error rendering OpenApi API due {}", e.getMessage(), e);
}
}
diff --git
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
index df35a54..d99af4d 100644
---
a/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
+++
b/components/camel-pulsar/src/main/java/org/apache/camel/component/pulsar/utils/PulsarUtils.java
@@ -42,9 +42,8 @@ public final class PulsarUtils {
if (e instanceof
PulsarClientException.AlreadyClosedException) {
// ignore
} else {
- LOG.debug("Error stopping consumer: " + consumer + "
due to " + e.getMessage()
- + ". This exception is ignored",
- e);
+ LOG.debug("Error stopping consumer: {} due to {}. This
exception is ignored", consumer,
+ e.getMessage(), e);
}
}
}
diff --git
a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
index 3513fbf..8d289c0 100644
---
a/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
+++
b/components/camel-resteasy/src/main/java/org/apache/camel/component/resteasy/ResteasyProducer.java
@@ -329,9 +329,9 @@ public class ResteasyProducer extends DefaultProducer {
headers.put(ResteasyConstants.RESTEASY_RESPONSE, response);
exchange.getMessage().setHeaders(headers);
- LOG.debug("Headers from exchange.getIn() : {}",
exchange.getIn().getHeaders().toString());
- LOG.debug("Headers from exchange.getOut() before copying : {}",
exchange.getMessage().getHeaders().toString());
- LOG.debug("Header from response : {}",
response.getHeaders().toString());
+ LOG.debug("Headers from exchange.getIn() : {}",
exchange.getIn().getHeaders());
+ LOG.debug("Headers from exchange.getOut() before copying : {}",
exchange.getMessage().getHeaders());
+ LOG.debug("Header from response : {}", response.getHeaders());
if (response.hasEntity()) {
exchange.getMessage().setBody(response.readEntity(String.class));
diff --git
a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
index 4eb444c6c..426a66d 100644
---
a/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
+++
b/components/camel-sip/src/main/java/org/apache/camel/component/sip/SipConfiguration.java
@@ -244,8 +244,8 @@ public class SipConfiguration {
= component.getAndRemoveParameter(parameters,
"implementationServerLogFile", String.class, null);
implementationTraceLevel = component.getAndRemoveParameter(parameters,
"implementationTraceLevel", String.class, "0");
- LOG.trace("Consumer:" + consumer + " StackName:" + stackName);
- LOG.trace("From User: " + getFromUser() + " From host: " +
getFromHost() + " From Port: " + getFromPort());
+ LOG.trace("Consumer: {} StackName: {}", consumer, stackName);
+ LOG.trace("From User: {} From host: {} From Port: {}", getFromUser(),
getFromHost(), getFromPort());
createFactoriesAndHeaders(parameters, component);
diff --git
a/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
b/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
index 0f0e060..133f45d 100644
---
a/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
+++
b/components/camel-sip/src/main/java/org/apache/camel/component/sip/listener/SipPresenceAgentListener.java
@@ -188,7 +188,7 @@ public class SipPresenceAgentListener implements
SipListener, SipMessageCodes {
Response response = responseReceivedEvent.getResponse();
Integer statusCode = response.getStatusCode();
if (SIP_MESSAGE_CODES.containsKey(statusCode)) {
- LOG.debug(SIP_MESSAGE_CODES.get(statusCode) + " received from
Subscriber");
+ LOG.debug("{} received from Subscriber",
SIP_MESSAGE_CODES.get(statusCode));
}
}
diff --git
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
index 90d7907..0d715be 100644
---
a/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
+++
b/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
@@ -222,7 +222,7 @@ public class SnmpOIDPoller extends ScheduledPollConsumer
implements ResponseList
// check for valid response
if (event.getRequest() == null || event.getResponse() == null) {
// ignore null requests/responses
- LOG.debug("Received invalid SNMP event. Request: " +
event.getRequest() + " / Response: " + event.getResponse());
+ LOG.debug("Received invalid SNMP event. Request: {} / Response:
{}", event.getRequest(), event.getResponse());
return;
}
diff --git
a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
index e45a5b8..7e36c4d 100644
---
a/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
+++
b/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/name/ServiceInterfaceStrategy.java
@@ -161,8 +161,8 @@ public class ServiceInterfaceStrategy implements
ElementNameStrategy {
if (ti.getTypeName() != null) {
if (!(ti.getTypeName().equals("javax.xml.ws.Holder"))
&&
(!(inTypeNameToQName.get(ti.getTypeName()).equals(ti.getElName())))) {
- LOG.warn("Ambiguous QName mapping. The type [ " +
ti.getTypeName()
- + " ] is already mapped to a QName in
this context.");
+ LOG.warn("Ambiguous QName mapping. The type [{}]
is already mapped to a QName in this context.",
+ ti.getTypeName());
continue;
}
}
diff --git
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotSendMessageProducer.java
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotSendMessageProducer.java
index 3db256e..975f238 100644
---
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotSendMessageProducer.java
+++
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/component/SoroushBotSendMessageProducer.java
@@ -74,7 +74,7 @@ public class SoroushBotSendMessageProducer extends
DefaultProducer {
endpoint.waitBeforeRetry(count);
try {
if (LOG.isDebugEnabled()) {
- LOG.debug("sending message for " + ordinal(count + 1) + "
time(s). message:" + message);
+ LOG.debug("sending message for {} time(s). message: {}",
ordinal(count + 1), message);
}
response =
endpoint.getSendMessageTarget().request(MediaType.APPLICATION_JSON_TYPE)
.post(Entity.entity(objectMapper.writeValueAsString(message),
MediaType.APPLICATION_JSON_TYPE));
@@ -87,7 +87,7 @@ public class SoroushBotSendMessageProducer extends
DefaultProducer {
message);
}
if (LOG.isWarnEnabled()) {
- LOG.warn("failed to send message: " + message, ex);
+ LOG.warn("failed to send message: {}", message, ex);
}
}
diff --git
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPool.java
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPool.java
index f5b1233..1c4b51b 100644
---
a/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPool.java
+++
b/components/camel-soroush/src/main/java/org/apache/camel/component/soroushbot/utils/MultiQueueWithTopicThreadPool.java
@@ -34,10 +34,9 @@ public class MultiQueueWithTopicThreadPool {
private List<PoolWorker> workers = new ArrayList<>();
public MultiQueueWithTopicThreadPool(int poolSize, int capacity, String
namePrefix) {
- if (log.isDebugEnabled()) {
- log.debug("creating MultiQueueWithTopicThreadPool with size " +
poolSize + " and capacity of each queue is set to "
- + capacity);
- }
+ log.debug("creating MultiQueueWithTopicThreadPool with size {} and
capacity of each queue is set to {}",
+ poolSize, capacity);
+
this.poolSize = poolSize;
//create a pool of thread and start them
for (int i = 0; i < poolSize; i++) {
@@ -117,7 +116,7 @@ class PoolWorker extends Thread {
try {
queue.wait();
} catch (InterruptedException e) {
- log.error("An interrupt occurred while queue is
waiting: " + e.getMessage());
+ log.error("An interrupt occurred while queue is
waiting: {}", e.getMessage());
//interrupt current thread to prevent the interrupt
being swallowed.
Thread.currentThread().interrupt();
}
@@ -133,7 +132,7 @@ class PoolWorker extends Thread {
task.run();
} catch (RuntimeException e) {
//catch RuntimeException that may thrown in the task
- log.error("Thread pool is interrupted due to an issue: " +
e.getMessage());
+ log.error("Thread pool is interrupted due to an issue: {}",
e.getMessage());
}
}
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelDirectConnection.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelDirectConnection.java
index 1d054a9..70cf2df 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelDirectConnection.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelDirectConnection.java
@@ -47,7 +47,7 @@ public class CamelDirectConnection implements
WebServiceConnection {
camelContext.createProducerTemplate().sendBody(destination.toString(), message);
} catch (CamelExecutionException e) {
// simply discard replyTo message
- LOG.warn("Could not found any camel endpoint [" + destination + "]
for wsa:ReplyTo camel mapping.", e);
+ LOG.warn("Could not found any camel endpoint [{}] for wsa:ReplyTo
camel mapping.", destination, e);
}
}
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
index 54a9783..141d94a 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/component/event/EventComponent.java
@@ -90,7 +90,7 @@ public class EventComponent extends DefaultComponent
implements ApplicationConte
try {
endpoint.onApplicationEvent(event);
} catch (Exception e) {
- LOG.warn("Error on application event " + event + ". This
exception will be ignored.", e);
+ LOG.warn("Error on application event {}. This exception will
be ignored.", event, e);
}
}
}
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
index d65ab4b..1e7ffdd 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelBeanPostProcessor.java
@@ -150,9 +150,9 @@ public class CamelBeanPostProcessor
if (prototypeBeans.add(beanName)) {
// do not spam the log with WARN so do this
only once per bean name
CamelBeanPostProcessor.LOG
- .warn("The bean with id [" + beanName
- + "] is prototype scoped and
cannot stop the injected service when bean is destroyed: "
- + service + ". You may want to
stop the service manually from the bean.");
+ .warn("The bean with id [{}] is
prototype scoped and cannot stop the injected "
+ + " service when bean is
destroyed: {}. You may want to stop the service "
+ + "manually from the bean.",
beanName, service);
}
}
}
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
index 1070583..383dd7d 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
@@ -243,8 +243,8 @@ public class SpringCamelContext extends DefaultCamelContext
if (applicationContext instanceof ConfigurableApplicationContext) {
return new SpringInjector((ConfigurableApplicationContext)
applicationContext);
} else {
- LOG.warn("Cannot use SpringInjector as applicationContext is not a
ConfigurableApplicationContext as its: "
- + applicationContext);
+ LOG.warn("Cannot use SpringInjector as applicationContext is not a
ConfigurableApplicationContext as its: {}",
+ applicationContext);
return super.createInjector();
}
}
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 e10af00..62c34e4 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
@@ -168,9 +168,9 @@ public class TransactionErrorHandler extends
RedeliveryErrorHandler {
// log exception if there was a cause exception so we have the
stack trace
Exception cause = exchange.getException();
if (cause != null) {
- LOG.debug("Transaction rollback (" + transactionKey + ")
redelivered(" + redelivered + ") for "
- + ids + " due exchange was marked for
rollbackOnlyLast and caught: ",
- cause);
+ LOG.debug("Transaction rollback ({}) redelivered({}) for
{} due exchange was marked for "
+ + "rollbackOnlyLast and caught: {}",
+ transactionKey, redelivered, ids,
cause.getMessage(), cause);
} else {
LOG.debug("Transaction rollback ({}) redelivered({}) for
{} "
+ "due exchange was marked for rollbackOnlyLast",
diff --git
a/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
b/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
index dde54f1..ca042e4 100644
---
a/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
+++
b/components/camel-spring/src/main/java/org/apache/camel/spring/util/MainRunner.java
@@ -49,12 +49,12 @@ public class MainRunner implements InitializingBean,
Runnable {
try {
runMethodWithoutCatchingExceptions();
} catch (NoSuchMethodException e) {
- LOG.error("Class: " + name(main) + " does not have a main method:
" + e, e);
+ LOG.error("Class: {} does not have a main method: {}", name(main),
e.getMessage(), e);
} catch (IllegalAccessException e) {
- LOG.error("Failed to run: " + this + ". Reason: " + e, e);
+ LOG.error("Failed to run: {}. Reason: {}", this, e.getMessage(),
e);
} catch (InvocationTargetException e) {
Throwable throwable = e.getTargetException();
- LOG.error("Failed to run: " + this + ". Reason: " + throwable,
throwable);
+ LOG.error("Failed to run: {}. Reason: {}", this,
throwable.getMessage(), throwable);
}
}
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
index 369ec30..0915c09 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregationRepository.java
@@ -635,15 +635,15 @@ public class JdbcAggregationRepository extends
ServiceSupport
int completed = scan(null).size();
if (current > 0) {
- LOG.info("On startup there are " + current + " aggregate exchanges
(not completed) in repository: "
- + getRepositoryName());
+ LOG.info("On startup there are {} aggregate exchanges (not
completed) in repository: {}", current,
+ getRepositoryName());
} else {
LOG.info("On startup there are no existing aggregate exchanges
(not completed) in repository: {}",
getRepositoryName());
}
if (completed > 0) {
- LOG.warn("On startup there are " + completed + " completed
exchanges to be recovered in repository: "
- + getRepositoryNameCompleted());
+ LOG.warn("On startup there are {} completed exchanges to be
recovered in repository: {}", completed,
+ getRepositoryNameCompleted());
} else {
LOG.info("On startup there are no completed exchanges to be
recovered in repository: {}",
getRepositoryNameCompleted());
diff --git
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
index 481aa53..1670bbb 100644
---
a/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
+++
b/components/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/TestSupport.java
@@ -150,7 +150,7 @@ public final class TestSupport {
}
assertEquals(expectedBody, actualBody, "in body of: " + exchange);
- LOG.debug("Received response: " + exchange + " with in: " +
exchange.getIn());
+ LOG.debug("Received response: {} with in: {}", exchange,
exchange.getIn());
}
/**
@@ -168,7 +168,7 @@ public final class TestSupport {
}
assertEquals(expectedBody, actualBody, "output body of: " + exchange);
- LOG.debug("Received response: " + exchange + " with out: " +
exchange.getMessage());
+ LOG.debug("Received response: {} with out: {}", exchange,
exchange.getMessage());
}
/**
@@ -191,7 +191,7 @@ public final class TestSupport {
actualAnswer = expression.evaluate(exchange, Object.class);
}
- LOG.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + actualAnswer);
+ LOG.debug("Evaluated expression: {} on exchange: {} result: {}",
expression, exchange, actualAnswer);
assertEquals(expectedAnswer, actualAnswer, "Expression: " + expression
+ " on Exchange: " + exchange);
return actualAnswer;
@@ -211,7 +211,7 @@ public final class TestSupport {
try {
PredicateAssertHelper.assertMatches(predicate, "Predicate should
match: ", exchange);
} catch (AssertionError e) {
- LOG.debug("Caught expected assertion error: " + e);
+ LOG.debug("Caught expected assertion error: {}", e.getMessage(),
e);
}
assertPredicate(predicate, exchange, false);
}
@@ -225,7 +225,7 @@ public final class TestSupport {
}
boolean actualValue = predicate.matches(exchange);
- LOG.debug("Evaluated predicate: " + predicate + " on exchange: " +
exchange + " result: " + actualValue);
+ LOG.debug("Evaluated predicate: {} on exchange: {} result: {}",
predicate, exchange, actualValue);
assertEquals(expectedValue, actualValue, "Predicate: " + predicate + "
on Exchange: " + exchange);
return actualValue;
@@ -439,7 +439,7 @@ public final class TestSupport {
}
boolean success = file.delete();
if (!success) {
- LOG.warn("Deletion of file: " + file.getAbsolutePath() + "
failed");
+ LOG.warn("Deletion of file: {} failed", file.getAbsolutePath());
}
}
diff --git
a/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/RouteCoverageDumper.java
b/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/RouteCoverageDumper.java
index 48b208b..e664a3a 100644
---
a/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/RouteCoverageDumper.java
+++
b/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/RouteCoverageDumper.java
@@ -59,7 +59,7 @@ public final class RouteCoverageDumper {
file.mkdirs();
file = new File(dir, name);
- LOG.info("Dumping route coverage to file: " + file);
+ LOG.info("Dumping route coverage to file: {}", file);
InputStream is = new ByteArrayInputStream(combined.getBytes());
OutputStream os = new FileOutputStream(file, false);
IOHelper.copyAndCloseInput(is, os);
diff --git
a/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/StopWatchTestExecutionListener.java
b/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/StopWatchTestExecutionListener.java
index ee917fb..f83a556 100644
---
a/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/StopWatchTestExecutionListener.java
+++
b/components/camel-test-spring-junit5/src/main/java/org/apache/camel/test/spring/junit5/StopWatchTestExecutionListener.java
@@ -62,9 +62,8 @@ public class StopWatchTestExecutionListener extends
AbstractTestExecutionListene
Logger log = LoggerFactory.getLogger(testContext.getTestClass());
log.info("********************************************************************************");
- log.info("Testing done: " + testContext.getTestMethod().getName()
+ "(" + testContext.getTestClass().getName()
- + ")");
- log.info("Took: " + TimeUtils.printDuration(time) + " (" + time +
" millis)");
+ log.info("Testing done: {} ({})",
testContext.getTestMethod().getName(), testContext.getTestClass().getName());
+ log.info("Took: {} ({} millis)", TimeUtils.printDuration(time),
time);
log.info("********************************************************************************");
threadStopWatch.remove();
diff --git
a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
index 9e0ab9b..fa558bb 100644
---
a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
+++
b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/RouteCoverageDumper.java
@@ -59,7 +59,7 @@ public final class RouteCoverageDumper {
file.mkdirs();
file = new File(dir, name);
- LOG.info("Dumping route coverage to file: " + file);
+ LOG.info("Dumping route coverage to file: {}", file);
InputStream is = new ByteArrayInputStream(combined.getBytes());
OutputStream os = new FileOutputStream(file, false);
IOHelper.copyAndCloseInput(is, os);
diff --git
a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
index 1c16193..87095d7 100644
---
a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
+++
b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
@@ -52,9 +52,8 @@ public class StopWatchTestExecutionListener extends
AbstractTestExecutionListene
Logger log = LoggerFactory.getLogger(testContext.getTestClass());
log.info("********************************************************************************");
- log.info("Testing done: " + testContext.getTestMethod().getName()
+ "(" + testContext.getTestClass().getName()
- + ")");
- log.info("Took: " + TimeUtils.printDuration(time) + " (" + time +
" millis)");
+ log.info("Testing done: {} ({})",
testContext.getTestMethod().getName(), testContext.getTestClass().getName());
+ log.info("Took: {} ({} millis)", TimeUtils.printDuration(time),
time);
log.info("********************************************************************************");
threadStopWatch.remove();
diff --git
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index eed262f..1f0d441 100644
---
a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++
b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -156,7 +156,7 @@ public abstract class TestSupport extends Assert {
}
assertEquals("in body of: " + exchange, expected, actual);
- LOG.debug("Received response: " + exchange + " with in: " +
exchange.getIn());
+ LOG.debug("Received response: {} with in: {}", exchange,
exchange.getIn());
}
/**
@@ -178,7 +178,7 @@ public abstract class TestSupport extends Assert {
}
assertEquals("output body of: " + exchange, expected, actual);
- LOG.debug("Received response: " + exchange + " with out: " +
exchange.getOut());
+ LOG.debug("Received response: {} with out: {}", exchange,
exchange.getOut());
}
public static Object assertMessageHeader(Message message, String name,
Object expected) {
@@ -198,7 +198,7 @@ public abstract class TestSupport extends Assert {
value = expression.evaluate(exchange, Object.class);
}
- LOG.debug("Evaluated expression: " + expression + " on exchange: " +
exchange + " result: " + value);
+ LOG.debug("Evaluated expression: {} on exchange: {} result: {}",
expression, exchange, value);
assertEquals("Expression: " + expression + " on Exchange: " +
exchange, expected, value);
return value;
@@ -218,7 +218,7 @@ public abstract class TestSupport extends Assert {
try {
PredicateAssertHelper.assertMatches(predicate, "Predicate should
match: ", exchange);
} catch (AssertionError e) {
- LOG.debug("Caught expected assertion error: " + e);
+ LOG.debug("Caught expected assertion error: {}", e);
}
assertPredicate(predicate, exchange, false);
}
@@ -232,7 +232,7 @@ public abstract class TestSupport extends Assert {
}
boolean value = predicate.matches(exchange);
- LOG.debug("Evaluated predicate: " + predicate + " on exchange: " +
exchange + " result: " + value);
+ LOG.debug("Evaluated predicate: {} on exchange: {} result: {}",
predicate, exchange, value);
assertEquals("Predicate: " + predicate + " on Exchange: " + exchange,
expected, value);
return value;
@@ -383,7 +383,7 @@ public abstract class TestSupport extends Assert {
}
boolean success = file.delete();
if (!success) {
- LOG.warn("Deletion of file: " + file.getAbsolutePath() + "
failed");
+ LOG.warn("Deletion of file: {} failed", file.getAbsolutePath());
}
}
diff --git
a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
index ac86205..83bb357 100644
---
a/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
+++
b/components/camel-vertx/src/main/java/org/apache/camel/component/vertx/VertxComponent.java
@@ -188,9 +188,8 @@ public class VertxComponent extends DefaultComponent {
@Override
public void handle(AsyncResult<Vertx> event) {
if (event.cause() != null) {
- LOG.warn("Error creating Clustered Vertx " + host
+ ":" + port + " due "
- + event.cause().getMessage(),
- event.cause());
+ LOG.warn("Error creating Clustered Vertx {}:{} due
{}", host, port,
+ event.cause().getMessage(), event.cause());
} else if (event.succeeded()) {
vertx = event.result();
LOG.info("EventBus is ready: {}", vertx);
diff --git
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 08209b1..dacc4f4 100644
---
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -395,7 +395,7 @@ public class WebsocketComponent extends DefaultComponent
implements SSLContextPa
if (home != null) {
String[] resources = home.split(":");
if (LOG.isDebugEnabled()) {
- LOG.debug(">>> Protocol found: " + resources[0] + ", and
resource: " + resources[1]);
+ LOG.debug(">>> Protocol found: {}, and resource: {}",
resources[0], resources[1]);
}
if (resources[0].equals("classpath")) {
@@ -447,7 +447,7 @@ public class WebsocketComponent extends DefaultComponent
implements SSLContextPa
ServletContextHandler context = (ServletContextHandler)
connectorRef.server.getHandler();
servlet = createServlet(sync, pathSpec, servlets, context);
connectorRef.servlet = servlet;
- LOG.debug("WebSocket servlet added for the following path : "
+ pathSpec + ", to the Jetty Server : " + key);
+ LOG.debug("WebSocket servlet added for the following path :
{}, to the Jetty Server : {}", pathSpec, key);
}
return servlet;
diff --git
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
index 76e4692..c5a39fe 100644
---
a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
+++
b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/DefaultXmlSignature2Message.java
@@ -400,8 +400,7 @@ public class DefaultXmlSignature2Message implements
XmlSignature2Message {
if (referencedObjects.isEmpty()) {
throw new XmlSignatureException(
- String.format(
- "Unsupported XML signature document: Content
object not found in the enveloping XML signature."));
+ "Unsupported XML signature document: Content object not
found in the enveloping XML signature.");
}
if (referencedObjects.size() > 1) {
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
index 000b16a..b486254 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppBinding.java
@@ -77,9 +77,7 @@ public class XmppBinding {
JivePropertiesManager.addProperty(message, name,
value);
LOG.trace("Added property name: {} value: {}", name,
value);
} catch (IllegalArgumentException iae) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Cannot add property " + name + " to
XMPP message due: ", iae);
- }
+ LOG.debug("Cannot add property {} to XMPP message due:
{}", name, iae.getMessage(), iae);
}
}
}
@@ -102,9 +100,9 @@ public class XmppBinding {
if (!headerFilterStrategy.applyFilterToCamelHeaders(name, value,
exchange)) {
try {
JivePropertiesManager.addProperty(stanza, name, value);
- LOG.debug("Added property name: " + name + " value: " +
value);
+ LOG.debug("Added property name: {} value: {}", name,
value);
} catch (IllegalArgumentException iae) {
- LOG.debug("Not adding property " + name + " to XMPP
message due to " + iae);
+ LOG.debug("Not adding property {} to XMPP message due to
{}", name, iae.getMessage(), iae);
}
}
}
diff --git
a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
index 1c34d35..2cdb1a7 100644
---
a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
+++
b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/MessageVariableResolver.java
@@ -71,7 +71,7 @@ public class MessageVariableResolver implements
XPathVariableResolver {
try {
answer = System.getProperty(localPart);
} catch (Exception e) {
- LOG.debug("Security exception evaluating system property: " +
localPart + ". Reason: " + e, e);
+ LOG.debug("Security exception evaluating system property: {}.
Reason: {}", localPart, e.getMessage(), e);
}
} else if (uri.equals(ENVIRONMENT_VARIABLES)) {
answer = System.getenv().get(localPart);
diff --git
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/ZookeeperGroupListenerSupport.java
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/ZookeeperGroupListenerSupport.java
index 30434ed..7c5c384 100644
---
a/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/ZookeeperGroupListenerSupport.java
+++
b/components/camel-zookeeper-master/src/main/java/org/apache/camel/component/zookeepermaster/ZookeeperGroupListenerSupport.java
@@ -76,14 +76,14 @@ public class ZookeeperGroupListenerSupport extends
ZookeeperGroupSupport impleme
if (singleton.isConnected()) {
if (singleton.isMaster()) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Master/Standby endpoint is Master for:
" + endpoint + " in "
- + endpoint.getCamelContext());
+ LOG.debug("Master/Standby endpoint is Master for:
{} in {}", endpoint,
+ endpoint.getCamelContext());
}
onLockOwned();
} else {
if (LOG.isDebugEnabled()) {
- LOG.debug("Master/Standby endpoint is Standby for:
" + endpoint + " in "
- + endpoint.getCamelContext());
+ LOG.debug("Master/Standby endpoint is Standby for:
{} in {}", endpoint,
+ endpoint.getCamelContext());
}
}
}
@@ -93,7 +93,7 @@ public class ZookeeperGroupListenerSupport extends
ZookeeperGroupSupport impleme
LOG.info("Disconnecting as master. Stopping consumer: {}",
endpoint);
onDisconnected();
} catch (Exception e) {
- LOG.warn("Failed to stop master consumer for: " + endpoint
+ ". This exception is ignored.", e);
+ LOG.warn("Failed to stop master consumer for: {}. This
exception is ignored.", endpoint, e);
}
break;
default:
diff --git
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ConnectionHolder.java
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ConnectionHolder.java
index 00c8ac5..95da0b4 100644
---
a/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ConnectionHolder.java
+++
b/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ConnectionHolder.java
@@ -93,9 +93,8 @@ public class ConnectionHolder implements Watcher {
LOG.debug("Shutting down connection to Zookeeper cluster {}",
configuration.getConnectString());
}
} catch (InterruptedException e) {
- LOG.warn("Error closing zookeeper connection " +
configuration.getConnectString()
- + ". This exception will be ignored.",
- e);
+ LOG.warn("Error closing zookeeper connection {}. This exception
will be ignored.",
+ configuration.getConnectString(), e);
}
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
index 75362d0..6d7ba77 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
@@ -127,7 +127,7 @@ public class JsseParameters implements CamelContextAware {
is = new FileInputStream(resource);
LOG.debug("Opened resource [{}] as a file.", resource);
} catch (FileNotFoundException e) {
- LOG.trace("Could not open resource [" + resource + "] as a file.",
e);
+ LOG.trace("Could not open resource [{}] as a file.", resource, e);
}
// then prefer to use ClassResolver from CamelContext if possible
@@ -143,7 +143,7 @@ public class JsseParameters implements CamelContextAware {
resource, this.getClass().getClassLoader());
}
} catch (Throwable e) {
- LOG.trace("Could not open resource [" + resource + "] using
the CamelContext ClassResolver.", e);
+ LOG.trace("Could not open resource [{}] using the
CamelContext ClassResolver.", resource, e);
}
}
@@ -181,7 +181,7 @@ public class JsseParameters implements CamelContextAware {
is = new URL(resource).openStream();
LOG.debug("Opened resource [{}] as a URL.", resource);
} catch (IOException e) {
- LOG.trace("Could not open resource [" + resource + "] as a
URL.", e);
+ LOG.trace("Could not open resource [{}] as a URL.", resource,
e);
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
b/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
index ab504fe..10f204f 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/service/BaseService.java
@@ -84,7 +84,7 @@ public abstract class BaseService {
status = INITIALIZED;
LOG.trace("Initialized service: {}", this);
} catch (Exception e) {
- LOG.trace("Error while initializing service: " + this,
e);
+ LOG.trace("Error while initializing service: {}",
this, e);
fail(e);
}
}
@@ -121,10 +121,10 @@ public abstract class BaseService {
stop();
} catch (Exception e2) {
// ignore
- LOG.trace("Error while stopping service after it failed to
start: " + this + ". This exception is ignored",
- e);
+ LOG.trace("Error while stopping service after it failed to
start: {}. This exception is ignored",
+ this, e);
}
- LOG.trace("Error while starting service: " + this, e);
+ LOG.trace("Error while starting service: {}", this, e);
fail(e);
}
}
@@ -157,7 +157,7 @@ public abstract class BaseService {
status = STOPPED;
LOG.trace("Stopped: {} service", this);
} catch (Exception e) {
- LOG.trace("Error while stopping service: " + this, e);
+ LOG.trace("Error while stopping service: {}", this, e);
fail(e);
}
}
@@ -186,7 +186,7 @@ public abstract class BaseService {
status = SUSPENDED;
LOG.trace("Suspended service: {}", this);
} catch (Exception e) {
- LOG.trace("Error while suspending service: " + this, e);
+ LOG.trace("Error while suspending service: {}", this, e);
fail(e);
}
}
@@ -211,7 +211,7 @@ public abstract class BaseService {
status = STARTED;
LOG.trace("Resumed service: {}", this);
} catch (Exception e) {
- LOG.trace("Error while resuming service: " + this, e);
+ LOG.trace("Error while resuming service: {}", this, e);
fail(e);
}
}
@@ -241,7 +241,7 @@ public abstract class BaseService {
LOG.trace("Shutdown service: {}", this);
status = SHUTDOWN;
} catch (Exception e) {
- LOG.trace("Error shutting down service: " + this, e);
+ LOG.trace("Error shutting down service: {}", this, e);
fail(e);
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index d7ff76f..c4cea99 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -299,13 +299,11 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
}
// if we should ignore then only log at debug level
if (ignore) {
- LOG.debug("Ignoring converter type: " +
type.getCanonicalName() + " as a dependent class could not be found: "
- + e,
- e);
+ LOG.debug("Ignoring converter type: {} as a dependent class
could not be found: {}",
+ type.getCanonicalName(), e, e);
} else {
- LOG.warn("Ignoring converter type: " + type.getCanonicalName()
+ " as a dependent class could not be found: "
- + e,
- e);
+ LOG.warn("Ignoring converter type: {} as a dependent class
could not be found: {}",
+ type.getCanonicalName(), e, e);
}
}
}
@@ -320,13 +318,14 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
if (isValidConverterMethod(method)) {
int modifiers = method.getModifiers();
if (isAbstract(modifiers) || !isPublic(modifiers)) {
- LOG.warn("Ignoring bad converter on type: " +
type.getCanonicalName() + " method: " + method
- + " as a converter method is not a public and
concrete method");
+ LOG.warn(
+ "Ignoring bad converter on type: {} method: {} as a
converter method is not a public and concrete method",
+ type.getCanonicalName(), method);
} else {
Class<?> toType = method.getReturnType();
if (toType.equals(Void.class)) {
- LOG.warn("Ignoring bad converter on type: " +
type.getCanonicalName() + " method: "
- + method + " as a converter method returns a void
method");
+ LOG.warn("Ignoring bad converter on type: {} method: {} as
a converter method returns a void method",
+ type.getCanonicalName(), method);
} else {
Class<?> fromType = method.getParameterTypes()[0];
if (isStatic(modifiers)) {
@@ -342,8 +341,8 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
}
}
} else {
- LOG.warn("Ignoring bad converter on type: " +
type.getCanonicalName() + " method: " + method
- + " as a converter method should have one parameter");
+ LOG.warn("Ignoring bad converter on type: {} method: {} as a
converter method should have one parameter",
+ type.getCanonicalName(), method);
}
return injector;
}
@@ -354,13 +353,15 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
if (isValidFallbackConverterMethod(method)) {
int modifiers = method.getModifiers();
if (isAbstract(modifiers) || !isPublic(modifiers)) {
- LOG.warn("Ignoring bad fallback converter on type: " +
type.getCanonicalName() + " method: " + method
- + " as a fallback converter method is not a public
and concrete method");
+ LOG.warn("Ignoring bad fallback converter on type: {} method:
{} as a fallback converter method is not "
+ + "a public and concrete method",
+ type.getCanonicalName(), method);
} else {
Class<?> toType = method.getReturnType();
if (toType.equals(Void.class)) {
- LOG.warn("Ignoring bad fallback converter on type: " +
type.getCanonicalName() + " method: "
- + method + " as a fallback converter method
returns a void method");
+ LOG.warn("Ignoring bad fallback converter on type: {}
method: {} as a fallback converter method "
+ + "returns a void method",
+ type.getCanonicalName(), method);
} else {
if (isStatic(modifiers)) {
registerFallbackTypeConverter(registry,
@@ -375,8 +376,9 @@ public class AnnotationTypeConverterLoader implements
TypeConverterLoader {
}
}
} else {
- LOG.warn("Ignoring bad fallback converter on type: " +
type.getCanonicalName() + " method: " + method
- + " as a fallback converter method should have one
parameter");
+ LOG.warn("Ignoring bad fallback converter on type: {} method: {}
as a fallback converter method should have "
+ + "one parameter",
+ type.getCanonicalName(), method);
}
return injector;
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
index dac0c09..81a6d4d 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultConsumerTemplate.java
@@ -225,9 +225,8 @@ public class DefaultConsumerTemplate extends ServiceSupport
implements ConsumerT
exchange.getUnitOfWork().done(exchange);
}
} catch (Throwable e) {
- LOG.warn("Exception occurred during done UnitOfWork for Exchange:
" + exchange
- + ". This exception will be ignored.",
- e);
+ LOG.warn("Exception occurred during done UnitOfWork for Exchange:
{}. This exception will be ignored.",
+ exchange, e);
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
index 6f03d52..7611df3 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanClassResolver.java
@@ -366,7 +366,7 @@ public class DefaultPackageScanClassResolver extends
BasePackageScanResolver
}
}
} catch (IOException ioe) {
- log.warn("Cannot search jar file '" + urlPath + " due to an
IOException: " + ioe.getMessage(), ioe);
+ log.warn("Cannot search jar file '{}' due to an IOException: {}",
urlPath, ioe.getMessage(), ioe);
} finally {
IOHelper.close(jarStream, urlPath, log);
}
@@ -419,15 +419,13 @@ public class DefaultPackageScanClassResolver extends
BasePackageScanResolver
break;
} catch (ClassNotFoundException e) {
if (log.isTraceEnabled()) {
- log.trace("Cannot find class '" + fqn + "' in
classloader: " + classLoader
- + ". Reason: " + e.getMessage(),
- e);
+ log.trace("Cannot find class '{}' in classloader: {}.
Reason: {}", fqn, classLoader,
+ e.getMessage(), e);
}
} catch (NoClassDefFoundError e) {
if (log.isTraceEnabled()) {
- log.trace("Cannot find the class definition '" + fqn +
"' in classloader: " + classLoader
- + ". Reason: " + e.getMessage(),
- e);
+ log.trace("Cannot find the class definition '{}' in
classloader: {}. Reason: {}", fqn, classLoader,
+ e.getMessage(), e);
}
}
}
@@ -435,11 +433,9 @@ public class DefaultPackageScanClassResolver extends
BasePackageScanResolver
log.debug("Cannot find class '{}' in any classloaders: {}",
fqn, set);
}
} catch (Exception e) {
- if (log.isWarnEnabled()) {
- log.warn("Cannot examine class '" + fqn + "' due to a " +
e.getClass().getName()
- + " with message: " + e.getMessage(),
- e);
- }
+ log.warn("Cannot examine class '{}' due to a {} with message: {}",
fqn, e.getClass().getName(),
+ e.getMessage(), e);
+
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
index f9e1776..cfd4baf 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultReactiveExecutor.java
@@ -147,8 +147,8 @@ public class DefaultReactiveExecutor extends ServiceSupport
implements ReactiveE
}
polled.run();
} catch (Throwable t) {
- LOG.warn("Error executing reactive work due to " +
t.getMessage() + ". This exception is ignored.",
- t);
+ LOG.warn("Error executing reactive work due to {}.
This exception is ignored.",
+ t.getMessage(), t);
}
}
} finally {
@@ -175,7 +175,7 @@ public class DefaultReactiveExecutor extends ServiceSupport
implements ReactiveE
polled.run();
} catch (Throwable t) {
// should not happen
- LOG.warn("Error executing reactive work due to " +
t.getMessage() + ". This exception is ignored.", t);
+ LOG.warn("Error executing reactive work due to {}. This
exception is ignored.", t.getMessage(), t);
}
return true;
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
index c5bf193..89c7edc 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/LimitedPollingConsumerPollStrategy.java
@@ -94,8 +94,8 @@ public class LimitedPollingConsumerPollStrategy extends
DefaultPollingConsumerPo
* @throws Exception is thrown if error suspending the consumer
*/
protected void onSuspend(Consumer consumer, Endpoint endpoint) throws
Exception {
- log.warn("Suspending consumer " + consumer + " after " + limit + "
attempts to consume from " + endpoint
- + ". You have to manually resume the consumer!");
+ log.warn("Suspending consumer {} after {} attempts to consume from {}.
You have to manually resume the consumer!",
+ consumer, limit, endpoint);
ServiceHelper.suspendService(consumer);
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
index b72148e..a23d984 100644
---
a/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
+++
b/core/camel-support/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
@@ -316,7 +316,7 @@ public final class FileInputStreamCache extends InputStream
implements StreamCac
tempFile = null;
}
} catch (Exception e) {
- LOG.warn("Error deleting temporary cache file: " + tempFile +
". This exception will be ignored.", e);
+ LOG.warn("Error deleting temporary cache file: {}. This
exception will be ignored.", tempFile, e);
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
index 7fe1aed..b4658bd 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ChildServiceSupport.java
@@ -50,7 +50,7 @@ public abstract class ChildServiceSupport extends
ServiceSupport {
ServiceHelper.initService(childServices);
} catch (Exception e) {
status = FAILED;
- LOG.trace("Error while initializing service: " + this, e);
+ LOG.trace("Error while initializing service: {}", this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
try {
@@ -62,7 +62,7 @@ public abstract class ChildServiceSupport extends
ServiceSupport {
LOG.trace("Service: {} started", this);
} catch (Exception e) {
status = FAILED;
- LOG.trace("Error while starting service: " + this, e);
+ LOG.trace("Error while starting service: {}", this, e);
ServiceHelper.stopService(childServices);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
@@ -89,7 +89,7 @@ public abstract class ChildServiceSupport extends
ServiceSupport {
LOG.trace("Service: {} stopped service", this);
} catch (Exception e) {
status = FAILED;
- LOG.trace("Error while stopping service: " + this, e);
+ LOG.trace("Error while stopping service: {}", this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
@@ -116,7 +116,7 @@ public abstract class ChildServiceSupport extends
ServiceSupport {
status = SHUTDOWN;
} catch (Exception e) {
status = FAILED;
- LOG.trace("Error shutting down service: " + this, e);
+ LOG.trace("Error shutting down service: {}", this, e);
throw RuntimeCamelException.wrapRuntimeCamelException(e);
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
index 0a6de99..9901449 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/EndpointHelper.java
@@ -94,7 +94,7 @@ public final class EndpointHelper {
try {
ServiceHelper.stopAndShutdownService(consumer);
} catch (Exception e) {
- LOG.warn("Failed to stop PollingConsumer: " + consumer + ".
This example is ignored.", e);
+ LOG.warn("Failed to stop PollingConsumer: {}. This example is
ignored.", consumer, e);
}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
index 01a9530..4e2e845 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/EventDrivenPollingConsumer.java
@@ -203,7 +203,7 @@ public class EventDrivenPollingConsumer extends
PollingConsumerSupport implement
try {
timeout = strategy.beforePoll(timeout);
} catch (Exception e) {
- LOG.debug("Error occurred before polling " + consumer + ".
This exception will be ignored.", e);
+ LOG.debug("Error occurred before polling {}. This exception
will be ignored.", consumer, e);
}
}
return timeout;
@@ -215,7 +215,7 @@ public class EventDrivenPollingConsumer extends
PollingConsumerSupport implement
try {
strategy.afterPoll();
} catch (Exception e) {
- LOG.debug("Error occurred after polling " + consumer + ". This
exception will be ignored.", e);
+ LOG.debug("Error occurred after polling {}. This exception
will be ignored.", consumer, e);
}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
index 6c7047f..c057aa9 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
@@ -274,7 +274,7 @@ public final class IntrospectionSupport {
}
} catch (Exception e) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Error invoking getter method " + method +
". This exception is ignored.", e);
+ LOG.trace("Error invoking getter method {}. This
exception is ignored.", method, e);
}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index 1e1773a..ceebeaa 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
@@ -121,7 +121,7 @@ public abstract class ScheduledPollConsumer extends
DefaultConsumer
} catch (Error e) {
// must catch Error, to ensure the task is re-scheduled
- LOG.error("Error occurred during running scheduled task on: " +
this.getEndpoint() + ", due: " + e.getMessage(), e);
+ LOG.error("Error occurred during running scheduled task on: {},
due: {}", this.getEndpoint(), e.getMessage(), e);
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/TimerListenerManager.java
b/core/camel-support/src/main/java/org/apache/camel/support/TimerListenerManager.java
index ce221b4..56b62a6 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/TimerListenerManager.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/TimerListenerManager.java
@@ -97,8 +97,8 @@ public class TimerListenerManager extends ServiceSupport
implements Runnable, Ca
listener.onTimer();
} catch (Throwable e) {
// ignore
- LOG.debug("Error occurred during onTimer for TimerListener: "
+ listener + ". This exception will be ignored.",
- e);
+ LOG.debug("Error occurred during onTimer for TimerListener:
{}. This exception will be ignored.",
+ listener, e);
}
}
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
index 4b3718c..fd2194e 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
@@ -53,17 +53,15 @@ public final class UnitOfWorkHelper {
try {
uow.done(exchange);
} catch (Throwable e) {
- LOG.warn("Exception occurred during done UnitOfWork for Exchange:
" + exchange
- + ". This exception will be ignored.",
- e);
+ LOG.warn("Exception occurred during done UnitOfWork for Exchange:
{}. This exception will be ignored.",
+ exchange, e);
}
// stop
try {
uow.stop();
} catch (Throwable e) {
- LOG.warn("Exception occurred during stopping UnitOfWork for
Exchange: " + exchange
- + ". This exception will be ignored.",
- e);
+ LOG.warn("Exception occurred during stopping UnitOfWork for
Exchange: {}. This exception will be ignored.",
+ exchange, e);
}
// MUST clear and set uow to null on exchange after done
ExtendedExchange ee = (ExtendedExchange) exchange;
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
index e489551..0c050eb 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ObjectHelper.java
@@ -289,11 +289,9 @@ public final class ObjectHelper {
try {
return System.getProperty(name, defaultValue);
} catch (Exception e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Caught security exception accessing system
property: " + name + ". Will use default value: "
- + defaultValue,
- e);
- }
+ LOG.debug("Caught security exception accessing system property:
{}. Will use default value: {}",
+ name, defaultValue, e);
+
return defaultValue;
}
}
@@ -476,7 +474,7 @@ public final class ObjectHelper {
return loader.loadClass(name);
} catch (ClassNotFoundException e) {
if (LOG.isTraceEnabled()) {
- LOG.trace("Cannot load class: " + name + " using classloader:
" + loader, e);
+ LOG.trace("Cannot load class: {} using classloader: {}", name,
loader, e);
}
}
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
index 06b877b..17682a2 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavaSourceApiMethodGeneratorMojo.java
@@ -74,7 +74,7 @@ public class JavaSourceApiMethodGeneratorMojo extends
AbstractApiMethodGenerator
&& (classPatterns == null ||
!classPatterns.matcher(aClass.getSimpleName()).matches());
aClass = aClass.getSuperclass()) {
- log.debug("Processing " + aClass.getName());
+ log.debug("Processing {}", aClass.getName());
String sourcePath = aClass.getName();
String nestedClass = null;
int pos = sourcePath.indexOf('$');
@@ -85,10 +85,10 @@ public class JavaSourceApiMethodGeneratorMojo extends
AbstractApiMethodGenerator
sourcePath = sourcePath.replace('.', '/') + ".java";
// read source java text for class
- log.debug("Loading source: " + sourcePath);
+ log.debug("Loading source: {}", sourcePath);
try (InputStream inputStream =
getProjectClassLoader().getResourceAsStream(sourcePath)) {
if (inputStream == null) {
- log.debug("Java source not found on classpath for " +
aClass.getName());
+ log.debug("Java source not found on classpath for {}",
aClass.getName());
break;
}
