apache · orpiske · Aug 8, 2023 · Aug 8, 2023
diff --git a/.../camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java b/.../camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -508,8 +508,7 @@ public Object before(Exchange exchange) throws Exception {
                         policy.onExchangeBegin(route, exchange);
                     }
                 } catch (Exception e) {
-                    log.warn("Error occurred during onExchangeBegin on RoutePolicy: " + policy
-                             + ". This exception will be ignored",
+                    log.warn("Error occurred during onExchangeBegin on RoutePolicy: {}. This exception will be ignored", policy,
                             e);
                 }
             }
@@ -530,9 +529,8 @@ public void after(Exchange exchange, Object data) throws Exception {
                         policy.onExchangeDone(route, exchange);
                     }
                 } catch (Exception e) {
-                    log.warn("Error occurred during onExchangeDone on RoutePolicy: " + policy
-                             + ". This exception will be ignored",
-                            e);
+                    log.warn("Error occurred during onExchangeDone on RoutePolicy: {}. This exception will be ignored",
+                            policy, e);
                 }
             }
         }

diff --git a/...-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java b/...-engine/src/main/java/org/apache/camel/impl/engine/DefaultAsyncProcessorAwaitManager.java
@@ -237,8 +237,8 @@ protected void doStop() throws Exception {
                     try {
                         interrupt(entry.getExchange());
                     } catch (Throwable e) {
-                        LOG.warn("Error while interrupting thread: " + entry.getBlockedThread().getName()
-                                 + ". This exception is ignored.",
+                        LOG.warn("Error while interrupting thread: {}. This exception is ignored.",
+                                entry.getBlockedThread().getName(),
                                 e);
                     }
                 }

diff --git a/...engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java b/...engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
@@ -238,7 +238,7 @@ protected List<String> doLoadImplementationsInJar(
 
             }
         } catch (IOException ioe) {
-            LOG.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage(), ioe);
+            LOG.warn("Cannot search jar file '{} due to an IOException: {}", urlPath, ioe.getMessage(), ioe);
         } finally {
             IOHelper.close(jarStream, urlPath, LOG);
         }

diff --git a/...camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java b/...camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultShutdownStrategy.java
@@ -432,7 +432,7 @@ protected void shutdownNow(String routeId, Consumer consumer) {
         try {
             ServiceHelper.stopService(consumer);
         } catch (Throwable e) {
-            LOG.warn("Error occurred while shutting down route: " + routeId + ". This exception will be ignored.", e);
+            LOG.warn("Error occurred while shutting down route: {}. This exception will be ignored.", routeId, e);
             // fire event
             EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), consumer, e);
         }
@@ -453,7 +453,7 @@ protected void suspendNow(String routeId, Consumer consumer) {
         try {
             ServiceHelper.suspendService(consumer);
         } catch (Throwable e) {
-            LOG.warn("Error occurred while suspending route: " + routeId + ". This exception will be ignored.", e);
+            LOG.warn("Error occurred while suspending route: {}. This exception will be ignored.", routeId, e);
             // fire event
             EventHelper.notifyServiceStopFailure(consumer.getEndpoint().getCamelContext(), consumer, e);
         }
@@ -518,9 +518,9 @@ private void prepareShutdown(
                     ((ShutdownPrepared) child).prepareShutdown(suspendOnly, forced);
                 } catch (Exception e) {
                     if (suppressLogging) {
-                        LOG.trace("Error during prepare shutdown on " + child + ". This exception will be ignored.", e);
+                        LOG.trace("Error during prepare shutdown on {}. This exception will be ignored.", child, e);
                     } else {
-                        LOG.warn("Error during prepare shutdown on " + child + ". This exception will be ignored.", e);
+                        LOG.warn("Error during prepare shutdown on {}. This exception will be ignored.", child, e);
                     }
                 }
             }

diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/split-eip.adoc
@@ -680,7 +680,7 @@ public static class MyOrderService {
      * We just handle the order by returning an id line for the order
      */
     public String handleOrder(String line) {
-        LOG.debug("HandleOrder: " + line);
+        LOG.debug("HandleOrder: {}", line);
         return "(id=" + ++counter + ",item=" + line + ")";
     }
 
@@ -689,7 +689,7 @@ public static class MyOrderService {
      * back to the original caller
      */
     public String buildCombinedResponse(String line) {
-        LOG.debug("BuildCombinedResponse: " + line);
+        LOG.debug("BuildCombinedResponse: {}", line);
         return "Response[" + line + "]";
     }
 }
@@ -721,8 +721,8 @@ public static class MyOrderStrategy implements AggregationStrategy {
         String orders = oldExchange.getIn().getBody(String.class);
         String newLine = newExchange.getIn().getBody(String.class);
 
-        LOG.debug("Aggregate old orders: " + orders);
-        LOG.debug("Aggregate new order: " + newLine);
+        LOG.debug("Aggregate old orders: {}", orders);
+        LOG.debug("Aggregate new order: {}", newLine);
 
         // put orders together separating by semicolon
         orders = orders + ";" + newLine;

diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -850,7 +850,7 @@ protected void doDone(
                     processorExchangeFactory.release(pair.getExchange());
                 }
             } catch (Throwable e) {
-                LOG.warn("Error releasing exchange due to " + e.getMessage() + ". This exception is ignored.", e);
+                LOG.warn("Error releasing exchange due to {}. This exception is ignored.", e.getMessage(), e);
             }
         }
         // we are done so close the pairs iterator

diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -395,7 +395,7 @@ private boolean isValid(Exchange exchange) {
         try {
             result = expression.evaluate(exchange, Object.class);
         } catch (Exception e) {
-            LOG.debug("Error evaluating expression: " + expression + ". This exception is ignored.", e);
+            LOG.debug("Error evaluating expression: {}. This exception is ignored.", expression, e);
         }
         return result != null;
     }

diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicProcessor.java
@@ -163,7 +163,7 @@ public boolean process(Exchange exchange, final AsyncCallback callback) {
         } catch (Throwable e) {
             if (isIgnoreInvalidEndpoint()) {
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("Endpoint uri is invalid: " + recipient + ". This exception will be ignored.", e);
+                    LOG.debug("Endpoint uri is invalid: {}. This exception will be ignored.", recipient, e);
                 }
             } else {
                 exchange.setException(e);
@@ -342,9 +342,8 @@ protected void doInit() throws Exception {
             } catch (Throwable e) {
                 // ignore
                 if (LOG.isDebugEnabled()) {
-                    LOG.debug("Error creating optimised SendDynamicAwareResolver for uri: " + URISupport.sanitizeUri(uri)
-                              + " due to " + e.getMessage() + ". This exception is ignored",
-                            e);
+                    LOG.debug("Error creating optimised SendDynamicAwareResolver for uri: {} due to {}. This exception is ignored",
+                            URISupport.sanitizeUri(uri), e.getMessage(), e);
                 }
             }
         }

diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java b/core/camel-main/src/main/java/org/apache/camel/main/MainHelper.java
@@ -351,9 +351,8 @@ public static boolean setPropertiesOnTarget(
                 throw new PropertyBindingException(
                         e.getTarget(), e.getPropertyName(), e.getValue(), optionPrefix, key, e.getCause());
             } else {
-                LOG.debug("Error configuring property (" + key + ") with name: " + e.getPropertyName() + ") on bean: " + target
-                          + " with value: " + e.getValue() + ". This exception is ignored as failIfNotSet=false.",
-                        e);
+                LOG.debug("Error configuring property ({}) with name: {}) on bean: {} with value: {}. This exception is ignored as failIfNotSet=false.",
+                        key, e.getPropertyName(), target, e.getValue(), e);
             }
         }
 

diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/MainSupport.java
@@ -167,7 +167,7 @@ private void internalBeforeStop() {
                 camelTemplate = null;
             }
         } catch (Exception e) {
-            LOG.debug("Error stopping camelTemplate due " + e.getMessage() + ". This exception is ignored.", e);
+            LOG.debug("Error stopping camelTemplate due {}. This exception is ignored.", e.getMessage(), e);
         }
     }
 

diff --git a/...-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java b/...-management/src/main/java/org/apache/camel/management/JmxManagementLifecycleStrategy.java
@@ -412,7 +412,7 @@ public void onEndpointAdd(Endpoint endpoint) {
             }
             manageObject(me);
         } catch (Exception e) {
-            LOG.warn("Could not register Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
+            LOG.warn("Could not register Endpoint MBean for endpoint: {}. This exception will be ignored.", endpoint, e);
         }
     }
 
@@ -427,7 +427,7 @@ public void onEndpointRemove(Endpoint endpoint) {
             Object me = getManagementObjectStrategy().getManagedObjectForEndpoint(camelContext, endpoint);
             unmanageObject(me);
         } catch (Exception e) {
-            LOG.warn("Could not unregister Endpoint MBean for endpoint: " + endpoint + ". This exception will be ignored.", e);
+            LOG.warn("Could not unregister Endpoint MBean for endpoint: {}. This exception will be ignored.", endpoint, e);
         }
     }
 
@@ -462,7 +462,7 @@ public void onServiceAdd(CamelContext context, Service service, Route route) {
         try {
             manageObject(managedObject);
         } catch (Exception e) {
-            LOG.warn("Could not register service: " + service + " as Service MBean.", e);
+            LOG.warn("Could not register service: {} as Service MBean.", service, e);
         }
     }
 
@@ -478,7 +478,7 @@ public void onServiceRemove(CamelContext context, Service service, Route route)
             try {
                 unmanageObject(managedObject);
             } catch (Exception e) {
-                LOG.warn("Could not unregister service: " + service + " as Service MBean.", e);
+                LOG.warn("Could not unregister service: {} as Service MBean.", service, e);
             }
         }
     }
@@ -716,7 +716,7 @@ public void onThreadPoolAdd(
             // we need to keep track here, as we cannot re-construct the thread pool ObjectName when removing the thread pool
             managedThreadPools.put(threadPool, mtp);
         } catch (Exception e) {
-            LOG.warn("Could not register thread pool: " + threadPool + " as ThreadPool MBean.", e);
+            LOG.warn("Could not register thread pool: {} as ThreadPool MBean.", threadPool, e);
         }
     }
 

diff --git a/...ment/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java b/...ment/src/test/java/org/apache/camel/issues/DynamicRouterConvertBodyToIssueManualTest.java
@@ -63,7 +63,7 @@ public void configure() throws Exception {
 
     @Override
     public void process(Exchange exchange) throws Exception {
-        log.info("Some: " + counter);
+        log.info("Some: {}", counter);
 
         exchange.setProperty("EXIT", "NO");
         StringBuilder sb = new StringBuilder();
@@ -80,9 +80,9 @@ public void process(Exchange exchange) throws Exception {
     }
 
     public String slip(String body, @ExchangeProperties Map<String, Object> properties) {
-        log.info("slip " + properties.get("EXIT"));
+        log.info("slip {}", properties.get("EXIT"));
         if (properties.get("EXIT") != null && properties.get("EXIT").equals("PLEASE")) {
-            log.info("Exiting after " + MAX_ITERATIONS + " iterations");
+            log.info("Exiting after {} iterations", MAX_ITERATIONS);
             return null;
         } else {
             return "direct:while_body";

diff --git a/...anagement/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java b/...anagement/src/test/java/org/apache/camel/management/JmxNotificationEventNotifierTest.java
@@ -127,7 +127,7 @@ private class MyNotificationListener implements NotificationListener {
 
         @Override
         public void handleNotification(Notification notification, Object handback) {
-            log.debug("Get the notification : " + notification);
+            log.debug("Get the notification : {}", notification);
             eventCounter++;
         }
 

diff --git a/...est/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java b/...est/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingSendProcessorTest.java
@@ -104,7 +104,7 @@ public boolean process(Exchange exchange, AsyncCallback callback) {
                 throw new IllegalArgumentException("Forced to dump stacktrace");
             } catch (Exception e) {
                 e.fillInStackTrace();
-                LOG.info("There are " + e.getStackTrace().length + " lines in the stacktrace");
+                LOG.info("There are {} lines in the stacktrace", e.getStackTrace().length);
                 LOG.error("Dump stacktrace to log", e);
             }
             callback.done(true);

diff --git a/...agement/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java b/...agement/src/test/java/org/apache/camel/processor/ReduceStacksNeededDuringRoutingTest.java
@@ -54,7 +54,7 @@ public void configure() throws Exception {
                                 throw new IllegalArgumentException("Forced to dump stacktrace");
                             } catch (Exception e) {
                                 e.fillInStackTrace();
-                                log.info("There are " + e.getStackTrace().length + " lines in the stacktrace");
+                                log.info("There are {} lines in the stacktrace", e.getStackTrace().length);
                                 log.error("Dump stacktrace to log", e);
                             }
                         })

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultContextReloadStrategy.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultContextReloadStrategy.java
@@ -64,7 +64,7 @@ public void onReload(Object source) {
             EventHelper.notifyContextReloaded(getCamelContext(), source);
         } catch (Exception e) {
             incFailedCounter();
-            LOG.warn("Error reloading CamelContext (" + camelContext.getName() + ") due to: " + e.getMessage(), e);
+            LOG.warn("Error reloading CamelContext ({}) due to: {}", camelContext.getName(), e.getMessage(), e);
             EventHelper.notifyContextReloadFailure(getCamelContext(), source, e);
         }
     }

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
@@ -1512,7 +1512,7 @@ private static boolean doNotifyEvent(EventNotifier notifier, CamelEvent event) {
         try {
             notifier.notify(event);
         } catch (Throwable e) {
-            LOG.warn("Error notifying event " + event + ". This exception will be ignored.", e);
+            LOG.warn("Error notifying event {}. This exception will be ignored.", event, e);
         }
 
         return true;

diff --git a/...mel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java b/...mel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
@@ -305,9 +305,8 @@ public void run() {
                                 incSucceededCounter();
                             } catch (Exception e) {
                                 incFailedCounter();
-                                LOG.warn("Error reloading routes from file: " + name + " due " + e.getMessage()
-                                         + ". This exception is ignored.",
-                                        e);
+                                LOG.warn("Error reloading routes from file: {} due to {}. This exception is ignored.", name,
+                                        e.getMessage(), e);
                             }
                         }
                     }

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RouteOnDemandReloadStrategy.java b/core/camel-support/src/main/java/org/apache/camel/support/RouteOnDemandReloadStrategy.java
@@ -75,9 +75,7 @@ public void onReload(Object source) {
             incSucceededCounter();
         } catch (Exception e) {
             incFailedCounter();
-            LOG.warn("Error reloading routes due " + e.getMessage()
-                     + ". This exception is ignored.",
-                    e);
+            LOG.warn("Error reloading routes due to {}. This exception is ignored.", e.getMessage(), e);
         } finally {
             if (cl != null) {
                 Thread.currentThread().setContextClassLoader(cl);

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RouteTemplateHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/RouteTemplateHelper.java
@@ -82,9 +82,7 @@ public static void loadRouteTemplateFromLocation(
                         listener.loadRouteTemplate(res);
                     }
                 } catch (Exception e) {
-                    LOG.warn("RouteTemplateLoaderListener error due to " + e.getMessage()
-                             + ". This exception is ignored",
-                            e);
+                    LOG.warn("RouteTemplateLoaderListener error due to {}. This exception is ignored", e.getMessage(), e);
                 }
                 PluginHelper.getRoutesLoader(camelContext).loadRoutes(res);
                 found = true;

diff --git a/...upport/src/main/java/org/apache/camel/support/cluster/RebalancingCamelClusterService.java b/...upport/src/main/java/org/apache/camel/support/cluster/RebalancingCamelClusterService.java
@@ -163,7 +163,7 @@ protected void setDisabled(String partition, boolean disabled) {
                 view.setDisabled(disabled);
             }
         } catch (Exception ex) {
-            LOG.warn("Could not get view " + partition, ex);
+            LOG.warn("Could not get view {}", partition, ex);
         }
     }
 
@@ -176,7 +176,7 @@ protected List<String> owned(List<String> partitions) {
                     owned.add(partition);
                 }
             } catch (Exception ex) {
-                LOG.warn("Could not get view " + partition, ex);
+                LOG.warn("Could not get view {}", partition, ex);
                 return null;
             }
         }
@@ -201,7 +201,7 @@ protected Integer members() {
                 }
                 members = viewMembers;
             } catch (Exception ex) {
-                LOG.warn("Could not get view " + group, ex);
+                LOG.warn("Could not get view {}", group, ex);
                 return null;
             }
         }

diff --git a/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java b/core/camel-util/src/main/java/org/apache/camel/util/IOHelper.java
@@ -276,7 +276,7 @@ public static void force(FileChannel channel, String name, Logger log) {
                 log = LOG;
             }
             if (name != null) {
-                log.warn("Cannot force FileChannel: " + name + ". Reason: " + e.getMessage(), e);
+                log.warn("Cannot force FileChannel: {}. Reason: {}", name, e.getMessage(), e);
             } else {
                 log.warn("Cannot force FileChannel. Reason: {}", e.getMessage(), e);
             }
@@ -302,7 +302,7 @@ public static void force(FileOutputStream os, String name, Logger log) {
                 log = LOG;
             }
             if (name != null) {
-                log.warn("Cannot sync FileDescriptor: " + name + ". Reason: " + e.getMessage(), e);
+                log.warn("Cannot sync FileDescriptor: {}. Reason: {}", name, e.getMessage(), e);
             } else {
                 log.warn("Cannot sync FileDescriptor. Reason: {}", e.getMessage(), e);
             }
@@ -331,7 +331,7 @@ public static void close(Writer writer, FileOutputStream os, String name, Logger
                     log = LOG;
                 }
                 if (name != null) {
-                    log.warn("Cannot flush Writer: " + name + ". Reason: " + e.getMessage(), e);
+                    log.warn("Cannot flush Writer: {}. Reason: {}", name, e.getMessage(), e);
                 } else {
                     log.warn("Cannot flush Writer. Reason: {}", e.getMessage(), e);
                 }
@@ -359,7 +359,7 @@ public static void close(Closeable closeable, String name, Logger log) {
                     log = LOG;
                 }
                 if (name != null) {
-                    log.warn("Cannot close: " + name + ". Reason: " + e.getMessage(), e);
+                    log.warn("Cannot close: {}. Reason: {}", name, e.getMessage(), e);
                 } else {
                     log.warn("Cannot close. Reason: {}", e.getMessage(), e);
                 }