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 2019/12/20 10:19:22 UTC
[camel] branch master updated: Align the number of placeholders and
the number arguments of log messages.
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 f9aac4f Align the number of placeholders and the number arguments of log messages.
f9aac4f is described below
commit f9aac4fd5faba50716c6b364ec61aaf7aaf17a01
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Fri Dec 20 11:19:06 2019 +0100
Align the number of placeholders and the number arguments of log messages.
---
.../java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java | 2 +-
.../main/java/org/apache/camel/blueprint/BlueprintCamelContext.java | 2 +-
.../org/apache/camel/blueprint/handler/CamelNamespaceHandler.java | 6 +++---
.../java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java | 4 ++--
.../org/apache/camel/component/cxf/transport/CamelDestination.java | 2 +-
.../org/apache/camel/component/cxf/transport/CamelOutputStream.java | 2 +-
.../src/main/java/org/apache/camel/component/file/GenericFile.java | 2 +-
.../java/org/apache/camel/component/file/remote/FtpOperations.java | 2 +-
.../camel/processor/idempotent/kafka/KafkaIdempotentRepository.java | 2 +-
.../java/org/apache/camel/component/mllp/MllpTcpClientProducer.java | 2 +-
.../org/apache/camel/component/mllp/internal/MllpSocketBuffer.java | 2 +-
.../src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java | 2 +-
.../org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java | 2 +-
.../src/main/java/org/apache/camel/commands/RouteStepCommand.java | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
index b08b067..6084ca2 100644
--- a/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
+++ b/components/camel-atmos/src/main/java/org/apache/camel/component/atmos/core/AtmosAPIFacade.java
@@ -262,7 +262,7 @@ public final class AtmosAPIFacade {
}
if (content != null) {
resultEntries.put(path, baos);
- LOG.debug("Downloaded path: {} size:", path, baos.size());
+ LOG.debug("Downloaded path: {} size: {}", path, baos.size());
}
}
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
index f14bffb..e1d34b9 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/BlueprintCamelContext.java
@@ -173,7 +173,7 @@ public class BlueprintCamelContext extends DefaultCamelContext implements Servic
break;
}
- log.debug("Received BlueprintEvent[replay={} type={} bundle={}] %s", event.isReplay(), eventTypeString, event.getBundle().getSymbolicName(), event);
+ log.debug("Received BlueprintEvent[replay={} type={} bundle={}] {}", event.isReplay(), eventTypeString, event.getBundle().getSymbolicName(), event);
}
if (!event.isReplay() && this.getBundleContext().getBundle().getBundleId() == event.getBundle().getBundleId()) {
diff --git a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
index c2e7076..f4c8173 100644
--- a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
+++ b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
@@ -389,7 +389,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
// lets inject the namespaces into any namespace aware POJOs
injectNamespaces(element, binder);
- LOG.trace("Parsing RouteContext done, returning {}", element, ctx);
+ LOG.trace("Parsing RouteContext {} done, returning {}", element, ctx);
return ctx;
}
@@ -430,7 +430,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
// lets inject the namespaces into any namespace aware POJOs
injectNamespaces(element, binder);
- LOG.trace("Parsing RestContext done, returning {}", element, ctx);
+ LOG.trace("Parsing RestContext {} done, returning {}", element, ctx);
return ctx;
}
@@ -471,7 +471,7 @@ public class CamelNamespaceHandler implements NamespaceHandler {
// must be lazy as we want CamelContext to be activated first
ctx.setActivation(ACTIVATION_LAZY);
- LOG.trace("Parsing endpoint done, returning {}", element, ctx);
+ LOG.trace("Parsing endpoint {} done, returning {}", element, ctx);
return ctx;
}
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 a861b9c..bb4b307 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
@@ -390,14 +390,14 @@ public final class PGPDataFormatUtil {
for (String userid : allowedUserIds) {
if (keyUserId != null && keyUserId.contains(userid)) {
LOG.debug(
- "Public key with user ID {} fulfills the User ID restriction.",
+ "Public key with User ID {} fulfills the User ID restriction {}.",
keyUserId, allowedUserIds);
return true;
}
}
}
LOG.warn(
- "Public key with User ID {} does not fulfill the User ID restriction.",
+ "Public key with User ID {} does not fulfill the User ID restriction {}.",
keyUserId, allowedUserIds);
return false;
}
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
index 70110ae..24de04e 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -152,7 +152,7 @@ public class CamelDestination extends AbstractDestination implements Configurabl
}
protected void incoming(org.apache.camel.Exchange camelExchange) {
- LOG.debug("server received request: ", camelExchange);
+ LOG.debug("server received request: {}", camelExchange);
DefaultCxfMessageMapper beanBinding = new DefaultCxfMessageMapper();
org.apache.cxf.message.Message inMessage =
beanBinding.createCxfMessageFromCamelExchange(camelExchange, headerFilterStrategy);
diff --git a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
index b8ddd26..35e3fd0 100644
--- a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
+++ b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelOutputStream.java
@@ -96,7 +96,7 @@ class CamelOutputStream extends CachedOutputStream {
// TODO support different encoding
exchange.getIn().setBody(outputStream.getInputStream());
- LOG.debug("template sending request: ", exchange.getIn());
+ LOG.debug("template sending request: {}", exchange.getIn());
if (outMessage.getExchange().isSynchronous()) {
syncInvoke(exchange);
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
index de7b3cf..63f1e96 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
@@ -218,7 +218,7 @@ public class GenericFile<T> implements WrappedFile<T> {
String newEndpointPath = FileUtil.normalizePath(endpointPath.endsWith("" + File.separatorChar) ? endpointPath : endpointPath + File.separatorChar);
LOG.trace("Normalized endpointPath: {}", newEndpointPath);
- LOG.trace("Normalized newFileName: ()", newFileName);
+ LOG.trace("Normalized newFileName: {}", newFileName);
File file = new File(newFileName);
if (!absolute) {
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 418d313..255b52a 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
@@ -578,7 +578,7 @@ public class FtpOperations implements RemoteFileOperations<FTPFile> {
log.trace("Error occurred during retrieving file: {} to local directory.", name);
// if we do not attempt to resume download, then attempt to delete the temporary file
if (!resumeDownload) {
- log.trace("Deleting local work file: {}", name, temp);
+ log.trace("Deleting local work file: {}", name);
// failed to retrieve the file so we need to close streams and delete in progress file
// must close stream before deleting file
IOHelper.close(os, "retrieve: " + name, log);
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java b/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
index 0b5173d..d4cf6a6 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaIdempotentRepository.java
@@ -299,7 +299,7 @@ public class KafkaIdempotentRepository extends ServiceSupport implements Idempot
+ "Duplicate records may not be detected.", topic);
}
} catch (InterruptedException e) {
- log.warn("Interrupted while warming up cache. This exception is ignored.", e.getMessage());
+ log.warn("Interrupted while warming up cache. This exception is ignored.", e);
}
}
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index d5ed17b..a382b15 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -381,7 +381,7 @@ public class MllpTcpClientProducer extends DefaultProducer implements Runnable {
void checkConnection() throws IOException {
if (null == socket || socket.isClosed() || !socket.isConnected()) {
if (socket == null) {
- log.debug("checkConnection() - Socket is null - attempting to establish connection", socket);
+ log.debug("checkConnection() - Socket is null - attempting to establish connection");
} else if (socket.isClosed()) {
log.info("checkConnection() - Socket {} is closed - attempting to establish new connection", socket);
} else if (!socket.isConnected()) {
diff --git a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
index c5fab9b..aba576d 100644
--- a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
+++ b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/internal/MllpSocketBuffer.java
@@ -234,7 +234,7 @@ public class MllpSocketBuffer {
}
socketOutputStream.flush();
} catch (IOException ioEx) {
- final String exceptionMessage = String.format("writeTo({}) - IOException encountered", socket);
+ final String exceptionMessage = String.format("writeTo(%s) - IOException encountered", socket);
resetSocket(socket, exceptionMessage);
throw new MllpSocketException(exceptionMessage, ioEx);
}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index 4a0f2fb..fea15c5 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -258,7 +258,7 @@ public class SjmsEndpoint extends DefaultEndpoint implements AsyncEndpoint, Mult
}
try {
- logger.debug("Creating ConnectionResource with connectionCount: {} using ConnectionFactory", getConnectionCount(), getConnectionFactory());
+ logger.debug("Creating ConnectionResource with connectionCount: {} using ConnectionFactory: {}", getConnectionCount(), getConnectionFactory());
// We always use a connection pool, even for a pool of 1
ConnectionFactoryResource connections = new ConnectionFactoryResource(getConnectionCount(), getConnectionFactory(),
getComponent().getConnectionUsername(), getComponent().getConnectionPassword(), getComponent().getConnectionClientId(),
diff --git a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java
index 5be20e3..36a7001 100644
--- a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java
+++ b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/ResourceBasedSSHKeyVerifier.java
@@ -61,7 +61,7 @@ public class ResourceBasedSSHKeyVerifier implements ServerKeyVerifier {
@Override
public boolean verifyServerKey(ClientSession sshClientSession, SocketAddress remoteAddress, PublicKey serverKey) {
- log.debug("Trying to find known_hosts file %s", knownHostsResource);
+ log.debug("Trying to find known_hosts file {}", knownHostsResource);
InputStream knownHostsInputStream = null;
try {
knownHostsInputStream = ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext,
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
index 749b944..7f6256c7 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/RouteStepCommand.java
@@ -67,7 +67,7 @@ public class RouteStepCommand extends AbstractRouteCommand {
long count = route.getExchangesCompleted() + route.getExchangesFailed();
out.println(String.format(OUTPUT_FORMAT, route.getId(), count, route.getLastProcessingTime(), route.getDeltaProcessingTime(),
- route.getMeanProcessingTime(), route.getMinProcessingTime(), route.getMaxProcessingTime(), route.getTotalProcessingTime(), route.getSelfProcessingTime()));
+ route.getMeanProcessingTime(), route.getMinProcessingTime(), route.getMaxProcessingTime(), route.getTotalProcessingTime()));
for (StepStatDump ss : route.getStepStats()) {
count = ss.getExchangesCompleted() + ss.getExchangesFailed();