Utilize parameterized logging

As suggested in the SLF4J FAQ:
https://www.slf4j.org/faq.html#logging_performance
.. parameterized logging can improve the efficiency of logger calls when
logging at the specified level is disabled.

In addition, per the FAQ: https://www.slf4j.org/faq.html#paramException
since SLF4J 1.6.0 it is possible to use parameterized logging and also
log an exception/throwable.

These changes were suggested by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/

diff --git a/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
index 943f5de6efaeba8c8122f9e0c6e66849d0916866..abe37386b6455752fff63ec4d37614347fb82d65 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/SchedulerImpl.java
@@ -130,7 +130,7 @@ public class SchedulerImpl implements Scheduler, ProcessEventListener, ProcessLi
     } else {
       Optional<String> leader = appState.getLeaderHostName();
       if (leader.isPresent()) {
-        LOG.info("Waiting for initialization from " + leader.get());
+        LOG.info("Waiting for initialization from {}", leader.get());
       } else {
         LOG.error("Initialization failed. All nodes must be restarted");
       }

diff --git a/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
index 802d53bdf162d3f47fb2f4fff9e54e7680576e23..f067cc15c76527fcd13e489adcb03e0cdf6dfbbb 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/ProcessLauncherImpl.java
@@ -98,7 +98,7 @@ public class ProcessLauncherImpl implements ProcessLauncher {
         try {
           FileUtils.deleteDirectory(outdatedDir);
         } catch (IOException e) {
-          LOG.info("Failed to delete outdated search index data directory " + outdatedDir.getAbsolutePath(), e);
+          LOG.info("Failed to delete outdated search index data directory {}", outdatedDir.getAbsolutePath(), e);
         }
       }
     });

diff --git a/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java b/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
index 6aa7a29bac1fc21a4b4e3c9f9aa12a62ab6dbf97..18f6d192d6c767a80d3a96550b0dc95d475d0b8f 100644 (file)
--- a/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/process/SQProcess.java
@@ -134,7 +134,7 @@ public class SQProcess {
       LOG.warn(format("Interrupted while stopping process %s", processId), e);
       Thread.currentThread().interrupt();
     } catch (Throwable e) {
-      LOG.error("Can not ask for graceful stop of process " + processId, e);
+      LOG.error("Can not ask for graceful stop of process {}", processId, e);
     }
   }
 

diff --git a/server/sonar-process/src/main/java/org/sonar/process/Jmx.java b/server/sonar-process/src/main/java/org/sonar/process/Jmx.java
index 5324be1955edfdbcdad198066d78524ae5756412..ddad31ea7f13ac50392d1f96b3ed990e60c29315 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/Jmx.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/Jmx.java
@@ -80,7 +80,7 @@ public class Jmx {
     try {
       ManagementFactory.getPlatformMBeanServer().unregisterMBean(new ObjectName(name));
     } catch (Exception e) {
-      LoggerFactory.getLogger(Jmx.class).warn("Can not unregister MBean [" + name + "]", e);
+      LoggerFactory.getLogger(Jmx.class).warn("Can not unregister MBean [{}]", name, e);
     }
   }
 }

diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
index 76b89a007f9df6b3b1017c233c5e0f1e9a86444b..1ee6df0864b815aa8e26793b36845d8edcc40589 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessEntryPoint.java
@@ -99,14 +99,14 @@ public class ProcessEntryPoint implements Stoppable {
     try {
       launch(logger);
     } catch (Exception e) {
-      logger.warn("Fail to start " + getKey(), e);
+      logger.warn("Fail to start {}", getKey(), e);
     } finally {
       stop();
     }
   }
 
   private void launch(Logger logger) throws InterruptedException {
-    logger.info("Starting " + getKey());
+    logger.info("Starting {}", getKey());
     Runtime.getRuntime().addShutdownHook(shutdownHook);
     stopWatcher.start();
 

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java
index 7de4c84994df48154ec92efb2a9fbf67d296651e..efe9fc38e73cf0aa93f1c1466169f1e4f6a0637c 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/TimeProfiler.java
@@ -57,7 +57,7 @@ public class TimeProfiler {
     if (debug) {
       logger.debug("%s ...", name);
     } else {
-      logger.info(name + "...");
+      logger.info("{}...", name);
     }
     return this;
   }

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/CoverageExclusions.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/CoverageExclusions.java
index f0f3ba398959ccc0481e3a3fddee8d21f46c638d..65a195faa9decc9d83d31da3880a8c5f47b38347 100644 (file)
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/CoverageExclusions.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/phases/CoverageExclusions.java
@@ -62,7 +62,7 @@ public class CoverageExclusions {
     if (!patterns.isEmpty()) {
       LOG.info(title);
       for (WildcardPattern pattern : patterns) {
-        LOG.info("  " + pattern);
+        LOG.info("  {}", pattern);
       }
     }
   }