You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2023/08/08 16:27:06 UTC

[camel] branch main updated: (chores) Adjusted components S to Z to use log markers (#11048)

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

orpiske 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 4c512cc5d93 (chores) Adjusted components S to Z to use log markers (#11048)
4c512cc5d93 is described below

commit 4c512cc5d93141f000111920f4dc3ce451c27896
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Aug 8 18:27:01 2023 +0200

    (chores) Adjusted components S to Z to use log markers (#11048)
---
 .../internal/streaming/SubscriptionHelper.java         |  2 +-
 .../salesforce/BulkApiBatchIntegrationTest.java        |  2 +-
 .../salesforce/BulkApiQueryIntegrationTest.java        |  4 ++--
 .../salesforce/CompoundTypesIntegrationTest.java       |  2 +-
 .../component/salesforce/HttpProxyIntegrationTest.java |  4 ++--
 .../salesforce/internal/SessionIntegrationTest.java    |  4 ++--
 .../builder/saxon/BeanWithXQueryInjectionTest.java     |  2 +-
 .../builder/saxon/XPathSplitChoicePerformanceTest.java | 18 +++++++++---------
 .../camel-servlet/src/main/docs/servlet-component.adoc |  2 +-
 .../servlet/ServletStreamingGzipChunkedManualTest.java |  2 +-
 .../sjms/consumer/SimpleMessageListenerContainer.java  |  2 +-
 .../camel/component/sjms/it/AsyncJmsInOutIT.java       |  2 +-
 .../component/sjms/it/AsyncJmsInOutTempDestIT.java     |  2 +-
 .../apache/camel/component/sjms/it/SyncJmsInOutIT.java |  2 +-
 .../component/sjms/it/SyncJmsInOutTempDestIT.java      |  2 +-
 .../camel/component/sjms/support/MyAsyncProducer.java  |  6 +++---
 .../component/sjms/support/MyInOutTestConsumer.java    |  2 +-
 .../java/org/apache/camel/component/snmp/TrapTest.java |  2 +-
 .../soap/name/ServiceInterfaceStrategyTest.java        |  8 ++++----
 .../apache/camel/component/event/EventRouteTest.java   |  4 ++--
 .../spring/CustomProcessorWithNamespacesTest.java      |  2 +-
 .../org/apache/camel/spring/EndpointReferenceTest.java |  4 ++--
 .../java/org/apache/camel/spring/InjectedBeanTest.java | 12 ++++++------
 .../camel/spring/bind/ProcessorAsEndpointTest.java     |  4 ++--
 .../spring/config/EndpointUriSetFromSpringTest.java    |  2 +-
 .../camel/spring/config/XmlConfigTestSupport.java      |  2 +-
 .../org/apache/camel/spring/example/MyConsumer.java    |  2 +-
 .../org/apache/camel/spring/example/MyVmConsumer.java  |  2 +-
 .../spring/interceptor/ContainerWideInterceptor.java   |  2 +-
 .../postprocessor/MagicAnnotationPostProcessor.java    |  2 +-
 .../apache/camel/spring/processor/MyAggregator.java    |  2 +-
 .../apache/camel/spring/produce/MyListenerService.java |  2 +-
 .../jdbc/JdbcAggregateLoadAndRecoverTest.java          |  4 ++--
 .../jdbc/JdbcAggregateLoadConcurrentTest.java          |  4 ++--
 .../aggregate/jdbc/JdbcAggregateLoadTest.java          |  4 ++--
 .../jdbc/JdbcAggregateSerializedHeadersTest.java       |  4 ++--
 .../processor/aggregate/jdbc/JdbcGetNotFoundTest.java  |  4 ++--
 .../processor/aggregate/jdbc/JdbcGrowIssueTest.java    |  2 +-
 .../StAXXPathSplitChoicePerformanceManualTest.java     | 18 +++++++++---------
 .../patterns/CreateCamelContextPerTestTrueTest.java    |  2 +-
 .../camel/test/junit5/patterns/DebugJUnit5Test.java    |  2 +-
 .../junit5/patterns/DebugNoLazyTypeConverterTest.java  |  2 +-
 .../apache/camel/test/junit5/patterns/DebugTest.java   |  2 +-
 .../apache/camel/test/patterns/DebugSpringTest.java    |  2 +-
 .../camel/tracing/decorators/RestSpanDecorator.java    |  2 +-
 .../org/apache/camel/component/twilio/AccountIT.java   |  8 ++++----
 .../component/twitter/DirectMessageProducerIT.java     |  2 +-
 .../component/twitter/SearchByExchangeDirectIT.java    |  8 ++++----
 .../camel/component/twitter/UserProducerInOnlyIT.java  |  2 +-
 .../camel/component/twitter/UserProducerInOutIT.java   |  2 +-
 .../component/undertow/UndertowComponentTest.java      |  2 +-
 .../component/undertow/UndertowSharedPortTest.java     |  2 +-
 .../camel/component/vertx/VertxRoutePubSubTest.java    |  2 +-
 .../apache/camel/component/vertx/VertxRouteTest.java   |  2 +-
 .../apache/camel/component/web3j/Web3jEndpoint.java    |  2 +-
 .../component/xmlsecurity/ECDSASignatureTest.java      |  4 ++--
 .../camel/component/xmpp/integration/XmppRouteIT.java  |  8 ++++----
 .../org/apache/camel/language/xpath/XPathBuilder.java  |  5 +++--
 .../camel/component/zendesk/ZendeskTicketIT.java       |  2 +-
 .../component/zookeepermaster/CuratorFactoryBean.java  |  4 ++--
 .../integration/MasterEndpointFailoverIT.java          |  2 +-
 .../zookeeper/integration/ZooKeeperITSupport.java      |  4 ++--
 62 files changed, 113 insertions(+), 112 deletions(-)

diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index b4d1100ac95..57f3ff6298f 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -291,7 +291,7 @@ public class SubscriptionHelper extends ServiceSupport {
                         client.waitFor(waitMs, BayeuxClient.State.CONNECTED);
                     }
                 } catch (Exception e) {
-                    LOG.error("Error handshaking: " + e.getMessage(), e);
+                    LOG.error("Error handshaking: {}", e.getMessage(), e);
                     lastError = e;
                 }
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
index 6d631d49b86..abb9df0a043 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiBatchIntegrationTest.java
@@ -99,7 +99,7 @@ public class BulkApiBatchIntegrationTest extends AbstractBulkApiTestBase {
             // check again
             batchInfo = getBatchInfo(batchInfo);
         }
-        log.info("Batch finished with state " + batchInfo.getState());
+        log.info("Batch finished with state {}", batchInfo.getState());
         assertEquals(BatchStateEnum.COMPLETED, batchInfo.getState(), "Batch did not succeed");
 
         // test getResults
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
index 97e9c655ff9..6a694e8c77c 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/BulkApiQueryIntegrationTest.java
@@ -66,7 +66,7 @@ public class BulkApiQueryIntegrationTest extends AbstractBulkApiTestBase {
             // check again
             batchInfo = getBatchInfo(batchInfo);
         }
-        log.info("Query finished with state " + batchInfo.getState());
+        log.info("Query finished with state {}", batchInfo.getState());
         assertEquals(BatchStateEnum.COMPLETED, batchInfo.getState(), "Query did not succeed");
 
         // test getQueryResultList
@@ -117,7 +117,7 @@ public class BulkApiQueryIntegrationTest extends AbstractBulkApiTestBase {
             // check again
             batchInfo = getBatchInfo(batchInfo);
         }
-        log.info("Query finished with state " + batchInfo.getState());
+        log.info("Query finished with state {}", batchInfo.getState());
         // Because PK chunking is enabled, the original batch is given a state of Not Processed.
         assertEquals(BatchStateEnum.NOT_PROCESSED, batchInfo.getState(), "Query did not succeed");
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java
index 06a6fe02ba8..f7ca827a548 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/CompoundTypesIntegrationTest.java
@@ -74,7 +74,7 @@ public class CompoundTypesIntegrationTest extends AbstractSalesforceTestBase {
                 = template().requestBody("direct:createSObject" + suffix, account, CreateSObjectResult.class);
         assertNotNull(result);
         assertTrue(result.getSuccess(), "Create success");
-        LOG.debug("Create: " + result);
+        LOG.debug("Create: {}", result);
 
         try {
 
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
index 000a817337b..953f65bf010 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/HttpProxyIntegrationTest.java
@@ -113,12 +113,12 @@ public class HttpProxyIntegrationTest extends AbstractSalesforceTestBase {
                 // validate proxy-authentication header
                 final String header = request.getHeader(PROXY_AUTHORIZATION.toString());
                 if (!authenticationString.equals(header)) {
-                    LOG.warn("Missing header " + PROXY_AUTHORIZATION);
+                    LOG.warn("Missing header {}", PROXY_AUTHORIZATION);
                     // ask for authentication header
                     response.setHeader(PROXY_AUTHENTICATE.toString(), String.format("Basic realm=\"%s\"", HTTP_PROXY_REALM));
                     return false;
                 }
-                LOG.info("Request contains required header " + PROXY_AUTHORIZATION);
+                LOG.info("Request contains required header {}", PROXY_AUTHORIZATION);
                 WENT_THROUGH_PROXY.set(true);
                 return true;
             }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
index 900f2a8cf37..020e4e87080 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/SessionIntegrationTest.java
@@ -53,14 +53,14 @@ public class SessionIntegrationTest implements SalesforceSession.SalesforceSessi
         httpClient.start();
         try {
             String loginToken = session.login(session.getAccessToken());
-            LOG.info("First token " + loginToken);
+            LOG.info("First token {}", loginToken);
 
             assertTrue(onLoginTriggered, "SalesforceSessionListener onLogin NOT called");
             onLoginTriggered = false;
 
             // refresh token, also causes logout
             loginToken = session.login(loginToken);
-            LOG.info("Refreshed token " + loginToken);
+            LOG.info("Refreshed token {}", loginToken);
 
             assertTrue(onLogoutTriggered, "SalesforceSessionListener onLogout NOT called");
             assertTrue(onLoginTriggered, "SalesforceSessionListener onLogin NOT called");
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
index b4e54545445..ceffd6f7720 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
@@ -66,7 +66,7 @@ public class BeanWithXQueryInjectionTest extends CamelTestSupport {
         public void read(String body, @XQuery("/foo/@id") String foo) {
             this.foo = foo;
             this.body = body;
-            LOG.info("read() method called on " + this);
+            LOG.info("read() method called on {}", this);
         }
     }
 }
diff --git a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java
index 2f2038658e6..0a092daa62d 100644
--- a/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java
+++ b/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathSplitChoicePerformanceTest.java
@@ -69,12 +69,12 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
         NotifyBuilder notify = new NotifyBuilder(context).whenDone(size).create();
 
         boolean matches = notify.matches(60, TimeUnit.SECONDS);
-        LOG.info("Processed file with " + size + " elements in: " + TimeUtils.printDuration(watch.taken(), true));
+        LOG.info("Processed file with {} elements in: {}", size, TimeUtils.printDuration(watch.taken(), true));
 
-        LOG.info("Processed " + tiny.get() + " tiny messages");
-        LOG.info("Processed " + small.get() + " small messages");
-        LOG.info("Processed " + med.get() + " medium messages");
-        LOG.info("Processed " + large.get() + " large messages");
+        LOG.info("Processed {} tiny messages", tiny.get());
+        LOG.info("Processed {} small messages", small.get());
+        LOG.info("Processed {} medium messages", med.get());
+        LOG.info("Processed {} large messages", large.get());
 
         assertEquals((size / 10) * 4, tiny.get());
         assertEquals((size / 10) * 2, small.get());
@@ -106,7 +106,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
 
                                 int num = tiny.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " tiny messages");
+                                    log.info("Processed {} tiny messages", num);
                                     log.debug(xml);
                                 }
                             }
@@ -119,7 +119,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
 
                                 int num = small.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " small messages");
+                                    log.info("Processed {} small messages", num);
                                     log.debug(xml);
                                 }
                             }
@@ -132,7 +132,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
 
                                 int num = med.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " medium messages");
+                                    log.info("Processed {} medium messages", num);
                                     log.debug(xml);
                                 }
                             }
@@ -145,7 +145,7 @@ public class XPathSplitChoicePerformanceTest extends CamelTestSupport {
 
                                 int num = large.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " large messages");
+                                    log.info("Processed {} large messages", num);
                                     log.debug(xml);
                                 }
                             }
diff --git a/components/camel-servlet/src/main/docs/servlet-component.adoc b/components/camel-servlet/src/main/docs/servlet-component.adoc
index e9e9995624e..e4437e55711 100644
--- a/components/camel-servlet/src/main/docs/servlet-component.adoc
+++ b/components/camel-servlet/src/main/docs/servlet-component.adoc
@@ -412,7 +412,7 @@ public final class ServletActivator implements BundleActivator, BundleContextAwa
         try {
             registerServlet(bc);
         } catch (Exception e) {
-            LOG.error("Cannot register the servlet, the reason is " + e);
+            LOG.error("Cannot register the servlet, the reason is {}", e);
         }
     }
 
diff --git a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletStreamingGzipChunkedManualTest.java b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletStreamingGzipChunkedManualTest.java
index dc82c47d756..72895337e54 100644
--- a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletStreamingGzipChunkedManualTest.java
+++ b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletStreamingGzipChunkedManualTest.java
@@ -72,7 +72,7 @@ public class ServletStreamingGzipChunkedManualTest extends ServletCamelRouterTes
                     }
                 }
 
-                LOG.info(">>>> Payload size: " + len);
+                LOG.info(">>>> Payload size: {}", len);
                 LOG.info(">>>> writing EOL <<<<");
                 pos.flush();
 
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
index 49b492d5d59..0a931703378 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/SimpleMessageListenerContainer.java
@@ -198,7 +198,7 @@ public class SimpleMessageListenerContainer extends ServiceSupport
             return false;
         } catch (Exception e) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug("Failed to recover JMS Connection. Will try again in " + task.getCurrentDelay() + " millis", e);
+                LOG.debug("Failed to recover JMS Connection. Will try again in {} millis", task.getCurrentDelay(), e);
             }
             // try again
             return true;
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
index e7bf88b7855..2d9650f8826 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutIT.java
@@ -47,7 +47,7 @@ public class AsyncJmsInOutIT extends JmsTestSupport {
         // just in case we run on slow boxes
         MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
 
-        log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
+        log.info("Took {} ms. to process 100 messages request/reply over JMS", watch.taken());
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
index c38c7f70c9f..1f6f4f902c5 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/AsyncJmsInOutTempDestIT.java
@@ -47,7 +47,7 @@ public class AsyncJmsInOutTempDestIT extends JmsTestSupport {
         // just in case we run on slow boxes
         MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
 
-        log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
+        log.info("Took {} ms. to process 100 messages request/reply over JMS", watch.taken());
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
index 8f106fa2e34..2c7408535f1 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutIT.java
@@ -47,7 +47,7 @@ public class SyncJmsInOutIT extends JmsTestSupport {
         // just in case we run on slow boxes
         MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
 
-        log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
+        log.info("Took {} ms. to process 100 messages request/reply over JMS", watch.taken());
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
index 0d851ab659f..917afea8841 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/it/SyncJmsInOutTempDestIT.java
@@ -47,7 +47,7 @@ public class SyncJmsInOutTempDestIT extends JmsTestSupport {
         // just in case we run on slow boxes
         MockEndpoint.assertIsSatisfied(context, 20, TimeUnit.SECONDS);
 
-        log.info("Took " + watch.taken() + " ms. to process 100 messages request/reply over JMS");
+        log.info("Took {} ms. to process 100 messages request/reply over JMS", watch.taken());
     }
 
     @Override
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncProducer.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncProducer.java
index c28985d2046..94ae9787976 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncProducer.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyAsyncProducer.java
@@ -49,19 +49,19 @@ public class MyAsyncProducer extends DefaultAsyncProducer {
     public boolean process(final Exchange exchange, final AsyncCallback callback) {
         executor.submit(() -> {
 
-            LOG.info("Simulating a task which takes " + getEndpoint().getDelay() + " millis to reply");
+            LOG.info("Simulating a task which takes {} millis to reply", getEndpoint().getDelay());
             Thread.sleep(getEndpoint().getDelay());
 
             int count = counter.incrementAndGet();
             if (getEndpoint().getFailFirstAttempts() >= count) {
-                LOG.info("Simulating a failure at attempt " + count);
+                LOG.info("Simulating a failure at attempt {}", count);
                 exchange.setException(new CamelExchangeException("Simulated error at attempt " + count, exchange));
             } else {
                 String reply = getEndpoint().getReply();
                 exchange.getMessage().setBody(reply);
                 // propagate headers
                 exchange.getMessage().setHeaders(exchange.getIn().getHeaders());
-                LOG.info("Setting reply " + reply);
+                LOG.info("Setting reply {}", reply);
             }
 
             LOG.info("Callback done(false)");
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
index ddab5afaf56..01b7b1a7d25 100644
--- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/MyInOutTestConsumer.java
@@ -105,7 +105,7 @@ public class MyInOutTestConsumer implements MessageListener {
             if (message instanceof TextMessage) {
                 TextMessage textMessage = (TextMessage) message;
                 messageText = textMessage.getText();
-                LOG.info("messageText = " + messageText);
+                LOG.info("messageText = {}", messageText);
             }
         } catch (JMSException e) {
             //Handle the exception appropriately
diff --git a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
index 6e681f2f5bc..fff1a2bc992 100644
--- a/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
+++ b/components/camel-snmp/src/test/java/org/apache/camel/component/snmp/TrapTest.java
@@ -52,7 +52,7 @@ public class TrapTest extends SnmpTestSupport {
         PDU trap = createTrap(version);
 
         // Send it
-        LOG.info("Sending pdu " + trap);
+        LOG.info("Sending pdu {}", trap);
         Endpoint endpoint = context.getEndpoint("direct:snmptrapV" + version);
         Exchange exchange = endpoint.createExchange();
         exchange.getIn().setBody(trap);
diff --git a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
index a1cbf9f5194..5b2e662526e 100644
--- a/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
+++ b/components/camel-soap/src/test/java/org/apache/camel/converter/soap/name/ServiceInterfaceStrategyTest.java
@@ -62,7 +62,7 @@ public class ServiceInterfaceStrategyTest {
             elName = strategy.findQNameForSoapActionOrType("test", Class.class);
             fail();
         } catch (RuntimeCamelException e) {
-            LOG.debug("Caught expected message: " + e.getMessage());
+            LOG.debug("Caught expected message: {}", e.getMessage());
         }
     }
 
@@ -87,7 +87,7 @@ public class ServiceInterfaceStrategyTest {
             elName = strategy.findQNameForSoapActionOrType("test", Class.class);
             fail();
         } catch (RuntimeCamelException e) {
-            LOG.debug("Caught expected message: " + e.getMessage());
+            LOG.debug("Caught expected message: {}", e.getMessage());
         }
     }
 
@@ -103,7 +103,7 @@ public class ServiceInterfaceStrategyTest {
             elName = strategy.findQNameForSoapActionOrType("test", Class.class);
             fail();
         } catch (RuntimeCamelException e) {
-            LOG.debug("Caught expected message: " + e.getMessage());
+            LOG.debug("Caught expected message: {}", e.getMessage());
         }
     }
 
@@ -113,7 +113,7 @@ public class ServiceInterfaceStrategyTest {
             new ServiceInterfaceStrategy(Object.class, true);
             fail("Should throw an exception for a class that is no webservice");
         } catch (IllegalArgumentException e) {
-            LOG.debug("Caught expected message: " + e.getMessage());
+            LOG.debug("Caught expected message: {}", e.getMessage());
         }
     }
 
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/EventRouteTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/EventRouteTest.java
index 92fa58cf705..be7a1777d35 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/EventRouteTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/component/event/EventRouteTest.java
@@ -44,13 +44,13 @@ public class EventRouteTest extends SpringTestSupport {
         // lets test we receive the context refreshed event
         Exchange exchange = result.getReceivedExchanges().get(0);
         Object body = exchange.getIn().getBody(ContextRefreshedEvent.class);
-        log.info("Received body: " + body);
+        log.info("Received body: {}", body);
         assertNotNull(body);
 
         // lets test we receive the camel event
         exchange = result.getReceivedExchanges().get(1);
         body = exchange.getIn().getBody();
-        log.info("Received body: " + body);
+        log.info("Received body: {}", body);
         CamelEvent event = assertIsInstanceOf(CamelEvent.class, body);
         Object actualBody = event.getExchange().getIn().getBody();
         assertEquals(expectedBody, actualBody, "Received event body");
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
index c0a70a2ff0b..4ef83533f17 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/CustomProcessorWithNamespacesTest.java
@@ -69,7 +69,7 @@ public class CustomProcessorWithNamespacesTest extends TestSupport {
         assertNotNull(routes, "Should have some routes defined");
         assertEquals(1, routes.size(), "Number of routes defined");
         Route route = routes.get(0);
-        log.debug("Found route: " + route);
+        log.debug("Found route: {}", route);
     }
 
     protected AbstractXmlApplicationContext createApplicationContext() {
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
index 74b628f55e8..b6b2f52c224 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
@@ -51,7 +51,7 @@ public class EndpointReferenceTest extends SpringTestSupport {
         assertNotNull(dummyBean.getEndpoint(), "The bean should have an endpoint injected");
         assertEquals("direct://start", dummyBean.getEndpoint().getEndpointUri(), "endpoint URI");
 
-        log.debug("Found dummy bean: " + dummyBean);
+        log.debug("Found dummy bean: {}", dummyBean);
 
         MockEndpoint resultEndpoint = getMockEndpoint("mock:end");
         resultEndpoint.expectedBodiesReceived(body);
@@ -71,7 +71,7 @@ public class EndpointReferenceTest extends SpringTestSupport {
     public void testEndpointConfigurationAfterEnsuringThatTheStatementRouteBuilderWasCreated() throws Exception {
         String[] names = applicationContext.getBeanDefinitionNames();
         for (String name : names) {
-            log.debug("Found bean name: " + name);
+            log.debug("Found bean name: {}", name);
         }
 
         testEndpointConfiguration();
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBeanTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
index 8c7ed1a23aa..ee191ff1a5f 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/InjectedBeanTest.java
@@ -28,14 +28,14 @@ public class InjectedBeanTest extends SpringTestSupport {
 
     @Test
     public void testInjectionPoints() throws Exception {
-        log.info("getFieldInjectedEndpoint()         = " + bean.getFieldInjectedEndpoint());
-        log.info("getPropertyInjectedEndpoint()      = " + bean.getPropertyInjectedEndpoint());
+        log.info("getFieldInjectedEndpoint()         = {}", bean.getFieldInjectedEndpoint());
+        log.info("getPropertyInjectedEndpoint()      = {}", bean.getPropertyInjectedEndpoint());
 
-        log.info("getFieldInjectedProducer()         = " + bean.getFieldInjectedProducer());
-        log.info("getPropertyInjectedProducer()      = " + bean.getPropertyInjectedProducer());
+        log.info("getFieldInjectedProducer()         = {}", bean.getFieldInjectedProducer());
+        log.info("getPropertyInjectedProducer()      = {}", bean.getPropertyInjectedProducer());
 
-        log.info("getFieldInjectedCamelTemplate()    = " + bean.getFieldInjectedCamelTemplate());
-        log.info("getPropertyInjectedCamelTemplate() = " + bean.getPropertyInjectedCamelTemplate());
+        log.info("getFieldInjectedCamelTemplate()    = {}", bean.getFieldInjectedCamelTemplate());
+        log.info("getPropertyInjectedCamelTemplate() = {}", bean.getPropertyInjectedCamelTemplate());
 
         assertEndpointUri(bean.getFieldInjectedEndpoint(), "direct://fieldInjectedEndpoint");
         assertEndpointUri(bean.getPropertyInjectedEndpoint(), "direct://namedEndpoint1");
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
index 1c08806321d..e94a814fbc0 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/bind/ProcessorAsEndpointTest.java
@@ -40,7 +40,7 @@ public class ProcessorAsEndpointTest extends SpringTestSupport {
         List<Exchange> list = processor.getExchanges();
         assertEquals(1, list.size(), "Received exchange list: " + list);
 
-        log.debug("Found exchanges: " + list);
+        log.debug("Found exchanges: {}", list);
     }
 
     @Test
@@ -50,7 +50,7 @@ public class ProcessorAsEndpointTest extends SpringTestSupport {
             template.sendBody(uri, body);
             fail("We should have failed as this is a bad endpoint URI");
         } catch (NoSuchEndpointException e) {
-            log.debug("Caught expected exception: " + e, e);
+            log.debug("Caught expected exception: {}", e.getMessage(), e);
         }
     }
 
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
index 33c5e031843..d0ac274aa45 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/EndpointUriSetFromSpringTest.java
@@ -36,7 +36,7 @@ public class EndpointUriSetFromSpringTest extends SpringRunWithTestSupport {
     public void testEndpointCreatedWithCorrectUri() throws Exception {
         assertNotNull(endpoint, "foo");
         assertEquals("foo:bar", endpoint.getEndpointUri(), "foo.getEndpointUri()");
-        log.info("Found endpoint " + endpoint + " with URI: " + endpoint.getEndpointUri());
+        log.info("Found endpoint {} with URI: {}", endpoint, endpoint.getEndpointUri());
     }
 
 }
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
index deb0b4933c4..62c3b87809c 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/config/XmlConfigTestSupport.java
@@ -36,7 +36,7 @@ public class XmlConfigTestSupport extends TestSupport {
         assertNotNull(context, "No context found!");
 
         List<RouteDefinition> routes = ((ModelCamelContext) context).getRouteDefinitions();
-        LOG.debug("Found routes: " + routes);
+        LOG.debug("Found routes: {}", routes);
 
         assertEquals(1, routes.size(), "One Route should be found");
 
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyConsumer.java
index 943678992b6..761cdc93868 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyConsumer.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyConsumer.java
@@ -35,7 +35,7 @@ public class MyConsumer {
     public void doSomething(String body) {
         ObjectHelper.notNull(destination, "destination");
 
-        LOG.info("Received body: " + body);
+        LOG.info("Received body: {}", body);
         destination.sendBody(body);
     }
 
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
index 6f54b0ad588..6e7a840a9c1 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/example/MyVmConsumer.java
@@ -39,7 +39,7 @@ public class MyVmConsumer {
         ObjectHelper.notNull(exchange, "exchange");
         ObjectHelper.notNull(exchange.getContext(), "exchange.getContext");
 
-        LOG.info("Received body: " + body);
+        LOG.info("Received body: {}", body);
         destination.sendBody(body);
     }
 
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
index 3d76121a804..37ae1ae91db 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/interceptor/ContainerWideInterceptor.java
@@ -42,7 +42,7 @@ public class ContainerWideInterceptor implements InterceptStrategy {
             public void process(Exchange exchange) throws Exception {
                 // we just count number of interceptions
                 count++;
-                LOG.info("I am the container wide interceptor. Intercepted total count: " + count);
+                LOG.info("I am the container wide interceptor. Intercepted total count: {}", count);
                 // its important that we delegate to the real target so we let target process the exchange
                 target.process(exchange);
             }
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
index 3d1bcf6b173..da7eedab69c 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/postprocessor/MagicAnnotationPostProcessor.java
@@ -39,7 +39,7 @@ public class MagicAnnotationPostProcessor implements SmartInstantiationAwareBean
             public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException {
                 MagicAnnotation annotation = field.getAnnotation(MagicAnnotation.class);
                 if (annotation != null && field.getType() == String.class) {
-                    log.info("Found MagicAnnotation on field " + field + " of class " + bean.getClass());
+                    log.info("Found MagicAnnotation on field {} of class {}", field, bean.getClass());
 
                     ReflectionUtils.makeAccessible(field);
                     field.set(bean, annotation.value());
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyAggregator.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
index 3d98edde2b9..386da292a8e 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/MyAggregator.java
@@ -42,7 +42,7 @@ public class MyAggregator implements AggregationStrategy {
             if (newBody != null) {
                 body += " " + newBody;
             }
-            LOG.debug("**** invoked my strategy with result: " + body);
+            LOG.debug("**** invoked my strategy with result: {}", body);
 
             newIn.setBody(body);
         }
diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListenerService.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
index 6f054f98eda..820016d5904 100644
--- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
+++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/produce/MyListenerService.java
@@ -29,7 +29,7 @@ public class MyListenerService implements MyListener {
     private static final Logger LOG = LoggerFactory.getLogger(MyListenerService.class);
 
     public MyListenerService() {
-        LOG.debug("Instantiated service: " + this);
+        LOG.debug("Instantiated service: {}", this);
     }
 
     @Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
index 9b2b606098d..d3aa8f02d50 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadAndRecoverTest.java
@@ -42,7 +42,7 @@ public class JdbcAggregateLoadAndRecoverTest extends AbstractJdbcAggregationTest
         mock.expectedMessageCount(SIZE / 10);
         mock.setResultWaitTime(5_000);
 
-        LOG.info("Staring to send " + SIZE + " messages.");
+        LOG.info("Starting to send {} messages.", SIZE);
 
         for (int i = 0; i < SIZE; i++) {
             final int value = 1;
@@ -56,7 +56,7 @@ public class JdbcAggregateLoadAndRecoverTest extends AbstractJdbcAggregationTest
             Thread.sleep(3);
         }
 
-        LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete.");
+        LOG.info("Sending all {} message done. Now waiting for aggregation to complete.", SIZE);
 
         MockEndpoint.assertIsSatisfied(context);
 
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
index a0dc2d6acf5..4ec8a3b279e 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
@@ -40,7 +40,7 @@ public class JdbcAggregateLoadConcurrentTest extends AbstractJdbcAggregationTest
 
         ExecutorService executor = Executors.newFixedThreadPool(10);
 
-        LOG.info("Staring to send " + SIZE + " messages.");
+        LOG.info("Starting to send {} messages.", SIZE);
 
         for (int i = 0; i < SIZE; i++) {
             final int value = 1;
@@ -57,7 +57,7 @@ public class JdbcAggregateLoadConcurrentTest extends AbstractJdbcAggregationTest
             });
         }
 
-        LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete.");
+        LOG.info("Sending all {} message done. Now waiting for aggregation to complete.", SIZE);
 
         MockEndpoint.assertIsSatisfied(context);
         executor.shutdownNow();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
index ddd6026b432..62b3c6e342c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadTest.java
@@ -33,7 +33,7 @@ public class JdbcAggregateLoadTest extends AbstractJdbcAggregationTestSupport {
         mock.expectedMinimumMessageCount(1);
         mock.setResultWaitTime(50 * 1000);
 
-        LOG.info("Staring to send " + SIZE + " messages.");
+        LOG.info("Starting to send {} messages.", SIZE);
 
         for (int i = 0; i < SIZE; i++) {
             final int value = 1;
@@ -42,7 +42,7 @@ public class JdbcAggregateLoadTest extends AbstractJdbcAggregationTestSupport {
             template.sendBodyAndHeader("seda:start?size=" + SIZE, value, "id", "" + id);
         }
 
-        LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete.");
+        LOG.info("Sending all {} message done. Now waiting for aggregation to complete.", SIZE);
 
         MockEndpoint.assertIsSatisfied(context);
     }
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
index f4c62bfd60c..ae412cf4b56 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateSerializedHeadersTest.java
@@ -34,7 +34,7 @@ public class JdbcAggregateSerializedHeadersTest extends AbstractJdbcAggregationT
         mock.expectedMinimumMessageCount(1);
         mock.setResultWaitTime(50 * 1000);
 
-        LOG.info("Staring to send " + SIZE + " messages.");
+        LOG.info("Starting to send {} messages.", SIZE);
 
         for (int i = 0; i < SIZE; i++) {
             final int value = 1;
@@ -43,7 +43,7 @@ public class JdbcAggregateSerializedHeadersTest extends AbstractJdbcAggregationT
             template.sendBodyAndHeader("seda:start?size=" + SIZE, value, "id", headerDto);
         }
 
-        LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete.");
+        LOG.info("Sending all {} message done. Now waiting for aggregation to complete.", SIZE);
 
         MockEndpoint.assertIsSatisfied(context);
     }
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java
index 9690467a383..3f496272b98 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGetNotFoundTest.java
@@ -42,7 +42,7 @@ public class JdbcGetNotFoundTest extends AbstractJdbcAggregationTestSupport {
     public void testPutAndGetNotFound() {
         Exchange exchange = new DefaultExchange(context);
         exchange.getIn().setBody("Hello World");
-        LOG.info("Created " + exchange.getExchangeId());
+        LOG.info("Created {}", exchange.getExchangeId());
 
         repo.add(context, exchange.getExchangeId(), exchange);
         Exchange out = repo.get(context, exchange.getExchangeId());
@@ -50,7 +50,7 @@ public class JdbcGetNotFoundTest extends AbstractJdbcAggregationTestSupport {
 
         Exchange exchange2 = new DefaultExchange(context);
         exchange2.getIn().setBody("Bye World");
-        LOG.info("Created " + exchange2.getExchangeId());
+        LOG.info("Created {}", exchange2.getExchangeId());
 
         Exchange out2 = repo.get(context, exchange2.getExchangeId());
         assertNull(out2, "Should not find exchange");
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java
index 013f2966681..e8e37f9fe37 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcGrowIssueTest.java
@@ -46,7 +46,7 @@ public class JdbcGrowIssueTest extends AbstractJdbcAggregationTestSupport {
 
         // we update using the same key, which means we should be able to do this within the file size limit
         for (int i = 0; i < SIZE; i++) {
-            LOG.debug("Updating " + i);
+            LOG.debug("Updating {}", i);
             exchange = repoAddAndGet(key, exchange);
         }
 
diff --git a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java
index bfaede92b9f..50bf7fa01fa 100644
--- a/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java
+++ b/components/camel-stax/src/test/java/org/apache/camel/component/stax/StAXXPathSplitChoicePerformanceManualTest.java
@@ -67,12 +67,12 @@ public class StAXXPathSplitChoicePerformanceManualTest extends CamelTestSupport
         NotifyBuilder notify = new NotifyBuilder(context).whenDone(size).create();
 
         boolean matches = notify.matches(60, TimeUnit.SECONDS);
-        log.info("Processed file with " + size + " elements in: " + TimeUtils.printDuration(watch.taken(), true));
+        log.info("Processed file with {} elements in: {}", size, TimeUtils.printDuration(watch.taken(), true));
 
-        log.info("Processed " + tiny.get() + " tiny messages");
-        log.info("Processed " + small.get() + " small messages");
-        log.info("Processed " + med.get() + " medium messages");
-        log.info("Processed " + large.get() + " large messages");
+        log.info("Processed {} tiny messages", tiny.get());
+        log.info("Processed {} small messages", small.get());
+        log.info("Processed {} medium messages", med.get());
+        log.info("Processed {} large messages", large.get());
 
         assertEquals((size / 10) * 4, tiny.get());
         assertEquals((size / 10) * 2, small.get());
@@ -104,7 +104,7 @@ public class StAXXPathSplitChoicePerformanceManualTest extends CamelTestSupport
 
                                 int num = tiny.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " tiny messages");
+                                    log.info("Processed {} tiny messages", num);
                                     log.debug(xml);
                                 }
                             }
@@ -117,7 +117,7 @@ public class StAXXPathSplitChoicePerformanceManualTest extends CamelTestSupport
 
                                 int num = small.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " small messages");
+                                    log.info("Processed {} small messages", num);
                                     log.debug(xml);
                                 }
                             }
@@ -130,7 +130,7 @@ public class StAXXPathSplitChoicePerformanceManualTest extends CamelTestSupport
 
                                 int num = med.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " medium messages");
+                                    log.info("Processed {} medium messages", num);
                                     log.debug(xml);
                                 }
                             }
@@ -143,7 +143,7 @@ public class StAXXPathSplitChoicePerformanceManualTest extends CamelTestSupport
 
                                 int num = large.incrementAndGet();
                                 if (num % 100 == 0) {
-                                    log.info("Processed " + num + " large messages");
+                                    log.info("Processed {} large messages", num);
                                     log.debug(xml);
                                 }
                             }
diff --git a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java
index 222fe6218fb..6e42967b918 100644
--- a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java
+++ b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/CreateCamelContextPerTestTrueTest.java
@@ -127,7 +127,7 @@ public class CreateCamelContextPerTestTrueTest extends CamelTestSupport {
                     }
                 }
             } finally {
-                LOG.info("Should only call postTearDown 1 time per test class, called: " + POST_TEAR_DOWN.get());
+                LOG.info("Should only call postTearDown 1 time per test class, called: {}", POST_TEAR_DOWN.get());
                 assertEquals(1, POST_TEAR_DOWN.get(), "Should only call postTearDown 1 time per test class");
             }
         };
diff --git a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java
index 7d1778d0168..979ce8bf48d 100644
--- a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java
+++ b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugJUnit5Test.java
@@ -44,7 +44,7 @@ public class DebugJUnit5Test extends CamelTestSupport {
         // processor
         // from your Java editor you can just add a breakpoint in the code line
         // below
-        LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
+        LOG.info("Before {} with body {}", definition, exchange.getIn().getBody());
     }
     // END SNIPPET: e1
 
diff --git a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
index 02e213e5300..1bacdf34ad8 100644
--- a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
+++ b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugNoLazyTypeConverterTest.java
@@ -44,7 +44,7 @@ public class DebugNoLazyTypeConverterTest extends CamelTestSupport {
         // processor
         // from your Java editor you can just add a breakpoint in the code line
         // below
-        LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
+        LOG.info("Before {} with body {}", definition, exchange.getIn().getBody());
     }
     // END SNIPPET: e1
 
diff --git a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java
index db63f095831..b39681e3a68 100644
--- a/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java
+++ b/components/camel-test/camel-test-junit5/src/test/java/org/apache/camel/test/junit5/patterns/DebugTest.java
@@ -44,7 +44,7 @@ public class DebugTest extends CamelTestSupport {
         // processor
         // from your Java editor you can just add a breakpoint in the code line
         // below
-        LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
+        LOG.info("Before {} with body {}", definition, exchange.getIn().getBody());
     }
     // END SNIPPET: e1
 
diff --git a/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java b/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
index 6b0b6dba342..3c45bf5fc53 100644
--- a/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
+++ b/components/camel-test/camel-test-spring-junit5/src/test/java/org/apache/camel/test/patterns/DebugSpringTest.java
@@ -47,7 +47,7 @@ public class DebugSpringTest extends CamelSpringTestSupport {
             ProcessorDefinition<?> definition, String id, String shortName) {
         // this method is invoked before we are about to enter the given processor
         // from your Java editor you can just add a breakpoint in the code line below
-        LOG.info("Before " + definition + " with body " + exchange.getIn().getBody());
+        LOG.info("Before {} with body {}", definition, exchange.getIn().getBody());
         debugged = true;
     }
 
diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java
index 5d272d95adb..a8a927ddfef 100644
--- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java
+++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/decorators/RestSpanDecorator.java
@@ -82,7 +82,7 @@ public class RestSpanDecorator extends AbstractHttpSpanDecorator {
                 try {
                     path = URLDecoder.decode(path, "UTF-8");
                 } catch (UnsupportedEncodingException e) {
-                    LOG.debug("Failed to decode URL path '" + path + "', ignoring exception", e);
+                    LOG.debug("Failed to decode URL path '{}', ignoring exception", path, e);
                 }
             }
         }
diff --git a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIT.java b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIT.java
index c0f9ba24384..677ccba94c1 100644
--- a/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIT.java
+++ b/components/camel-twilio/src/test/java/org/apache/camel/component/twilio/AccountIT.java
@@ -48,7 +48,7 @@ public class AccountIT extends AbstractTwilioTestSupport {
 
         assertNotNull(result, "fetcher result not null");
         assertNotNull(result.getSid(), "fetcher result sid not null");
-        LOG.debug("fetcher: " + result);
+        LOG.debug("fetcher: {}", result);
     }
 
     @Test
@@ -58,7 +58,7 @@ public class AccountIT extends AbstractTwilioTestSupport {
 
         assertNotNull(result, "fetcher result not null");
         assertNotNull(result.getSid(), "fetcher result sid not null");
-        LOG.debug("fetcher: " + result);
+        LOG.debug("fetcher: {}", result);
     }
 
     @Test
@@ -68,7 +68,7 @@ public class AccountIT extends AbstractTwilioTestSupport {
         assertNotNull(result, "reader result not null");
         result.forEach(account -> {
             assertNotNull(account, "reader result account not null");
-            LOG.debug("reader: " + account);
+            LOG.debug("reader: {}", account);
         });
     }
 
@@ -80,7 +80,7 @@ public class AccountIT extends AbstractTwilioTestSupport {
         assertNotNull(result, "reader result not null");
         result.forEach(account -> {
             assertEquals(Account.Status.ACTIVE, account.getStatus(), "reader result account active");
-            LOG.debug("reader: " + account);
+            LOG.debug("reader: {}", account);
         });
     }
 
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerIT.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerIT.java
index aa77312482c..693839573dd 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerIT.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/DirectMessageProducerIT.java
@@ -49,7 +49,7 @@ public class DirectMessageProducerIT extends CamelTwitterITSupport {
     public void testDirectMessage() throws Exception {
         Date now = new Date();
         String tweet = "Test a tweet posted on " + now.toString();
-        LOG.info("Tweet: " + tweet);
+        LOG.info("Tweet: {}", tweet);
         ProducerTemplate producerTemplate = context.createProducerTemplate();
         // send tweet to the twitter endpoint
         producerTemplate.sendBody("direct:tweets", tweet);
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectIT.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectIT.java
index 0d0b211cdb7..21693e3d5b5 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectIT.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/SearchByExchangeDirectIT.java
@@ -55,7 +55,7 @@ public class SearchByExchangeDirectIT extends CamelTwitterITSupport {
         mock.assertIsSatisfied();
         List<Exchange> tweets = mock.getExchanges();
         for (Exchange e : tweets) {
-            log.info("Tweet: " + e.getIn().getBody(String.class));
+            log.info("Tweet: {}", e.getIn().getBody(String.class));
         }
     }
 
@@ -68,7 +68,7 @@ public class SearchByExchangeDirectIT extends CamelTwitterITSupport {
         mock.assertIsSatisfied();
         List<Exchange> tweets = mock.getExchanges();
         for (Exchange e : tweets) {
-            log.info("Tweet: " + e.getIn().getBody(String.class));
+            log.info("Tweet: {}", e.getIn().getBody(String.class));
         }
     }
 
@@ -84,7 +84,7 @@ public class SearchByExchangeDirectIT extends CamelTwitterITSupport {
         mock.assertIsSatisfied();
         List<Exchange> tweets = mock.getExchanges();
         for (Exchange e : tweets) {
-            log.info("Tweet: " + e.getIn().getBody(String.class));
+            log.info("Tweet: {}", e.getIn().getBody(String.class));
         }
     }
 
@@ -109,7 +109,7 @@ public class SearchByExchangeDirectIT extends CamelTwitterITSupport {
         mock.assertIsSatisfied();
         List<Exchange> tweets = mock.getExchanges();
         for (Exchange e : tweets) {
-            log.info("Tweet: " + e.getIn().getBody(String.class));
+            log.info("Tweet: {}", e.getIn().getBody(String.class));
         }
 
         // calls the same query again, expecting to receive the same amount of
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyIT.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyIT.java
index 4df79a03493..faf2963a4f1 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyIT.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOnlyIT.java
@@ -49,7 +49,7 @@ public class UserProducerInOnlyIT extends CamelTwitterITSupport {
     public void testPostStatusUpdateRequestResponse() throws Exception {
         Date now = new Date();
         String tweet = "UserProducerInOnlyTest: This is a tweet posted on " + now.toString();
-        LOG.info("Tweet: " + tweet);
+        LOG.info("Tweet: {}", tweet);
         ProducerTemplate producerTemplate = context.createProducerTemplate();
         // send tweet to the twitter endpoint
         producerTemplate.sendBodyAndHeader("direct:tweets", tweet, "customHeader", 12312);
diff --git a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutIT.java b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutIT.java
index c078182da36..8b89b8d4130 100644
--- a/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutIT.java
+++ b/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/UserProducerInOutIT.java
@@ -52,7 +52,7 @@ public class UserProducerInOutIT extends CamelTwitterITSupport {
     public void testPostStatusUpdateRequestResponse() throws Exception {
         Date now = new Date();
         String tweet = "UserProducerInOutTest: This is a tweet posted on " + now.toString();
-        LOG.info("Tweet: " + tweet);
+        LOG.info("Tweet: {}", tweet);
         ProducerTemplate producerTemplate = context.createProducerTemplate();
         // send tweet to the twitter endpoint
         producerTemplate.sendBodyAndHeader("direct:tweets", tweet, "customHeader", 12312);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java
index c9aeb01fd66..d1ca0815ec6 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowComponentTest.java
@@ -33,7 +33,7 @@ public class UndertowComponentTest extends BaseUndertowTest {
     public void testUndertow() throws Exception {
         MockEndpoint mockEndpoint = getMockEndpoint("mock:myapp");
         mockEndpoint.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST");
-        LOG.debug("Number of exchanges in mock:myapp " + mockEndpoint.getExchanges().size());
+        LOG.debug("Number of exchanges in mock:myapp {}", mockEndpoint.getExchanges().size());
 
         String response = template.requestBody("undertow:http://localhost:{{port}}/myapp", "Hello Camel!", String.class);
         assertNotNull(response);
diff --git a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java
index 457afed4f49..2b2b5aebc87 100644
--- a/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java
+++ b/components/camel-undertow/src/test/java/org/apache/camel/component/undertow/UndertowSharedPortTest.java
@@ -42,7 +42,7 @@ public class UndertowSharedPortTest extends BaseUndertowTest {
     private void testPath(String pathSuffix) throws InterruptedException {
         MockEndpoint mockEndpoint = getMockEndpoint("mock:" + pathSuffix);
         mockEndpoint.expectedHeaderReceived(Exchange.HTTP_METHOD, "POST");
-        LOG.debug("Number of exchanges in mock:myapp " + mockEndpoint.getExchanges().size());
+        LOG.debug("Number of exchanges in mock:myapp {}", mockEndpoint.getExchanges().size());
 
         String response
                 = template.requestBody("undertow:http://localhost:{{port}}/" + pathSuffix, "Hello Camel!", String.class);
diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java
index aec7a5157e2..f594d116f8c 100644
--- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java
+++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRoutePubSubTest.java
@@ -45,7 +45,7 @@ public class VertxRoutePubSubTest extends VertxBaseTestSupport {
 
         List<Exchange> list = resultEndpoint.getReceivedExchanges();
         for (Exchange exchange : list) {
-            log.info("Received exchange: " + exchange + " headers: " + exchange.getIn().getHeaders());
+            log.info("Received exchange: {} headers: {}", exchange, exchange.getIn().getHeaders());
         }
     }
 
diff --git a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java
index 646666ecd44..96e351b2350 100644
--- a/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java
+++ b/components/camel-vertx/camel-vertx/src/test/java/org/apache/camel/component/vertx/VertxRouteTest.java
@@ -45,7 +45,7 @@ public class VertxRouteTest extends VertxBaseTestSupport {
 
         List<Exchange> list = resultEndpoint.getReceivedExchanges();
         for (Exchange exchange : list) {
-            log.info("Received exchange: " + exchange + " headers: " + exchange.getIn().getHeaders());
+            log.info("Received exchange: {} headers: {}", exchange, exchange.getIn().getHeaders());
         }
     }
 
diff --git a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
index ecb7bb55fe3..6b04db7dc5b 100644
--- a/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
+++ b/components/camel-web3j/src/main/java/org/apache/camel/component/web3j/Web3jEndpoint.java
@@ -90,7 +90,7 @@ public class Web3jEndpoint extends DefaultEndpoint {
     }
 
     private Web3j buildService(String clientAddress, Web3jConfiguration configuration) {
-        LOG.info("Building service for endpoint: {}", clientAddress + configuration);
+        LOG.info("Building service for endpoint: {}, {}", clientAddress, configuration);
 
         if (configuration.getWeb3j() != null) {
             return configuration.getWeb3j();
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
index 7e1eaeeaa4a..0dd23538587 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
@@ -87,7 +87,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
             }
         } catch (Exception e) {
             System.err.println("Cannot test due " + e.getMessage());
-            log.warn("Cannot test due " + e.getMessage(), e);
+            log.warn("Cannot test due {}", e.getMessage(), e);
             canTest = false;
         }
     }
@@ -252,7 +252,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
             super.setUp();
         } catch (Exception e) {
             System.err.println("Cannot test due " + e.getMessage());
-            log.warn("Cannot test due " + e.getMessage(), e);
+            log.warn("Cannot test due {}", e.getMessage(), e);
             canTest = false;
         }
     }
diff --git a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java
index 3508fb65fd2..7d1317bd041 100644
--- a/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java
+++ b/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/integration/XmppRouteIT.java
@@ -68,11 +68,11 @@ public class XmppRouteIT extends XmppBaseIT {
 
         assertEquals(123, receivedMessage.getHeader("cheese"), "cheese header");
         Object body = receivedMessage.getBody();
-        XmppRouteIT.LOG.debug("Received body: " + body);
+        XmppRouteIT.LOG.debug("Received body: {}", body);
         Message xmppMessage = receivedMessage.getXmppMessage();
         assertNotNull(xmppMessage);
 
-        XmppRouteIT.LOG.debug("Received XMPP message: " + xmppMessage.getBody());
+        XmppRouteIT.LOG.debug("Received XMPP message: {}", xmppMessage.getBody());
         return body;
     }
 
@@ -82,7 +82,7 @@ public class XmppRouteIT extends XmppBaseIT {
         final String uri1 = uriPrefix + "&resource=camel-test-from&nickname=came-test-from";
         final String uri2 = uriPrefix + "&resource=camel-test-to&nickname=came-test-to";
         final String uri3 = uriPrefix + "&resource=camel-test-from-processor&nickname=came-test-from-processor";
-        LOG.info("Using URI " + uri1 + " and " + uri2);
+        LOG.info("Using URI {} and {}", uri1, uri2);
 
         endpoint = context.getEndpoint(uri1);
         assertNotNull(endpoint, "No endpoint found!");
@@ -92,7 +92,7 @@ public class XmppRouteIT extends XmppBaseIT {
             public void configure() {
                 from(uri1).to(uri2);
                 from(uri3).process(e -> {
-                    LOG.info("Received exchange: " + e);
+                    LOG.info("Received exchange: {}", e);
                     receivedExchange = e.copy();
                     latch.countDown();
                 });
diff --git a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
index 2f8a7721cfb..e1e2d4e3312 100644
--- a/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
+++ b/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java
@@ -1408,8 +1408,9 @@ public class XPathBuilder extends ServiceSupport
                         }
                     }
                 } catch (Exception e) {
-                    LOG.warn("Attempted to create Saxon XPathFactory by creating a new instance of " + SAXON_FACTORY_CLASS_NAME
-                             + " failed. Will fallback and create XPathFactory using JDK API. This exception is ignored (stacktrace in DEBUG logging level).");
+                    LOG.warn("Attempted to create Saxon XPathFactory by creating a new instance of {}" +
+                             " failed. Will fallback and create XPathFactory using JDK API. This exception is ignored (stacktrace in DEBUG logging level).",
+                            SAXON_FACTORY_CLASS_NAME);
                     LOG.debug("Error creating Saxon XPathFactory. This exception is ignored.", e);
                 }
             }
diff --git a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIT.java b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIT.java
index d419a319465..ef2af64f5c9 100644
--- a/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIT.java
+++ b/components/camel-zendesk/src/test/java/org/apache/camel/component/zendesk/ZendeskTicketIT.java
@@ -52,7 +52,7 @@ public class ZendeskTicketIT extends AbstractZendeskTestSupport {
             LOG.info(ticket.toString());
             count++;
         }
-        LOG.info(count + " ticket(s) in total.");
+        LOG.info("{} ticket(s) in total.", count);
     }
 
     @Test
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java
index 28ee69a482e..fd9445144cc 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/CuratorFactoryBean.java
@@ -55,7 +55,7 @@ public class CuratorFactoryBean implements FactoryBean<CuratorFramework>, Dispos
     //-------------------------------------------------------------------------
     @Override
     public CuratorFramework getObject() {
-        LOG.debug("Connecting to ZooKeeper on " + connectString);
+        LOG.debug("Connecting to ZooKeeper on {}",  connectString);
 
         CuratorFrameworkFactory.Builder builder = CuratorFrameworkFactory.builder()
                 .connectString(connectString)
@@ -63,7 +63,7 @@ public class CuratorFactoryBean implements FactoryBean<CuratorFramework>, Dispos
                 .connectionTimeoutMs(getTimeout());
 
         this.curator = builder.build();
-        LOG.debug("Starting curator " + curator);
+        LOG.debug("Starting curator {}", curator);
         curator.start();
         return curator;
     }
diff --git a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
index 7f00cf8a750..ef8221f3a23 100644
--- a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
+++ b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
@@ -144,7 +144,7 @@ public class MasterEndpointFailoverIT {
 
         template.sendBody("direct:start", expectedBody);
 
-        LOG.info("Expecting master: " + masterEndpoint + " and standby: " + standbyEndpoint);
+        LOG.info("Expecting master: {} and standby: {}", masterEndpoint, standbyEndpoint);
         MockEndpoint.assertIsSatisfied(masterEndpoint, standbyEndpoint);
     }
 
diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java
index 9427f0a2482..932798556f3 100644
--- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java
+++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/integration/ZooKeeperITSupport.java
@@ -130,7 +130,7 @@ public class ZooKeeperITSupport extends CamelTestSupport {
                 connected.countDown();
             } else {
                 if (event.getState() == KeeperState.Disconnected) {
-                    log.info("TestClient connected ?" + zk.getState());
+                    log.info("TestClient connected ? {}", zk.getState());
                 }
             }
         }
@@ -146,7 +146,7 @@ public class ZooKeeperITSupport extends CamelTestSupport {
 
         public void delete(String node) throws Exception {
             delay(200);
-            log.debug("Deleting node " + node);
+            log.debug("Deleting node {}", node);
             zk.delete(node, -1);
         }
     }