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 2020/10/13 17:42:15 UTC
[camel] branch master updated: (chore) Cleaned up log messages
(#4437)
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 6d7730f (chore) Cleaned up log messages (#4437)
6d7730f is described below
commit 6d7730fd190b0a0616d8483c42cab92f5223f364
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Oct 13 19:42:00 2020 +0200
(chore) Cleaned up log messages (#4437)
- replaced concatenations with log markers
- removed unnecessary debugging guards
Components: camel-cdi, camel-chatscript, camel-cmis, camel-cometd,
camel-couchdb, camel-crypto-cms, camel-box, camel-cxf, camel-dataset,
camel-disruptor, camel-dns, camel-docker, camel-docker, camel-file,
camel-ftp, camel-google-bigquery, camel-irc
---
.../camel/component/box/api/BoxFilesManager.java | 6 ++--
.../TransactionalJtaTransactionPolicy.java | 9 ++----
.../camel/component/chatscript/ChatScriptBot.java | 2 +-
.../apache/camel/component/cmis/CMISProducer.java | 2 +-
.../camel/component/cometd/CometdComponent.java | 4 +--
.../component/couchdb/CouchDbChangesetTracker.java | 7 ++---
.../crypto/cms/crypt/EnvelopedDataDecryptor.java | 10 +++----
.../apache/camel/component/cxf/CxfEndpoint.java | 4 +--
.../cxf/feature/AbstractDataFormatFeature.java | 6 ++--
.../camel/component/cxf/jaxrs/CxfRsProducer.java | 2 +-
.../camel/component/dataset/DataSetEndpoint.java | 2 +-
.../component/disruptor/DisruptorReference.java | 4 +--
.../camel/component/dns/policy/DnsActivation.java | 4 +--
.../component/dns/policy/DnsActivationPolicy.java | 8 ++---
.../docker/consumer/DockerStatsConsumer.java | 2 +-
.../exec/impl/DefaultExecCommandExecutor.java | 4 +--
.../camel/component/file/GenericFileConsumer.java | 8 ++---
.../camel/component/file/remote/FtpOperations.java | 4 +--
.../component/file/remote/RemoteFileConsumer.java | 8 ++---
.../RemoteFilePollingConsumerPollStrategy.java | 5 ++--
.../component/file/remote/RemoteFileProducer.java | 4 +--
.../FtpChangedExclusiveReadLockStrategy.java | 4 +--
.../SftpChangedExclusiveReadLockStrategy.java | 4 +--
.../bigquery/GoogleBigQueryConnectionFactory.java | 21 ++++++-------
.../apache/camel/component/irc/IrcEndpoint.java | 2 +-
.../org/apache/camel/component/irc/IrcLogger.java | 35 +++++++++++-----------
26 files changed, 78 insertions(+), 93 deletions(-)
diff --git a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java
index 3a9d68e..eac6231 100644
--- a/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java
+++ b/components/camel-box/camel-box-api/src/main/java/org/apache/camel/component/box/api/BoxFilesManager.java
@@ -181,9 +181,9 @@ public class BoxFilesManager {
long elapsed = (end - init) / 1000;
if (elapsed > delayLimit) {
LOG.warn(
- "The upload operation, checks if the file exists by using the Box list folder, however it took "
- + elapsed
- + " seconds to verify, try to reduce the size of the folder items for faster results.");
+ "The upload operation, checks if the file exists by using the Box list folder, however it took {}"
+ + " seconds to verify, try to reduce the size of the folder items for faster results.",
+ elapsed);
}
if (exists) {
boxFile = uploadNewFileVersion(existingFile.getID(), content, modified, size, listener);
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
index e4f6812..680cc3a 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/transaction/TransactionalJtaTransactionPolicy.java
@@ -74,14 +74,11 @@ public abstract class TransactionalJtaTransactionPolicy extends JtaTransactionPo
for (String jndiName : TRANSACTION_MANAGER_JNDI_NAMES) {
try {
tm = InitialContext.doLookup(jndiName);
- if (LOG.isDebugEnabled()) {
- LOG.debug("JTA TransactionManager found at JNDI location [" + jndiName + "]");
- }
+ LOG.debug("JTA TransactionManager found at JNDI location [{}]", jndiName);
+
return tm;
} catch (NamingException ex) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("No JTA TransactionManager found at JNDI location [" + jndiName + "]", ex);
- }
+ LOG.debug("No JTA TransactionManager found at JNDI location [{}]", jndiName, ex);
}
}
LOG.warn("Could not find the transaction manager through any of following locations: {}",
diff --git a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java
index 832732e..782a703 100644
--- a/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java
+++ b/components/camel-chatscript/src/main/java/org/apache/camel/component/chatscript/ChatScriptBot.java
@@ -83,7 +83,7 @@ public class ChatScriptBot {
public String init(ChatScriptMessage input) throws Exception {
ChatScriptMessage g = new ChatScriptMessage(input.getUserName(), this.botName, null);
String response = doMessage(g);
- LOG.info("Conversation started between the bot " + this.botName + " and " + input.getUserName());
+ LOG.info("Conversation started between the bot {} and {}", this.botName, input.getUserName());
initialized = true;
return response;
}
diff --git a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
index e431f15..b0a7f9a 100644
--- a/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
+++ b/components/camel-cmis/src/main/java/org/apache/camel/component/cmis/CMISProducer.java
@@ -290,7 +290,7 @@ public class CMISProducer extends DefaultProducer {
}
try {
- LOG.info("Moving document from " + sourceFolder.getName() + " to " + targetFolder.getName());
+ LOG.info("Moving document from {} to {}", sourceFolder.getName(), targetFolder.getName());
return document.move(sourceFolder, targetFolder);
} catch (Exception e) {
throw new CamelCmisException(
diff --git a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index 614b239..452d46f 100644
--- a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -199,9 +199,7 @@ public class CometdComponent extends DefaultComponent implements SSLContextParam
// pointing to by example classpath:webapp
if (endpoint.getBaseResource() != null) {
String[] resources = endpoint.getBaseResource().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("file")) {
context.setBaseResource(Resource.newResource(resources[1]));
diff --git a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
index 6432ef1..ac84831 100644
--- a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
+++ b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbChangesetTracker.java
@@ -128,11 +128,8 @@ public class CouchDbChangesetTracker implements Runnable {
problems = false;
} catch (Exception e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Failed to get CouchDb server version and/or reset change listener! Attempt: "
- + repeatDbErrorCount,
- e);
- }
+ LOG.debug("Failed to get CouchDb server version and/or reset change listener! Attempt: {}",
+ repeatDbErrorCount, e);
}
}
return true;
diff --git a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
index f68719e..540c65d 100644
--- a/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
+++ b/components/camel-crypto-cms/src/main/java/org/apache/camel/component/crypto/cms/crypt/EnvelopedDataDecryptor.java
@@ -178,8 +178,8 @@ public class EnvelopedDataDecryptor extends CryptoCmsUnmarshaller {
if (certs != null && certs.size() > 0) {
LOG.debug("Certificates in the originator information:");
for (X509CertificateHolder cert : certs) {
- LOG.debug(" subject=" + cert.getSubject() + ", issuer=" + cert.getIssuer() + ", serial number="
- + cert.getSerialNumber());
+ LOG.debug(" subject={}, issuer={}, serial number={}",
+ cert.getSubject(), cert.getIssuer(), cert.getSerialNumber());
}
}
@SuppressWarnings("unchecked")
@@ -192,9 +192,9 @@ public class EnvelopedDataDecryptor extends CryptoCmsUnmarshaller {
@SuppressWarnings("unchecked")
Collection<X509CRLEntryHolder> revokedCerts = crl.getRevokedCertificates();
for (X509CRLEntryHolder revokedCert : revokedCerts) {
- LOG.debug(" Revoked Certificate: issuer=" + revokedCert.getCertificateIssuer()
- + ", serial number=" + revokedCert.getSerialNumber() + ", date="
- + revokedCert.getRevocationDate());
+ LOG.debug(" Revoked Certificate: issuer={}, serial number={}, date={}",
+ revokedCert.getCertificateIssuer(), revokedCert.getSerialNumber(),
+ revokedCert.getRevocationDate());
}
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
index cab6e54..1d1a4cf 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
@@ -639,8 +639,8 @@ public class CxfEndpoint extends DefaultEndpoint implements AsyncEndpoint, Heade
void checkName(Object value, String name) {
if (ObjectHelper.isEmpty(value)) {
- LOG.warn("The " + name + " of " + this.getEndpointUri()
- + " is empty, cxf will try to load the first one in wsdl for you.");
+ LOG.warn("The {} of {} is empty, cxf will try to load the first one in wsdl for you.", name,
+ this.getEndpointUri());
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
index 422f3b0..c535b88 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
@@ -62,10 +62,10 @@ public abstract class AbstractDataFormatFeature extends AbstractFeature {
if (!outside) {
// To support the old API
if (needToBeKept == null) {
- getLogger().info("removing the interceptor " + p);
+ getLogger().info("removing the interceptor {}", p);
interceptors.remove(p);
} else if (!needToBeKept.contains(p.getClass().getName())) {
- getLogger().info("removing the interceptor " + p);
+ getLogger().info("removing the interceptor {}", p);
interceptors.remove(p);
}
}
@@ -78,7 +78,7 @@ public abstract class AbstractDataFormatFeature extends AbstractFeature {
Collection<Class<?>> toBeRemovedInterceptors) {
for (Interceptor<? extends Message> interceptor : interceptors) {
if (toBeRemovedInterceptors.contains(interceptor.getClass())) {
- getLogger().info("removing the interceptor " + interceptor);
+ getLogger().info("removing the interceptor {}", interceptor);
interceptors.remove(interceptor);
}
}
diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
index 85fbf88..b2f815a 100644
--- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
+++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
@@ -279,7 +279,7 @@ public class CxfRsProducer extends DefaultAsyncProducer {
if (maps != null) {
for (Map.Entry<String, String> entry : maps.entrySet()) {
client.matrix(entry.getKey(), entry.getValue());
- LOG.debug("Matrix param " + entry.getKey() + " :: " + entry.getValue());
+ LOG.debug("Matrix param {} :: {}", entry.getKey(), entry.getValue());
}
}
}
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index 5a82272..d6a2e1d 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -300,7 +300,7 @@ public class DataSetEndpoint extends MockEndpoint implements Service {
reporter = createReporter();
}
- log.info(this + " expecting " + getExpectedCount() + " messages");
+ log.info("{} expecting {} messages", this, getExpectedCount());
}
}
diff --git a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
index 7a07956..8378f9d 100644
--- a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
+++ b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorReference.java
@@ -362,13 +362,13 @@ public class DisruptorReference {
}
public synchronized void addEndpoint(final DisruptorEndpoint disruptorEndpoint) {
- LOGGER.debug("Adding Endpoint: " + disruptorEndpoint);
+ LOGGER.debug("Adding Endpoint: {}", disruptorEndpoint);
endpoints.add(disruptorEndpoint);
LOGGER.debug("Endpoint added: {}, new total endpoints {}", disruptorEndpoint, endpoints.size());
}
public synchronized void removeEndpoint(final DisruptorEndpoint disruptorEndpoint) {
- LOGGER.debug("Removing Endpoint: " + disruptorEndpoint);
+ LOGGER.debug("Removing Endpoint: {}", disruptorEndpoint);
if (getEndpointCount() == 1) {
LOGGER.debug("Last Endpoint removed, shutdown disruptor");
//Shutdown our disruptor
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java
index 0f1769b..0dff35b 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivation.java
@@ -98,10 +98,10 @@ public class DnsActivation {
String id = attribute.getID();
String value = (String) attribute.get();
if (resolvesTo.contains(value)) {
- LOG.debug(id + " = " + value + " matched. Identifying as active.");
+ LOG.debug("{} = {} matched. Identifying as active.", id, value);
return true;
}
- LOG.debug(id + " = " + value);
+ LOG.debug("{} = {}", id, value);
if (id.equals("CNAME") && !resolved.contains(value)) {
hostnames.add(value);
}
diff --git a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java
index f101da2..df0e2c8 100644
--- a/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java
+++ b/components/camel-dns/src/main/java/org/apache/camel/component/dns/policy/DnsActivationPolicy.java
@@ -84,13 +84,13 @@ public class DnsActivationPolicy extends RoutePolicySupport {
@Override
public void onExchangeBegin(Route route, Exchange exchange) {
- LOG.debug("onExchange start " + route.getId() + "/" + exchange.getExchangeId());
+ LOG.debug("onExchange start {}/{}", route.getId(), exchange.getExchangeId());
// noop
}
@Override
public void onExchangeDone(Route route, Exchange exchange) {
- LOG.debug("onExchange end " + route.getId() + "/" + exchange.getExchangeId());
+ LOG.debug("onExchange end {}/{}", route.getId(), exchange.getExchangeId());
// noop
}
@@ -169,7 +169,7 @@ public class DnsActivationPolicy extends RoutePolicySupport {
LOG.info("Resuming {}", route.getId());
startConsumer(route.getConsumer());
} else {
- LOG.debug("Nothing to do " + route.getId() + " is " + routeStatus);
+ LOG.debug("Nothing to do {} is {}", route.getId(), routeStatus);
}
}
@@ -191,7 +191,7 @@ public class DnsActivationPolicy extends RoutePolicySupport {
LOG.info("Stopping {}", route.getId());
stopRoute(route);
} else {
- LOG.debug("Nothing to do " + route.getId() + " is " + routeStatus);
+ LOG.debug("Nothing to do {} is {}", route.getId(), routeStatus);
}
}
diff --git a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerStatsConsumer.java b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerStatsConsumer.java
index 6233c7d..b4e29c0 100644
--- a/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerStatsConsumer.java
+++ b/components/camel-docker/src/main/java/org/apache/camel/component/docker/consumer/DockerStatsConsumer.java
@@ -76,7 +76,7 @@ public class DockerStatsConsumer extends DefaultConsumer {
@Override
public void onNext(Statistics statistics) {
- LOGGER.debug("Received Docker Statistics Event: " + statistics);
+ LOGGER.debug("Received Docker Statistics Event: {}", statistics);
final Exchange exchange = getEndpoint().createExchange();
Message message = exchange.getIn();
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 af5860c..570521f 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.toString(), 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.toString(), 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-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 3f88401..db7d261 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -536,11 +536,9 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
// process using the custom processor
processor.process(exchange);
} catch (Exception e) {
- if (LOG.isDebugEnabled()) {
- LOG.debug(endpoint + " error custom processing: " + file + " due to: " + e.getMessage()
- + ". This exception will be ignored.",
- e);
- }
+ LOG.debug("{} error custom processing: {} due to: {}. This exception will be ignored.",
+ endpoint, file, e.getMessage(), e);
+
handleException(e);
} finally {
// always remove file from the in progress list as its no longer in
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index df92e85..1c816f1 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -618,8 +618,8 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
IOHelper.close(os, "retrieve: " + name, log);
boolean deleted = FileUtil.deleteFile(temp);
if (!deleted) {
- log.warn("Error occurred during retrieving file: " + name
- + " to local directory. Cannot delete local work file: " + temp);
+ log.warn("Error occurred during retrieving file: {} to local directory. Cannot delete local work file: {}",
+ temp, name);
}
}
throw new GenericFileOperationFailedException(client.getReplyCode(), client.getReplyString(), e.getMessage(), e);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index 7fb9be7..d428e24 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -184,8 +184,8 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
}
} catch (GenericFileOperationFailedException e) {
// ignore just log a warning
- LOG.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage()
- + ". This exception will be ignored.");
+ LOG.warn("Error occurred while disconnecting from {} due: {} This exception will be ignored.",
+ remoteServer(), e.getMessage());
}
}
@@ -201,8 +201,8 @@ public abstract class RemoteFileConsumer<T> extends GenericFileConsumer<T> {
getOperations().forceDisconnect();
} catch (GenericFileOperationFailedException e) {
// ignore just log a warning
- LOG.warn("Error occurred while disconnecting from " + remoteServer() + " due: " + e.getMessage()
- + ". This exception will be ignored.");
+ LOG.warn("Error occurred while disconnecting from {} due: {} This exception will be ignored.",
+ remoteServer(), e.getMessage());
}
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
index dcb076e..ea77afc 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
@@ -40,9 +40,8 @@ public class RemoteFilePollingConsumerPollStrategy extends DefaultPollingConsume
rfc.forceDisconnect();
} catch (Throwable t) {
// ignore the exception
- log.debug("Error occurred during force disconnecting from: " + rfc.remoteServer()
- + ". This exception will be ignored.",
- t);
+ log.debug("Error occurred during force disconnecting from: {}. This exception will be ignored.",
+ rfc.remoteServer(), t);
}
}
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
index 1e9e113..a239a2f 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileProducer.java
@@ -157,7 +157,7 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
}
} catch (GenericFileOperationFailedException e) {
// ignore just log a warning
- LOG.warn("Exception occurred during disconnecting from: " + getEndpoint() + " " + e.getMessage());
+ LOG.warn("Exception occurred during disconnecting from: {} {}", getEndpoint(), e.getMessage());
}
}
@@ -175,7 +175,7 @@ public class RemoteFileProducer<T> extends GenericFileProducer<T> {
try {
disconnect();
} catch (Exception e) {
- LOG.debug("Exception occurred during disconnecting from: " + getEndpoint() + " " + e.getMessage());
+ LOG.debug("Exception occurred during disconnecting from: {} {}", getEndpoint(), e.getMessage());
}
super.doStop();
}
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
index 1235478..f085576 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/FtpChangedExclusiveReadLockStrategy.java
@@ -123,8 +123,8 @@ public class FtpChangedExclusiveReadLockStrategy implements GenericFileExclusive
}
}
- LOG.trace("Previous last modified: " + lastModified + ", new last modified: " + newLastModified);
- LOG.trace("Previous length: " + length + ", new length: " + newLength);
+ LOG.trace("Previous last modified: {}, new last modified: {}", lastModified, newLastModified);
+ LOG.trace("Previous length: {}, new length: {}", length, newLength);
long newOlderThan = startTime + watch.taken() - minAge;
LOG.trace("New older than threshold: {}", newOlderThan);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
index 1da741e..c3157c4 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
@@ -122,8 +122,8 @@ public class SftpChangedExclusiveReadLockStrategy implements GenericFileExclusiv
}
}
- LOG.trace("Previous last modified: " + lastModified + ", new last modified: " + newLastModified);
- LOG.trace("Previous length: " + length + ", new length: " + newLength);
+ LOG.trace("Previous last modified: {}, new last modified: {}", lastModified, newLastModified);
+ LOG.trace("Previous length: {}, new length: {}", length, newLength);
long newOlderThan = startTime + watch.taken() - minAge;
LOG.trace("New older than threshold: {}", newOlderThan);
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConnectionFactory.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConnectionFactory.java
index 7ed5287..30f710d 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConnectionFactory.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConnectionFactory.java
@@ -82,26 +82,23 @@ public class GoogleBigQueryConnectionFactory {
GoogleCredential credential = null;
if (!Strings.isNullOrEmpty(serviceAccount) && !Strings.isNullOrEmpty(serviceAccountKey)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Service Account and Key have been set explicitly. Initialising BigQuery using Service Account "
- + serviceAccount);
- }
+ logger.debug("Service Account and Key have been set explicitly. Initialising BigQuery using Service Account {}",
+ serviceAccount);
+
credential = createFromAccountKeyPair(httpTransport);
}
if (credential == null && !Strings.isNullOrEmpty(credentialsFileLocation)) {
- if (logger.isDebugEnabled()) {
- logger.debug("Key File Name has been set explicitly. Initialising BigQuery using Key File "
- + credentialsFileLocation);
- }
+ logger.debug("Key File Name has been set explicitly. Initialising BigQuery using Key File {}",
+ credentialsFileLocation);
+
credential = createFromFile();
}
if (credential == null) {
- if (logger.isDebugEnabled()) {
- logger.debug(
- "No explicit Service Account or Key File Name have been provided. Initialising BigQuery using defaults ");
- }
+ logger.debug(
+ "No explicit Service Account or Key File Name have been provided. Initialising BigQuery using defaults");
+
credential = createDefault();
}
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
index 1e47165..32f1f00 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
@@ -181,7 +181,7 @@ public class IrcEndpoint extends DefaultEndpoint {
if (nick.endsWith("----")) {
LOG.error("Unable to set nick: {} disconnecting", nick);
} else {
- LOG.warn("Unable to set nick: " + nick + " Retrying with " + nick + "-");
+ LOG.warn("Unable to set nick: {} Retrying with {} -", nick, nick);
connection.doNick(nick);
// if the nick failure was doing startup channels weren't joined. So join
// the channels now. It's a no-op if the channels are already joined.
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java
index 6589cb8..5b6c567 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcLogger.java
@@ -40,68 +40,67 @@ public class IrcLogger extends IRCEventAdapter {
@Override
public void onError(int num, String msg) {
- log.error("Server: " + server + " - onError num=" + num + " msg=\"" + msg + "\"");
+ log.error("Server: {} - onError num={} msg=\"{}\"", server, num, msg);
}
@Override
public void onError(String msg) {
- log.error("Server: " + server + " - onError msg=\"" + msg + "\"");
+ log.error("Server: {} - onError msg=\"{}\"", server, msg);
}
@Override
public void onInvite(String chan, IRCUser user, String passiveNick) {
- log.debug("Server: " + server + " - onInvite chan=" + chan + " user=" + user + " passiveNick=" + passiveNick);
+ log.debug("Server: {} - onInvite chan={} user={} passiveNick={}", server, chan, user, passiveNick);
}
@Override
public void onJoin(String chan, IRCUser user) {
- log.debug("Server: " + server + " - onJoin chan=" + chan + " user=" + user);
+ log.debug("Server: {} - onJoin chan={} user={}", server, chan, user);
}
@Override
public void onKick(String chan, IRCUser user, String passiveNick, String msg) {
- log.debug("Server: " + server + " - onKick chan=" + chan + " user=" + user + " passiveNick=" + passiveNick + " msg=\""
- + msg + "\"");
+ log.debug("Server: {} - onKick chan={} user={} passiveNick={} msg=\"{}\"", server, chan, user, passiveNick, msg);
}
@Override
public void onMode(String chan, IRCUser user, IRCModeParser ircModeParser) {
- log.info("Server: " + server + " - onMode chan=" + chan + " user=" + user + " ircModeParser=" + ircModeParser);
+ log.info("Server: {} - onMode chan={} user={} ircModeParser={}", server, chan, user, ircModeParser);
}
@Override
public void onMode(IRCUser user, String passiveNick, String mode) {
- log.info("Server: " + server + " - onMode user=" + user + " passiveNick=" + passiveNick + " mode=" + mode);
+ log.info("Server: {} - onMode user={} passiveNick={} mode={}", server, user, passiveNick, mode);
}
@Override
public void onNick(IRCUser user, String newNick) {
- log.debug("Server: " + server + " - onNick user=" + user + " newNick=" + newNick);
+ log.debug("Server: {} - onNick user={} newNick={}", server, user, newNick);
}
@Override
public void onNotice(String target, IRCUser user, String msg) {
- log.debug("Server: " + server + " - onNotice target=" + target + " user=" + user + " msg=\"" + msg + "\"");
+ log.debug("Server: {} - onNotice target={} user={} msg=\"{}\"", server, target, user, msg);
}
@Override
public void onPart(String chan, IRCUser user, String msg) {
- log.debug("Server: " + server + " - onPart chan=" + chan + " user=" + user + " msg=\"" + msg + "\"");
+ log.debug("Server: {} - onPart chan={} user={} msg=\"{}\"", server, chan, user, msg);
}
@Override
public void onPing(String ping) {
- log.info("Server: " + server + " - onPing ping=" + ping);
+ log.info("Server: {} - onPing ping={}", server, ping);
}
@Override
public void onPrivmsg(String target, IRCUser user, String msg) {
- log.debug("Server: " + server + " - onPrivmsg target=" + target + " user=" + user + " msg=\"" + msg + "\"");
+ log.debug("Server: {} - onPrivmsg target={} user={} msg=\"{}\"", server, target, user, msg);
}
@Override
public void onQuit(IRCUser user, String msg) {
- log.debug("Server: " + server + " - onQuit user=" + user + " msg=\"" + msg + "\"");
+ log.debug("Server: {} - onQuit user={} msg=\"{}\"", server, user, msg);
}
@Override
@@ -111,17 +110,17 @@ public class IrcLogger extends IRCEventAdapter {
@Override
public void onReply(int num, String value, String msg) {
- log.debug("Server: " + server + " - onReply num=" + num + " value=\"" + value + "\" msg=\"" + msg + "\"");
+ log.debug("Server: {} - onReply num={} value=\"{}\" msg=\"{}\"", server, num, value, msg);
}
@Override
public void onTopic(String chan, IRCUser user, String topic) {
- log.debug("Server: " + server + " - onTopic chan=" + chan + " user=" + user + " topic=" + topic);
+ log.debug("Server: {} - onTopic chan={} user={} topic={}", server, chan, user, topic);
}
@Override
public void unknown(String prefix, String command, String middle, String trailing) {
- log.info("Server: " + server + " - unknown prefix=" + prefix + " command=" + command + " middle=" + middle
- + " trailing=" + trailing);
+ log.info("Server: {} - unknown prefix={} command={} middle={} trailing={}", server, prefix, command,
+ middle, trailing);
}
}