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 86ecf2d CAMEL-15431: remove redundant array creation on some log
messages (#4108)
86ecf2d is described below
commit 86ecf2df44a1f9e5ac81562ede3e2ab6295ed64a
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Fri Aug 21 09:22:45 2020 +0200
CAMEL-15431: remove redundant array creation on some log messages (#4108)
---
.../java/org/apache/camel/component/file/remote/FtpOperations.java | 2 +-
.../src/main/java/org/apache/camel/component/irc/IrcComponent.java | 6 ++----
.../org/apache/camel/component/jms/reply/QueueReplyManager.java | 7 +++----
.../org/apache/camel/component/jms/reply/ReplyManagerSupport.java | 5 ++---
.../java/org/apache/camel/component/quartz/QuartzEndpoint.java | 3 +--
.../pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java | 3 +--
.../java/org/apache/camel/spring/spi/TransactionErrorHandler.java | 2 +-
.../main/java/org/apache/camel/component/xmpp/XmppConsumer.java | 2 +-
.../java/org/apache/camel/support/jsse/SSLContextParameters.java | 3 +--
.../camel/support/DefaultScheduledPollConsumerScheduler.java | 6 ++----
.../org/apache/camel/support/builder/xml/XMLConverterHelper.java | 6 +++---
11 files changed, 18 insertions(+), 27 deletions(-)
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 d89a264..6db8633 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
@@ -755,7 +755,7 @@ public class FtpOperations implements
RemoteFileOperations<FTPFile> {
if (log.isDebugEnabled()) {
long time = watch.taken();
log.debug("Took {} ({} millis) to store file: {} and FTP
client returned: {}",
- new Object[] { TimeUtils.printDuration(time), time,
targetName, answer });
+ TimeUtils.printDuration(time), time, targetName,
answer) ;
}
// store client reply information after the operation
diff --git
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
index 1f4ef67..11c94f8 100644
---
a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
+++
b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcComponent.java
@@ -88,9 +88,8 @@ public class IrcComponent extends DefaultComponent implements
SSLContextParamete
if (LOG.isDebugEnabled()) {
LOG.debug("Creating SSL Connection to {} destination(s): {}
nick: {} user: {}",
- new Object[] {
configuration.getHostname(),
configuration.getSpaceSeparatedChannelNames(),
- configuration.getNickname(),
configuration.getUsername() });
+ configuration.getNickname(),
configuration.getUsername());
}
SSLContextParameters sslParams =
configuration.getSslContextParameters();
@@ -114,9 +113,8 @@ public class IrcComponent extends DefaultComponent
implements SSLContextParamete
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Creating Connection to {} destination(s): {} nick:
{} user: {}",
- new Object[] {
configuration.getHostname(),
configuration.getSpaceSeparatedChannelNames(),
- configuration.getNickname(),
configuration.getUsername() });
+ configuration.getNickname(),
configuration.getUsername());
}
conn = new IRCConnection(
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
index d341223..aa81851 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/QueueReplyManager.java
@@ -83,7 +83,7 @@ public class QueueReplyManager extends ReplyManagerSupport {
// log a warn and then ignore the message
log.warn(
"Reply received for unknown correlationID [{}] on reply
destination [{}]. Current correlation map size: {}. The message will be
ignored: {}",
- new Object[] { correlationID, replyTo, correlation.size(),
message });
+ correlationID, replyTo, correlation.size(), message);
}
}
@@ -233,13 +233,12 @@ public class QueueReplyManager extends
ReplyManagerSupport {
// warn if using concurrent consumer with shared reply queue
as that may not work properly
log.warn(
"Using {}-{} concurrent consumer on {} with shared
queue {} may not work properly with all message brokers.",
- new Object[] {
answer.getConcurrentConsumers(),
answer.getMaxConcurrentConsumers(), name,
- endpoint.getReplyTo() });
+ endpoint.getReplyTo());
} else {
// log that we are using concurrent consumers
log.info("Using {}-{} concurrent consumers on {}",
- new Object[] { answer.getConcurrentConsumers(),
answer.getMaxConcurrentConsumers(), name });
+ answer.getConcurrentConsumers(),
answer.getMaxConcurrentConsumers(), name);
}
}
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
index f679005..0598fa6 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
@@ -171,9 +171,8 @@ public abstract class ReplyManagerSupport extends
ServiceSupport implements Repl
log.warn(
"Timeout occurred after {} millis waiting for
reply message with correlationID [{}] on destination {}."
+ " Setting ExchangeTimedOutException on {}
and continue routing.",
- new Object[] {
holder.getRequestTimeout(),
holder.getCorrelationId(), replyTo,
- ExchangeHelper.logIds(exchange) });
+ ExchangeHelper.logIds(exchange));
}
// no response, so lets set a timed out exception
@@ -252,7 +251,7 @@ public abstract class ReplyManagerSupport extends
ServiceSupport implements Repl
if (log.isTraceEnabled()) {
log.trace(
"Early reply with correlationID [{}] has been
matched after {} attempts and can be processed using handler: {}",
- new Object[] { correlationID, counter, answer });
+ correlationID, counter, answer);
}
}
}
diff --git
a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
index 4d7dcd0..3026cce 100644
---
a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzEndpoint.java
@@ -399,9 +399,8 @@ public class QuartzEndpoint extends DefaultEndpoint {
if (LOG.isInfoEnabled()) {
LOG.info("Job {} (triggerType={}, jobClass={}) is scheduled. Next
fire date is {}",
- new Object[] {
trigger.getKey(),
trigger.getClass().getSimpleName(),
- jobDetail.getJobClass().getSimpleName(),
trigger.getNextFireTime() });
+ jobDetail.getJobClass().getSimpleName(),
trigger.getNextFireTime());
}
// Increase camel job count for this endpoint
diff --git
a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
index f39b894..299566f 100644
---
a/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
+++
b/components/camel-quartz/src/main/java/org/apache/camel/pollconsumer/quartz/QuartzScheduledPollConsumerScheduler.java
@@ -255,9 +255,8 @@ public class QuartzScheduledPollConsumerScheduler extends
ServiceSupport
if (LOG.isInfoEnabled()) {
LOG.info("Job {} (triggerType={}, jobClass={}) is scheduled. Next
fire date is {}",
- new Object[] {
trigger.getKey(),
trigger.getClass().getSimpleName(),
- job.getJobClass().getSimpleName(),
trigger.getNextFireTime() });
+ job.getJobClass().getSimpleName(),
trigger.getNextFireTime());
}
}
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 5e46ee5..e10af00 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
@@ -174,7 +174,7 @@ public class TransactionErrorHandler extends
RedeliveryErrorHandler {
} else {
LOG.debug("Transaction rollback ({}) redelivered({}) for
{} "
+ "due exchange was marked for rollbackOnlyLast",
- new Object[] { transactionKey, redelivered, ids });
+ transactionKey, redelivered, ids);
}
}
// remove caused exception due we was marked as rollback only last
diff --git
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
index 38429cc..cac49fd 100644
---
a/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
+++
b/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
@@ -212,7 +212,7 @@ public class XmppConsumer extends DefaultConsumer
implements IncomingChatMessage
public void processMessage(Chat chat, Message message) {
if (LOG.isDebugEnabled()) {
LOG.debug("Received XMPP message for {} from {} : {}",
- new Object[] { endpoint.getUser(),
endpoint.getParticipant(), message.getBody() });
+ endpoint.getUser(), endpoint.getParticipant(),
message.getBody());
}
Exchange exchange = endpoint.createExchange(message);
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
index 7960a8a..931ae96 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/SSLContextParameters.java
@@ -287,9 +287,8 @@ public class SSLContextParameters extends
BaseSSLContextParameters {
LOG.debug(
"SSLContext [{}], initialized from [{}], is using provider
[{}], protocol [{}], key managers {}, trust managers {}, and secure random
[{}].",
- new Object[] {
context, this, context.getProvider(),
context.getProtocol(), keyManagers, trustManagers,
- secureRandom });
+ secureRandom);
context.init(keyManagers, trustManagers, secureRandom);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
index 902f7a8..5137b0a 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultScheduledPollConsumerScheduler.java
@@ -167,9 +167,8 @@ public class DefaultScheduledPollConsumerScheduler extends
ServiceSupport implem
if (isUseFixedDelay()) {
if (LOG.isDebugEnabled()) {
LOG.debug("Scheduling poll (fixed delay) with
initialDelay: {}, delay: {} ({}) for: {}",
- new Object[] {
currentInitialDelay, currentDelay,
getTimeUnit().name().toLowerCase(Locale.ENGLISH),
- consumer.getEndpoint() });
+ consumer.getEndpoint());
}
for (int i = 0; i < concurrentTasks; i++) {
futures.add(scheduledExecutorService.scheduleWithFixedDelay(task,
currentInitialDelay, currentDelay,
@@ -178,9 +177,8 @@ public class DefaultScheduledPollConsumerScheduler extends
ServiceSupport implem
} else {
if (LOG.isDebugEnabled()) {
LOG.debug("Scheduling poll (fixed rate) with initialDelay:
{}, delay: {} ({}) for: {}",
- new Object[] {
currentInitialDelay, currentDelay,
getTimeUnit().name().toLowerCase(Locale.ENGLISH),
- consumer.getEndpoint() });
+ consumer.getEndpoint());
}
for (int i = 0; i < concurrentTasks; i++) {
futures.add(scheduledExecutorService.scheduleAtFixedRate(task,
currentInitialDelay, currentDelay,
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
index 73983e7..1320473 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/support/builder/xml/XMLConverterHelper.java
@@ -126,14 +126,14 @@ public class XMLConverterHelper {
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING,
Boolean.TRUE);
} catch (ParserConfigurationException e) {
LOG.warn("DocumentBuilderFactory doesn't support the feature {}
with value {}, due to {}.",
- new Object[] { XMLConstants.FEATURE_SECURE_PROCESSING,
true, e.getMessage() });
+ XMLConstants.FEATURE_SECURE_PROCESSING, true,
e.getMessage());
}
try {
// Disable the external-general-entities by default
factory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
} catch (ParserConfigurationException e) {
LOG.warn("DocumentBuilderFactory doesn't support the feature {}
with value {}, due to {}.",
- new Object[] {
"http://xml.org/sax/features/external-general-entities";, false, e.getMessage()
});
+ "http://xml.org/sax/features/external-general-entities";,
false, e.getMessage());
}
// setup the SecurityManager by default if it's apache xerces
try {
@@ -145,7 +145,7 @@ public class XMLConverterHelper {
}
} catch (Exception e) {
LOG.warn("DocumentBuilderFactory doesn't support the attribute {},
due to {}.",
- new Object[] {
"http://apache.org/xml/properties/security-manager";, e.getMessage() });
+ "http://apache.org/xml/properties/security-manager";,
e.getMessage());
}
// setup the feature from the system property
setupFeatures(factory);
