You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2018/09/09 18:21:46 UTC
[camel] branch master updated: Remove unnecessary object array
creation when logging with placeholders.
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher 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 726bd10 Remove unnecessary object array creation when logging with placeholders.
726bd10 is described below
commit 726bd103a6749409a33a61a724305fe85a344bc8
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Sun Sep 9 20:15:37 2018 +0200
Remove unnecessary object array creation when logging with placeholders.
---
.../camel/dataformat/bindy/BindyCsvFactory.java | 8 +++----
.../dataformat/bindy/BindyFixedLengthFactory.java | 6 ++---
.../dataformat/bindy/BindyKeyValuePairFactory.java | 10 ++++-----
.../apache/camel/core/osgi/OsgiClassResolver.java | 4 ++--
.../apache/camel/core/osgi/OsgiNamingHelper.java | 2 +-
.../component/couchdb/CouchDbChangesetTracker.java | 2 +-
.../camel/converter/crypto/PGPDataFormatUtil.java | 8 +++----
.../camel/component/file/remote/FtpConsumer.java | 2 +-
.../camel/component/file/remote/FtpOperations.java | 2 +-
.../camel/component/file/remote/SftpConsumer.java | 2 +-
.../component/file/remote/SftpOperations.java | 2 +-
.../apache/camel/component/hdfs/HdfsConsumer.java | 8 +++----
.../apache/camel/component/hdfs/HdfsProducer.java | 8 +++----
.../apache/camel/component/hdfs2/HdfsConsumer.java | 8 +++----
.../apache/camel/component/hdfs2/HdfsProducer.java | 8 +++----
.../org/apache/camel/http/common/CamelServlet.java | 2 +-
.../apache/camel/component/http4/HttpEndpoint.java | 2 +-
.../camel/component/jetty/JettyHttpComponent.java | 2 +-
.../component/jms/EndpointMessageListener.java | 4 ++--
...RequestReplyExclusiveReplyToConcurrentTest.java | 2 +-
.../apache/camel/component/jolt/JoltEndpoint.java | 2 +-
.../camel/component/jt400/Jt400PgmProducer.java | 2 +-
.../apache/camel/component/mail/MailConsumer.java | 2 +-
.../apache/camel/component/mina/MinaComponent.java | 2 +-
.../apache/camel/component/mina/MinaProducer.java | 2 +-
.../camel/component/mina2/Mina2Consumer.java | 4 ++--
.../camel/component/mina2/Mina2Producer.java | 2 +-
.../apache/camel/component/mvel/MvelEndpoint.java | 2 +-
.../apache/camel/component/netty/NettyHelper.java | 4 ++--
.../SingleUDPNettyServerBootstrapFactory.java | 2 +-
.../netty/handlers/ClientChannelHandler.java | 2 +-
.../netty/handlers/ServerChannelHandler.java | 2 +-
.../apache/camel/component/netty4/NettyHelper.java | 4 ++--
.../SingleUDPNettyServerBootstrapFactory.java | 2 +-
.../netty4/handlers/ClientChannelHandler.java | 2 +-
.../netty4/handlers/ServerChannelHandler.java | 2 +-
.../camel/component/pgevent/PgEventConsumer.java | 2 +-
.../routepolicy/quartz/ScheduledRoutePolicy.java | 2 +-
.../routepolicy/quartz2/ScheduledRoutePolicy.java | 2 +-
.../camel/component/sparkrest/SparkConsumer.java | 2 +-
.../spring/handler/CamelNamespaceHandler.java | 2 +-
.../camel/spring/spi/TransactionErrorHandler.java | 26 +++++++++++-----------
.../camel/component/stream/StreamProducer.java | 2 +-
.../apache/camel/swagger/RestSwaggerProcessor.java | 2 +-
.../camel/swagger/servlet/RestSwaggerServlet.java | 2 +-
.../camel/test/spring/CamelAnnotationsHandler.java | 2 +-
.../test/spring/CamelSpringTestContextLoader.java | 2 +-
.../camel/component/velocity/VelocityEndpoint.java | 2 +-
.../component/websocket/WebsocketComponent.java | 4 ++--
.../component/xmpp/XmppPrivateChatProducer.java | 2 +-
50 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
index 171630c..3ee17bf 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
@@ -223,7 +223,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
field.setAccessible(true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Pos: {}, Data: {}, Field type: {}", new Object[]{pos, data, field.getType()});
+ LOG.debug("Pos: {}, Data: {}, Field type: {}", pos, data, field.getType());
}
// Create format object to format the field
@@ -418,14 +418,14 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
v.add(l.get(idx));
index.put(ii, idx);
if (LOG.isDebugEnabled()) {
- LOG.debug("Value: {}, pos: {}, at: {}", new Object[]{l.get(idx), ii, idx});
+ LOG.debug("Value: {}, pos: {}, at: {}", l.get(idx), ii, idx);
}
} else {
v.add(l.get(0));
index.put(ii, 0);
++idxSize;
if (LOG.isDebugEnabled()) {
- LOG.debug("Value: {}, pos: {}, at index: {}", new Object[]{l.get(0), ii, 0});
+ LOG.debug("Value: {}, pos: {}, at index: {}", l.get(0), ii, 0);
}
}
}
@@ -486,7 +486,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Value to be formatted: {}, position: {}, and its formatted value: {}", new Object[]{value, datafield.pos(), result});
+ LOG.debug("Value to be formatted: {}, position: {}, and its formatted value: {}", value, datafield.pos(), result);
}
} else {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index d80f862..3ef2047 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -114,7 +114,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
if (dataField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Position defined in the class: {}, position: {}, Field: {}", new Object[]{cl.getName(), dataField.pos(), dataField});
+ LOG.debug("Position defined in the class: {}, position: {}, Field: {}", cl.getName(), dataField.pos(), dataField);
}
if (dataField.required()) {
@@ -250,7 +250,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
field.setAccessible(true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Pos/Offset: {}, Data: {}, Field type: {}", new Object[]{offset, token, field.getType()});
+ LOG.debug("Pos/Offset: {}, Data: {}, Field type: {}", offset, token, field.getType());
}
// Create format object to format the field
@@ -507,7 +507,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Value to be formatted: {}, position: {}, and its formatted value: {}", new Object[]{value, datafield.pos(), result});
+ LOG.debug("Value to be formatted: {}, position: {}, and its formatted value: {}", value, datafield.pos(), result);
}
} else {
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
index e03e39a..e8626ab 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
@@ -93,7 +93,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
KeyValuePairField keyValuePairField = field.getAnnotation(KeyValuePairField.class);
if (keyValuePairField != null) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Key declared in the class : {}, key : {}, Field : {}", new Object[]{cl.getName(), keyValuePairField.tag(), keyValuePairField});
+ LOG.debug("Key declared in the class : {}, key : {}, Field : {}", cl.getName(), keyValuePairField.tag(), keyValuePairField);
}
keyValuePairFields.put(keyValuePairField.tag(), keyValuePairField);
annotatedFields.put(keyValuePairField.tag(), field);
@@ -445,7 +445,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
field.setAccessible(true);
if (LOG.isDebugEnabled()) {
- LOG.debug("Tag: {}, Field type: {}, class: {}", new Object[]{keyValuePairField.tag(), field.getType(), field.getDeclaringClass().getName()});
+ LOG.debug("Tag: {}, Field type: {}, class: {}", keyValuePairField.tag(), field.getType(), field.getDeclaringClass().getName());
}
// Create format
@@ -493,7 +493,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
String value = keyValuePairField.tag() + this.getKeyValuePairSeparator() + valueFormatted;
if (LOG.isDebugEnabled()) {
- LOG.debug("Value to be formatted: {}, for the tag: {}, and its formatted value: {}", new Object[]{keyValue, keyValuePairField.tag(), valueFormatted});
+ LOG.debug("Value to be formatted: {}, for the tag: {}, and its formatted value: {}", keyValue, keyValuePairField.tag(), valueFormatted);
}
// Add the content to the TreeMap according to the
@@ -525,7 +525,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
builder.append(value);
if (LOG.isDebugEnabled()) {
- LOG.debug("Value added: {}{}{}{}", new Object[]{keyValuePairField.tag(), this.getKeyValuePairSeparator(), valueFormatted, separator});
+ LOG.debug("Value added: {}{}{}{}", keyValuePairField.tag(), this.getKeyValuePairSeparator(), valueFormatted, separator);
}
}
}
@@ -542,7 +542,7 @@ public class BindyKeyValuePairFactory extends BindyAbstractFactory implements Bi
String value = positions.get(posit.next());
if (LOG.isDebugEnabled()) {
- LOG.debug("Value added at the position ({}) : {}{}", new Object[]{posit, value, separator});
+ LOG.debug("Value added at the position ({}) : {}{}", posit, value, separator);
}
builder.append(value + separator);
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
index cae621c..e4165bc 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiClassResolver.java
@@ -57,14 +57,14 @@ public class OsgiClassResolver extends DefaultClassResolver {
if (clazz == null) {
clazz = doLoadClass(name, bundleContext.getBundle());
if (LOG.isTraceEnabled()) {
- LOG.trace("Loading class {} using BundleContext {} -> {}", new Object[]{name, bundleContext.getBundle(), clazz});
+ LOG.trace("Loading class {} using BundleContext {} -> {}", name, bundleContext.getBundle(), clazz);
}
}
if (clazz == null && camelContext != null) {
// fallback and load class using the application context classloader
clazz = super.loadClass(name, camelContext.getApplicationContextClassLoader());
if (LOG.isTraceEnabled()) {
- LOG.trace("Loading class {} using CamelContext {} -> {}", new Object[]{name, camelContext, clazz});
+ LOG.trace("Loading class {} using CamelContext {} -> {}", name, camelContext, clazz);
}
}
return clazz;
diff --git a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
index ee1532f..c728403 100644
--- a/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
+++ b/components/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiNamingHelper.java
@@ -79,7 +79,7 @@ public final class OsgiNamingHelper {
}
} while (clash);
- LOG.debug("Generated free name for bundle id: {}, clash: {} -> {}", new Object[]{context.getBundle().getBundleId(), clash, candidate});
+ LOG.debug("Generated free name for bundle id: {}, clash: {} -> {}", context.getBundle().getBundleId(), clash, candidate);
return candidate;
}
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 fcc7c51..6857aa7 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
@@ -68,7 +68,7 @@ public class CouchDbChangesetTracker implements Runnable {
Exchange exchange = endpoint.createExchange(seq, feed.getId(), doc, feed.isDeleted());
if (LOG.isTraceEnabled()) {
- LOG.trace("Created exchange [exchange={}, _id={}, seq={}", new Object[]{exchange, feed.getId(), seq});
+ LOG.trace("Created exchange [exchange={}, _id={}, seq={}", exchange, feed.getId(), seq);
}
try {
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
index 822ca4d..1fa1727 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
@@ -218,8 +218,8 @@ public final class PGPDataFormatUtil {
useridParts);
continue;
}
- LOG.debug("User ID {} found in primary key with key ID {} containing one of the parts {}", new Object[] {
- foundKeyUserIdForUserIdPart[0], primaryKey.getKeyID(), useridParts });
+ LOG.debug("User ID {} found in primary key with key ID {} containing one of the parts {}",
+ foundKeyUserIdForUserIdPart[0], primaryKey.getKeyID(), useridParts);
// add adequate keys to the result
for (Iterator<PGPPublicKey> keyIter = keyRing.getPublicKeys(); keyIter.hasNext();) {
PGPPublicKey key = keyIter.next();
@@ -418,8 +418,8 @@ public final class PGPDataFormatUtil {
useridParts);
continue;
}
- LOG.debug("User ID {} found in primary key with key ID {} containing one of the parts {}", new Object[] {
- foundKeyUserIdForUserIdPart[0], primaryKey.getKeyID(), useridParts });
+ LOG.debug("User ID {} found in primary key with key ID {} containing one of the parts {}",
+ foundKeyUserIdForUserIdPart[0], primaryKey.getKeyID(), useridParts);
// add all signing keys
for (Iterator<PGPSecretKey> iterKey = keyring.getSecretKeys(); iterKey.hasNext();) {
PGPSecretKey secKey = iterKey.next();
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
index efaab4d..a9f7935 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
@@ -173,7 +173,7 @@ public class FtpConsumer extends RemoteFileConsumer<FTPFile> {
for (FTPFile file : files) {
if (log.isTraceEnabled()) {
- log.trace("FtpFile[name={}, dir={}, file={}]", new Object[]{file.getName(), file.isDirectory(), file.isFile()});
+ log.trace("FtpFile[name={}, dir={}, file={}]", file.getName(), file.isDirectory(), file.isFile());
}
// check if we can continue polling in files
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 646c398..b3ca32a 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
@@ -184,7 +184,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
boolean login;
if (username != null) {
if (account != null) {
- log.trace("Attempting to login user: {} using password: ******** and account: {}", new Object[]{username, account});
+ log.trace("Attempting to login user: {} using password: ******** and account: {}", username, account);
login = client.login(username, configuration.getPassword(), account);
} else {
log.trace("Attempting to login user: {} using password: ********", username);
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
index 77caa3f..8b2fb33 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConsumer.java
@@ -160,7 +160,7 @@ public class SftpConsumer extends RemoteFileConsumer<SftpRemoteFile> {
for (SftpRemoteFile file : files) {
if (log.isTraceEnabled()) {
- log.trace("SftpFile[fileName={}, longName={}, dir={}]", new Object[]{file.getFilename(), file.getLongname(), file.isDirectory()});
+ log.trace("SftpFile[fileName={}, longName={}, dir={}]", file.getFilename(), file.getLongname(), file.isDirectory());
}
// check if we can continue polling in files
diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index c3b181e..265bac8 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -593,7 +593,7 @@ public class SftpOperations implements RemoteFileOperations<SftpRemoteFile> {
char separatorChar = '/';
path = FileUtil.compactPath(path, separatorChar);
if (LOG.isTraceEnabled()) {
- LOG.trace("Compacted path: {} -> {} using separator: {}", new Object[]{before, path, separatorChar});
+ LOG.trace("Compacted path: {} -> {} using separator: {}", before, path, separatorChar);
}
// not stepwise should change directory in one operation
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
index dbd9012..ac15bff 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsConsumer.java
@@ -70,10 +70,10 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
private HdfsInfo setupHdfs(boolean onStartup) throws Exception {
// if we are starting up then log at info level, and if runtime then log at debug level to not flood the log
if (onStartup) {
- log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), hdfsPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), hdfsPath.toString());
}
}
@@ -81,10 +81,10 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
HdfsInfo answer = HdfsInfoFactory.newHdfsInfo(this.hdfsPath.toString());
if (onStartup) {
- log.info("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.info("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), hdfsPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.debug("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), hdfsPath.toString());
}
}
return answer;
diff --git a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
index 4f29e1b..f22cdfd 100644
--- a/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
+++ b/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsProducer.java
@@ -133,20 +133,20 @@ public class HdfsProducer extends DefaultProducer {
// if we are starting up then log at info level, and if runtime then log at debug level to not flood the log
if (onStartup) {
- log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), actualPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), actualPath.toString());
}
}
HdfsOutputStream answer = HdfsOutputStream.createOutputStream(actualPath.toString(), config);
if (onStartup) {
- log.info("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.info("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), actualPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.debug("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), actualPath.toString());
}
}
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
index b536b5a..2236e62 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsConsumer.java
@@ -69,10 +69,10 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
private HdfsInfo setupHdfs(boolean onStartup) throws Exception {
// if we are starting up then log at info level, and if runtime then log at debug level to not flood the log
if (onStartup) {
- log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), hdfsPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), hdfsPath.toString());
}
}
@@ -80,10 +80,10 @@ public final class HdfsConsumer extends ScheduledPollConsumer {
HdfsInfo answer = HdfsInfoFactory.newHdfsInfo(this.hdfsPath.toString());
if (onStartup) {
- log.info("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.info("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), hdfsPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), hdfsPath.toString()});
+ log.debug("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), hdfsPath.toString());
}
}
return answer;
diff --git a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java
index fa457ba..778b7f9 100644
--- a/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java
+++ b/components/camel-hdfs2/src/main/java/org/apache/camel/component/hdfs2/HdfsProducer.java
@@ -133,20 +133,20 @@ public class HdfsProducer extends DefaultProducer {
// if we are starting up then log at info level, and if runtime then log at debug level to not flood the log
if (onStartup) {
- log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.info("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), actualPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.debug("Connecting to hdfs file-system {}:{}/{} (may take a while if connection is not available)", config.getHostName(), config.getPort(), actualPath.toString());
}
}
HdfsOutputStream answer = HdfsOutputStream.createOutputStream(actualPath.toString(), config);
if (onStartup) {
- log.info("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.info("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), actualPath.toString());
} else {
if (log.isDebugEnabled()) {
- log.debug("Connected to hdfs file-system {}:{}/{}", new Object[]{config.getHostName(), config.getPort(), actualPath.toString()});
+ log.debug("Connected to hdfs file-system {}:{}/{}", config.getHostName(), config.getPort(), actualPath.toString());
}
}
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
index 166cb2e..2b12a62 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/CamelServlet.java
@@ -67,7 +67,7 @@ public class CamelServlet extends HttpServlet {
final String asyncParam = config.getInitParameter(ASYNC_PARAM);
this.async = asyncParam == null ? false : ObjectHelper.toBoolean(asyncParam);
- log.trace("servlet '{}' initialized with: async={}", new Object[]{servletName, async});
+ log.trace("servlet '{}' initialized with: async={}", servletName, async);
}
@Override
diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
index 3c8f875..effcc93 100644
--- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
+++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpEndpoint.java
@@ -189,7 +189,7 @@ public class HttpEndpoint extends HttpCommonEndpoint {
if (scheme == null) {
scheme = HttpHelper.isSecureConnection(getEndpointUri()) ? "https" : "http";
}
- LOG.debug("CamelContext properties http.proxyHost, http.proxyPort, and http.proxyScheme detected. Using http proxy host: {} port: {} scheme: {}", new Object[]{host, port, scheme});
+ LOG.debug("CamelContext properties http.proxyHost, http.proxyPort, and http.proxyScheme detected. Using http proxy host: {} port: {} scheme: {}", host, port, scheme);
HttpHost proxy = new HttpHost(host, port, scheme);
clientBuilder.setProxy(proxy);
}
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 1030f27..e9489ac 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -759,7 +759,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent implements
if (LOG.isDebugEnabled()) {
if (minThreads != null) {
- LOG.debug("Created HttpClient with thread pool {}-{} -> {}", new Object[]{minThreads, maxThreads, httpClient});
+ LOG.debug("Created HttpClient with thread pool {}-{} -> {}", minThreads, maxThreads, httpClient);
} else {
LOG.debug("Created HttpClient with default thread pool size -> {}", httpClient);
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
index e8c0dae..4d753a9 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
@@ -374,7 +374,7 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
reply.setJMSCorrelationID(correlationID);
if (LOG.isDebugEnabled()) {
- LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", new Object[]{endpoint, correlationID, reply});
+ LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
}
return reply;
}
@@ -394,7 +394,7 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
reply.setJMSCorrelationID(correlationID);
if (LOG.isDebugEnabled()) {
- LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", new Object[]{endpoint, correlationID, reply});
+ LOG.debug("{} sending reply JMS message [correlationId:{}]: {}", endpoint, correlationID, reply);
}
return reply;
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java
index 652685a..04eeafb 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToConcurrentTest.java
@@ -48,7 +48,7 @@ public class JmsRequestReplyExclusiveReplyToConcurrentTest extends CamelTestSupp
@Override
public void run() {
String reply = template.requestBody("direct:start", "" + num, String.class);
- log.info("Sent {} expecting reply 'Hello {}' got --> {}", new Object[]{num, num, reply});
+ log.info("Sent {} expecting reply 'Hello {}' got --> {}", num, num, reply);
assertNotNull(reply);
assertEquals("Hello " + num, reply);
latch.countDown();
diff --git a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
index 018890c..0188471 100644
--- a/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
+++ b/components/camel-jolt/src/main/java/org/apache/camel/component/jolt/JoltEndpoint.java
@@ -80,7 +80,7 @@ public class JoltEndpoint extends ResourceEndpoint {
if (transform == null) {
if (log.isDebugEnabled()) {
String path = getResourceUri();
- log.debug("Jolt content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()});
+ log.debug("Jolt content read from resource {} with resourceUri: {} for endpoint {}", getResourceUri(), path, getEndpointUri());
}
// Sortr does not require a spec
diff --git a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
index bffb5b2..558e6e4 100644
--- a/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
+++ b/components/camel-jt400/src/main/java/org/apache/camel/component/jt400/Jt400PgmProducer.java
@@ -72,7 +72,7 @@ public class Jt400PgmProducer extends DefaultProducer {
boolean result = pgmCall.run();
if (LOG.isTraceEnabled()) {
- LOG.trace("Executed PGM '{}' in host '{}'. Success? {}", new Object[]{commandStr, iSeries.getSystemName(), result});
+ LOG.trace("Executed PGM '{}' in host '{}'. Success? {}", commandStr, iSeries.getSystemName(), result);
}
if (result) {
diff --git a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
index fe13271..406ecc4 100644
--- a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
+++ b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
@@ -343,7 +343,7 @@ public class MailConsumer extends ScheduledBatchPollingConsumer {
Message message = holder.getValue();
if (LOG.isTraceEnabled()) {
- LOG.trace("Mail #{} is of type: {} - {}", new Object[]{i, ObjectHelper.classCanonicalName(message), message});
+ LOG.trace("Mail #{} is of type: {} - {}", i, ObjectHelper.classCanonicalName(message), message);
}
if (!message.getFlags().contains(Flags.Flag.DELETED)) {
diff --git a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
index 1fd7ce4..b11ebd0 100644
--- a/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
+++ b/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
@@ -336,7 +336,7 @@ public class MinaComponent extends UriEndpointComponent {
codecFactory = new MinaUdpProtocolCodecFactory(getCamelContext());
if (LOG.isDebugEnabled()) {
- LOG.debug("{}: Using CodecFactory: {}", new Object[]{type, codecFactory});
+ LOG.debug("{}: Using CodecFactory: {}", type, codecFactory);
}
}
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 c0d0c86..34d5ab7 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
@@ -213,7 +213,7 @@ public class MinaProducer extends DefaultProducer implements ServicePoolAware {
SocketAddress address = getEndpoint().getAddress();
connector = getEndpoint().getConnector();
if (LOG.isDebugEnabled()) {
- LOG.debug("Creating connector to address: {} using connector: {} timeout: {} millis.", new Object[]{address, connector, timeout});
+ LOG.debug("Creating connector to address: {} using connector: {} timeout: {} millis.", address, connector, timeout);
}
IoHandler ioHandler = new ResponseHandler(getEndpoint());
// connect and wait until the connection is established
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
index 7e375f0..884f4e8 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
+++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Consumer.java
@@ -102,7 +102,7 @@ public class Mina2Consumer extends DefaultConsumer {
ConnectFuture future = connector.connect(address);
future.awaitUninterruptibly();
session = future.getSession();
- LOG.info("Connected to server address: {} using connector: {} timeout: {} millis.", new Object[]{address, connector, configuration.getTimeout()});
+ LOG.info("Connected to server address: {} using connector: {} timeout: {} millis.", address, connector, configuration.getTimeout());
} else {
acceptor.setHandler(new ReceiveHandler());
acceptor.bind(address);
@@ -300,7 +300,7 @@ public class Mina2Consumer extends DefaultConsumer {
codecFactory = new Mina2UdpProtocolCodecFactory(this.getEndpoint().getCamelContext());
if (LOG.isDebugEnabled()) {
- LOG.debug("{}: Using CodecFactory: {}", new Object[]{type, codecFactory});
+ LOG.debug("{}: Using CodecFactory: {}", type, codecFactory);
}
}
diff --git a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
index 4fde49b..7874fcb 100644
--- a/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
+++ b/components/camel-mina2/src/main/java/org/apache/camel/component/mina2/Mina2Producer.java
@@ -408,7 +408,7 @@ public class Mina2Producer extends DefaultProducer implements ServicePoolAware {
codecFactory = new Mina2UdpProtocolCodecFactory(this.getEndpoint().getCamelContext());
if (LOG.isDebugEnabled()) {
- LOG.debug("{}: Using CodecFactory: {}", new Object[]{type, codecFactory});
+ LOG.debug("{}: Using CodecFactory: {}", type, codecFactory);
}
}
diff --git a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
index 1d1e6e5..c82973c 100644
--- a/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
+++ b/components/camel-mvel/src/main/java/org/apache/camel/component/mvel/MvelEndpoint.java
@@ -105,7 +105,7 @@ public class MvelEndpoint extends ResourceEndpoint {
compiled = TemplateCompiler.compileTemplate(content, mvelContext);
} else {
if (log.isDebugEnabled()) {
- log.debug("Mvel content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()});
+ log.debug("Mvel content read from resource {} with resourceUri: {} for endpoint {}", getResourceUri(), path, getEndpointUri());
}
// getResourceAsInputStream also considers the content cache
Reader reader = getEncoding() != null ? new InputStreamReader(getResourceAsInputStream(), getEncoding()) : new InputStreamReader(getResourceAsInputStream());
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java
index ecb6dba..d484724 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyHelper.java
@@ -88,12 +88,12 @@ public final class NettyHelper {
ChannelFuture future;
if (remoteAddress != null) {
if (log.isDebugEnabled()) {
- log.debug("Channel: {} remote address: {} writing body: {}", new Object[]{channel, remoteAddress, body});
+ log.debug("Channel: {} remote address: {} writing body: {}", channel, remoteAddress, body);
}
future = channel.write(body, remoteAddress);
} else {
if (log.isDebugEnabled()) {
- log.debug("Channel: {} writing body: {}", new Object[]{channel, body});
+ log.debug("Channel: {} writing body: {}", channel, body);
}
future = channel.write(body);
}
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/SingleUDPNettyServerBootstrapFactory.java
index 7a2567e..144fa1c 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/SingleUDPNettyServerBootstrapFactory.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/SingleUDPNettyServerBootstrapFactory.java
@@ -169,7 +169,7 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme
String networkInterface = configuration.getNetworkInterface() == null ? LOOPBACK_INTERFACE : configuration.getNetworkInterface();
multicastNetworkInterface = NetworkInterface.getByName(networkInterface);
ObjectHelper.notNull(multicastNetworkInterface, "No network interface found for '" + networkInterface + "'.");
- LOG.info("ConnectionlessBootstrap joining {}:{} using network interface: {}", new Object[]{configuration.getHost(), configuration.getPort(), multicastNetworkInterface.getName()});
+ LOG.info("ConnectionlessBootstrap joining {}:{} using network interface: {}", configuration.getHost(), configuration.getPort(), multicastNetworkInterface.getName());
datagramChannel.joinGroup(hostAddress, multicastNetworkInterface).syncUninterruptibly();
allChannels.add(datagramChannel);
} else {
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
index 638d8eb..9fbfbb1 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ClientChannelHandler.java
@@ -217,7 +217,7 @@ public class ClientChannelHandler extends SimpleChannelUpstreamHandler {
protected Message getResponseMessage(Exchange exchange, MessageEvent messageEvent) throws Exception {
Object body = messageEvent.getMessage();
if (LOG.isDebugEnabled()) {
- LOG.debug("Channel: {} received body: {}", new Object[]{messageEvent.getChannel(), body});
+ LOG.debug("Channel: {} received body: {}", messageEvent.getChannel(), body);
}
// if textline enabled then covert to a String which must be used for textline
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java
index afab4c9..cc7fa01 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/handlers/ServerChannelHandler.java
@@ -86,7 +86,7 @@ public class ServerChannelHandler extends SimpleChannelUpstreamHandler {
public void messageReceived(final ChannelHandlerContext ctx, final MessageEvent messageEvent) throws Exception {
Object in = messageEvent.getMessage();
if (LOG.isDebugEnabled()) {
- LOG.debug("Channel: {} received body: {}", new Object[]{messageEvent.getChannel(), in});
+ LOG.debug("Channel: {} received body: {}", messageEvent.getChannel(), in);
}
// create Exchange and let the consumer process it
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
index c31e28f..fbfce7a 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/NettyHelper.java
@@ -91,7 +91,7 @@ public final class NettyHelper {
ChannelFuture future;
if (remoteAddress != null) {
if (log.isDebugEnabled()) {
- log.debug("Channel: {} remote address: {} writing body: {}", new Object[]{channel, remoteAddress, body});
+ log.debug("Channel: {} remote address: {} writing body: {}", channel, remoteAddress, body);
}
// Need to create AddressedEnvelope to setup the address information here
DefaultAddressedEnvelope<Object, InetSocketAddress> ae =
@@ -99,7 +99,7 @@ public final class NettyHelper {
future = channel.writeAndFlush(ae);
} else {
if (log.isDebugEnabled()) {
- log.debug("Channel: {} writing body: {}", new Object[]{channel, body});
+ log.debug("Channel: {} writing body: {}", channel, body);
}
// In netty4 we need to call channel flush to send out the message
future = channel.writeAndFlush(body);
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
index adba145..6107c18 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/SingleUDPNettyServerBootstrapFactory.java
@@ -172,7 +172,7 @@ public class SingleUDPNettyServerBootstrapFactory extends ServiceSupport impleme
String networkInterface = configuration.getNetworkInterface() == null ? LOOPBACK_INTERFACE : configuration.getNetworkInterface();
multicastNetworkInterface = NetworkInterface.getByName(networkInterface);
ObjectHelper.notNull(multicastNetworkInterface, "No network interface found for '" + networkInterface + "'.");
- LOG.info("ConnectionlessBootstrap joining {}:{} using network interface: {}", new Object[]{configuration.getHost(), configuration.getPort(), multicastNetworkInterface.getName()});
+ LOG.info("ConnectionlessBootstrap joining {}:{} using network interface: {}", configuration.getHost(), configuration.getPort(), multicastNetworkInterface.getName());
datagramChannel.joinGroup(hostAddress, multicastNetworkInterface).syncUninterruptibly();
allChannels.add(datagramChannel);
} else {
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
index f81fc1c..04efd38 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ClientChannelHandler.java
@@ -233,7 +233,7 @@ public class ClientChannelHandler extends SimpleChannelInboundHandler<Object> {
Object body = message;
if (LOG.isDebugEnabled()) {
- LOG.debug("Channel: {} received body: {}", new Object[]{ctx.channel(), body});
+ LOG.debug("Channel: {} received body: {}", ctx.channel(), body);
}
// if textline enabled then covert to a String which must be used for textline
diff --git a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
index 6fcb276..f7f6850 100644
--- a/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
+++ b/components/camel-netty4/src/main/java/org/apache/camel/component/netty4/handlers/ServerChannelHandler.java
@@ -84,7 +84,7 @@ public class ServerChannelHandler extends SimpleChannelInboundHandler<Object> {
protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
Object in = msg;
if (LOG.isDebugEnabled()) {
- LOG.debug("Channel: {} received body: {}", new Object[]{ctx.channel(), in});
+ LOG.debug("Channel: {} received body: {}", ctx.channel(), in);
}
// create Exchange and let the consumer process it
diff --git a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
index 92ad1ee..b3ddb2a 100644
--- a/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
+++ b/components/camel-pgevent/src/main/java/org/apache/camel/component/pgevent/PgEventConsumer.java
@@ -54,7 +54,7 @@ public class PgEventConsumer extends DefaultConsumer implements PGNotificationLi
public void notification(int processId, String channel, String payload) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Notification processId: {}, channel: {}, payload: {}", new Object[]{processId, channel, payload});
+ LOG.debug("Notification processId: {}, channel: {}, payload: {}", processId, channel, payload);
}
Exchange exchange = endpoint.createExchange();
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
index c7f5108..7cd81df 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/ScheduledRoutePolicy.java
@@ -114,7 +114,7 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
getScheduler().scheduleJob(jobDetail, trigger);
if (LOG.isInfoEnabled()) {
- LOG.info("Scheduled trigger: {} for action: {} on route {}", new Object[]{trigger.getFullName(), action, route.getId()});
+ LOG.info("Scheduled trigger: {} for action: {} on route {}", trigger.getFullName(), action, route.getId());
}
}
diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java b/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
index 75345a6..60701ec 100644
--- a/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
+++ b/components/camel-quartz2/src/main/java/org/apache/camel/routepolicy/quartz2/ScheduledRoutePolicy.java
@@ -128,7 +128,7 @@ public abstract class ScheduledRoutePolicy extends RoutePolicySupport implements
getScheduler().scheduleJob(jobDetail, trigger);
if (LOG.isInfoEnabled()) {
- LOG.info("Scheduled trigger: {} for action: {} on route {}", new Object[]{trigger.getKey(), action, route.getId()});
+ LOG.info("Scheduled trigger: {} for action: {} on route {}", trigger.getKey(), action, route.getId());
}
}
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
index 1505c7e..e9d1169 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
@@ -53,7 +53,7 @@ public class SparkConsumer extends DefaultConsumer {
boolean matchOnUriPrefix = getEndpoint().getSparkConfiguration().isMatchOnUriPrefix();
if (accept != null) {
- log.debug("Spark-rest: {}({}) accepting: {}", new Object[]{verb, path, accept});
+ log.debug("Spark-rest: {}({}) accepting: {}", verb, path, accept);
} else {
log.debug("Spark-rest: {}({})", verb, path);
}
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
index 44f9717..d8ebd10 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
@@ -677,7 +677,7 @@ public class CamelNamespaceHandler extends NamespaceHandlerSupport {
autoRegisterMap.put(id, definition);
parserContext.registerComponent(new BeanComponentDefinition(definition, id));
if (LOG.isDebugEnabled()) {
- LOG.debug("Registered default: {} with id: {} on camel context: {}", new Object[]{definition.getBeanClassName(), id, contextId});
+ LOG.debug("Registered default: {} with id: {} on camel context: {}", definition.getBeanClassName(), id, contextId);
}
} else {
// ups we have already registered it before with same id, but on another camel context
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 653ea84..5d3bf78 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
@@ -248,7 +248,7 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler {
*/
private void logTransactionBegin(String redelivered, String ids) {
if (log.isDebugEnabled()) {
- log.debug("Transaction begin ({}) redelivered({}) for {})", new Object[]{transactionKey, redelivered, ids});
+ log.debug("Transaction begin ({}) redelivered({}) for {})", transactionKey, redelivered, ids);
}
}
@@ -260,14 +260,14 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler {
// okay its a redelivered message so log at INFO level if rollbackLoggingLevel is INFO or higher
// this allows people to know that the redelivered message was committed this time
if (rollbackLoggingLevel == LoggingLevel.INFO || rollbackLoggingLevel == LoggingLevel.WARN || rollbackLoggingLevel == LoggingLevel.ERROR) {
- log.info("Transaction commit ({}) redelivered({}) for {})", new Object[]{transactionKey, redelivered, ids});
+ log.info("Transaction commit ({}) redelivered({}) for {})", transactionKey, redelivered, ids);
// return after we have logged
return;
}
}
// log non redelivered by default at DEBUG level
- log.debug("Transaction commit ({}) redelivered({}) for {})", new Object[]{transactionKey, redelivered, ids});
+ log.debug("Transaction commit ({}) redelivered({}) for {})", transactionKey, redelivered, ids);
}
/**
@@ -278,33 +278,33 @@ public class TransactionErrorHandler extends RedeliveryErrorHandler {
return;
} else if (rollbackLoggingLevel == LoggingLevel.ERROR && log.isErrorEnabled()) {
if (rollbackOnly) {
- log.error("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", new Object[]{transactionKey, redelivered, ids});
+ log.error("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", transactionKey, redelivered, ids);
} else {
- log.error("Transaction rollback ({}) redelivered({}) for {} caught: {}", new Object[]{transactionKey, redelivered, ids, e.getMessage()});
+ log.error("Transaction rollback ({}) redelivered({}) for {} caught: {}", transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.WARN && log.isWarnEnabled()) {
if (rollbackOnly) {
- log.warn("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", new Object[]{transactionKey, redelivered, ids});
+ log.warn("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", transactionKey, redelivered, ids);
} else {
- log.warn("Transaction rollback ({}) redelivered({}) for {} caught: {}", new Object[]{transactionKey, redelivered, ids, e.getMessage()});
+ log.warn("Transaction rollback ({}) redelivered({}) for {} caught: {}", transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.INFO && log.isInfoEnabled()) {
if (rollbackOnly) {
- log.info("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", new Object[]{transactionKey, redelivered, ids});
+ log.info("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", transactionKey, redelivered, ids);
} else {
- log.info("Transaction rollback ({}) redelivered({}) for {} caught: {}", new Object[]{transactionKey, redelivered, ids, e.getMessage()});
+ log.info("Transaction rollback ({}) redelivered({}) for {} caught: {}", transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.DEBUG && log.isDebugEnabled()) {
if (rollbackOnly) {
- log.debug("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", new Object[]{transactionKey, redelivered, ids});
+ log.debug("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", transactionKey, redelivered, ids);
} else {
- log.debug("Transaction rollback ({}) redelivered({}) for {} caught: {}", new Object[]{transactionKey, redelivered, ids, e.getMessage()});
+ log.debug("Transaction rollback ({}) redelivered({}) for {} caught: {}", transactionKey, redelivered, ids, e.getMessage());
}
} else if (rollbackLoggingLevel == LoggingLevel.TRACE && log.isTraceEnabled()) {
if (rollbackOnly) {
- log.trace("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", new Object[]{transactionKey, redelivered, ids});
+ log.trace("Transaction rollback ({}) redelivered({}) for {} due exchange was marked for rollbackOnly", transactionKey, redelivered, ids);
} else {
- log.trace("Transaction rollback ({}) redelivered({}) for {} caught: {}", new Object[]{transactionKey, redelivered, ids, e.getMessage()});
+ log.trace("Transaction rollback ({}) redelivered({}) for {} caught: {}", transactionKey, redelivered, ids, e.getMessage());
}
}
}
diff --git a/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java b/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
index 2362e6b..72c4860 100644
--- a/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
+++ b/components/camel-stream/src/main/java/org/apache/camel/component/stream/StreamProducer.java
@@ -150,7 +150,7 @@ public class StreamProducer extends DefaultProducer {
Writer writer = new OutputStreamWriter(outputStream, charset);
BufferedWriter bw = IOHelper.buffered(writer);
if (LOG.isDebugEnabled()) {
- LOG.debug("Writing as text: {} to {} using encoding: {}", new Object[]{body, outputStream, charset});
+ LOG.debug("Writing as text: {} to {} using encoding: {}", body, outputStream, charset);
}
bw.write(s);
bw.write(System.lineSeparator());
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
index 229b5bc..5c284d6 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerProcessor.java
@@ -109,7 +109,7 @@ public class RestSwaggerProcessor implements Processor {
match = EndpointHelper.matchPattern(name, contextIdPattern);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Match contextId: {} with pattern: {} -> {}", new Object[]{name, contextIdPattern, match});
+ LOG.debug("Match contextId: {} with pattern: {} -> {}", name, contextIdPattern, match);
}
}
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerServlet.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerServlet.java
index 0a4595a..c784a8e 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerServlet.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/RestSwaggerServlet.java
@@ -201,7 +201,7 @@ public class RestSwaggerServlet extends HttpServlet {
match = EndpointHelper.matchPattern(name, apiContextIdPattern);
}
if (LOG.isDebugEnabled()) {
- LOG.debug("Match contextId: {} with pattern: {} -> {}", new Object[]{name, apiContextIdPattern, match});
+ LOG.debug("Match contextId: {} with pattern: {} -> {}", name, apiContextIdPattern, match);
}
}
}
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
index f4e1991..ba74630 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelAnnotationsHandler.java
@@ -197,7 +197,7 @@ public final class CamelAnnotationsHandler {
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- LOGGER.info("Setting shutdown timeout to [{} {}] on CamelContext with name [{}].", new Object[]{shutdownTimeout, shutdownTimeUnit, contextName});
+ LOGGER.info("Setting shutdown timeout to [{} {}] on CamelContext with name [{}].", shutdownTimeout, shutdownTimeUnit, contextName);
camelContext.getShutdownStrategy().setTimeout(shutdownTimeout);
camelContext.getShutdownStrategy().setTimeUnit(shutdownTimeUnit);
}
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index e28c1ff..6ef1026 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -382,7 +382,7 @@ public class CamelSpringTestContextLoader extends AbstractContextLoader {
@Override
public void execute(String contextName, SpringCamelContext camelContext)
throws Exception {
- LOG.info("Setting shutdown timeout to [{} {}] on CamelContext with name [{}].", new Object[]{shutdownTimeout, shutdownTimeUnit, contextName});
+ LOG.info("Setting shutdown timeout to [{} {}] on CamelContext with name [{}].", shutdownTimeout, shutdownTimeUnit, contextName);
camelContext.getShutdownStrategy().setTimeout(shutdownTimeout);
camelContext.getShutdownStrategy().setTimeUnit(shutdownTimeUnit);
}
diff --git a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
index 7b40f81..51fa1a8 100644
--- a/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
+++ b/components/camel-velocity/src/main/java/org/apache/camel/component/velocity/VelocityEndpoint.java
@@ -192,7 +192,7 @@ public class VelocityEndpoint extends ResourceEndpoint {
exchange.getIn().removeHeader(VelocityConstants.VELOCITY_TEMPLATE);
} else {
if (log.isDebugEnabled()) {
- log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", new Object[]{getResourceUri(), path, getEndpointUri()});
+ log.debug("Velocity content read from resource {} with resourceUri: {} for endpoint {}", getResourceUri(), path, getEndpointUri());
}
reader = getEncoding() != null ? new InputStreamReader(getResourceAsInputStream(), getEncoding()) : new InputStreamReader(getResourceAsInputStream());
}
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 22a08fd..0af7223 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
@@ -778,7 +778,7 @@ public class WebsocketComponent extends UriEndpointComponent implements SSLConte
StringHelper.notEmpty(host, "host", this);
ObjectHelper.notNull(port, "port", this);
- LOG.info("Starting static resources server {}:{} with static resource: {}", new Object[]{host, port, staticResources});
+ LOG.info("Starting static resources server {}:{} with static resource: {}", host, port, staticResources);
ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
staticResourcesServer = createStaticResourcesServer(context, host, port, staticResources);
staticResourcesServer.start();
@@ -812,7 +812,7 @@ public class WebsocketComponent extends UriEndpointComponent implements SSLConte
CONNECTORS.clear();
if (staticResourcesServer != null) {
- LOG.info("Stopping static resources server {}:{} with static resource: {}", new Object[]{host, port, staticResources});
+ LOG.info("Stopping static resources server {}:{} with static resource: {}", host, port, staticResources);
staticResourcesServer.stop();
staticResourcesServer.destroy();
staticResourcesServer = null;
diff --git a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
index 3701f79..b1b30a1 100644
--- a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
+++ b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppPrivateChatProducer.java
@@ -86,7 +86,7 @@ public class XmppPrivateChatProducer extends DefaultProducer {
endpoint.getBinding().populateXmppMessage(message, exchange);
if (LOG.isDebugEnabled()) {
- LOG.debug("Sending XMPP message to {} from {} : {}", new Object[]{participant, endpoint.getUser(), message.getBody()});
+ LOG.debug("Sending XMPP message to {} from {} : {}", participant, endpoint.getUser(), message.getBody());
}
chat.send(message);
} catch (Exception e) {