[camel] branch main updated: fixed number of args in logging strings (#9728)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new ce2f9d9f4f6 fixed number of args in logging strings (#9728)
ce2f9d9f4f6 is described below

commit ce2f9d9f4f63cb9ee6c5f7984c38039f97694d37
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Fri Mar 31 12:13:37 2023 +0300

    fixed number of args in logging strings (#9728)
    
    Co-authored-by: dk2k <dk...@ya.ru>
---
 .../camel/component/caffeine/cache/CaffeineCacheTestSupport.java       | 2 +-
 .../file/consumer/adapters/DefaultDirectoryEntriesResumeAdapter.java   | 2 +-
 .../java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java | 2 +-
 .../apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java
index bb138722734..0d4391890fb 100644
--- a/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java
+++ b/components/camel-caffeine/src/test/java/org/apache/camel/component/caffeine/cache/CaffeineCacheTestSupport.java
@@ -94,7 +94,7 @@ public class CaffeineCacheTestSupport extends CamelTestSupport {
 
         @Override
         public void onRemoval(Object key, Object value, RemovalCause cause) {
-            LOG.info("Key %s was removed (%s)%n", key, cause);
+            LOG.info("Key {} was removed ({})%n", key, cause);
         }
 
     }
diff --git a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultDirectoryEntriesResumeAdapter.java b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultDirectoryEntriesResumeAdapter.java
index 445913a3bdd..dc9f7afdfc5 100644
--- a/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultDirectoryEntriesResumeAdapter.java
+++ b/components/camel-file/src/main/java/org/apache/camel/component/file/consumer/adapters/DefaultDirectoryEntriesResumeAdapter.java
@@ -51,7 +51,7 @@ class DefaultDirectoryEntriesResumeAdapter extends AbstractFileResumeAdapter imp
     }
 
     private boolean processed(ResumeCache<File> cache, File directory, File file) {
-        LOG.trace("Checking if file {} with key {} is cached: {}, {}", file, directory);
+        LOG.trace("Checking if file {} from directory {} is cached", file, directory);
         FileSet cached = cache.get(directory, FileSet.class);
         if (cached == null) {
             LOG.trace("FileSet is not cached, therefore has not been processed yet");
diff --git a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
index d26bb11f8c2..16a1108728a 100644
--- a/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
+++ b/components/camel-mllp/src/test/java/org/apache/camel/test/junit/rule/mllp/MllpServerResource.java
@@ -1054,7 +1054,7 @@ public class MllpServerResource implements BeforeEachCallback, AfterEachCallback
                         instream = clientSocket.getInputStream();
                     } catch (IOException ioEx) {
                         if (clientSocket.isClosed()) {
-                            log.debug("Client socket was closed - ignoring exception", clientSocket);
+                            log.debug("Client socket was closed - ignoring exception");
                             break;
                         } else {
                             throw new MllpJUnitResourceException("Unexpected IOException encounted getting input stream", ioEx);
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
index 311e41ccf8b..e9b6b2b39c3 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/AnalyticsApiIntegrationTest.java
@@ -191,8 +191,7 @@ public class AnalyticsApiIntegrationTest extends AbstractSalesforceTestBase {
         // defaults
         String convertResults = template.requestBody("direct:convertResults", asyncReportResults, String.class);
         assertNotNull(convertResults, "default convertResults");
-        LOG.debug("Default options", convertResults);
-        LOG.debug("{}", convertResults);
+        LOG.debug("Default options {}", convertResults);
 
         // permutations of include details, include headers, include summary
         final boolean[] values = new boolean[NUM_OPTIONS];