From 441b01006f59aa35668be27ae8c2fad05c260edb Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Mon, 9 Oct 2017 10:16:51 -0500
Subject: [PATCH] Utilize parameterized logging rather than String.format()

---
 .../application/cluster/health/HealthStateSharingImpl.java    | 4 +---
 .../main/java/org/sonar/application/process/SQProcess.java    | 4 ++--
 .../src/main/java/org/sonar/process/StopperThread.java        | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/server/sonar-main/src/main/java/org/sonar/application/cluster/health/HealthStateSharingImpl.java b/server/sonar-main/src/main/java/org/sonar/application/cluster/health/HealthStateSharingImpl.java
index 1d2849545cf..14597ca6b3b 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/cluster/health/HealthStateSharingImpl.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/cluster/health/HealthStateSharingImpl.java
@@ -31,8 +31,6 @@ import org.sonar.process.cluster.health.NodeHealthProvider;
 import org.sonar.process.cluster.health.SharedHealthStateImpl;
 import org.sonar.process.cluster.hz.HazelcastMember;
 
-import static java.lang.String.format;
-
 public class HealthStateSharingImpl implements HealthStateSharing {
   private static final Logger LOG = LoggerFactory.getLogger(HealthStateSharingImpl.class);
 
@@ -78,7 +76,7 @@ public class HealthStateSharingImpl implements HealthStateSharing {
         }
       }
     } catch (InterruptedException ie) {
-      LOG.warn(format("Termination of pool %s failed", HealthStateSharingImpl.class.getSimpleName()), ie);
+      LOG.warn("Termination of pool {} failed", HealthStateSharingImpl.class.getSimpleName(), ie);
       // (Re-)Cancel if current thread also interrupted
       executorService.shutdownNow();
       Thread.currentThread().interrupt();
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 18f6d192d6c..f0ddfa3ce7a 100644
--- 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
@@ -68,7 +68,7 @@ public class SQProcess {
     try {
       this.process = commandLauncher.get();
     } catch (RuntimeException e) {
-      LOG.error(format("Fail to launch process [%s]", processId.getKey()), e);
+      LOG.error("Fail to launch process [{}]", processId.getKey(), e);
       lifecycle.tryToMoveTo(Lifecycle.State.STOPPED);
       throw e;
     }
@@ -131,7 +131,7 @@ public class SQProcess {
       process.waitFor(timeout, timeoutUnit);
     } catch (InterruptedException e) {
       // can't wait for the termination of process. Let's assume it's down.
-      LOG.warn(format("Interrupted while stopping process %s", processId), e);
+      LOG.warn("Interrupted while stopping process {}", processId, e);
       Thread.currentThread().interrupt();
     } catch (Throwable 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/StopperThread.java b/server/sonar-process/src/main/java/org/sonar/process/StopperThread.java
index 14fe192cd9c..00f81bf267a 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/StopperThread.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/StopperThread.java
@@ -27,8 +27,6 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import org.sonar.process.sharedmemoryfile.ProcessCommands;
 
-import static java.lang.String.format;
-
 /**
  * Gracefully stops process in a timely fashion
  */
@@ -52,7 +50,7 @@ class StopperThread extends Thread {
       Future future = executor.submit(monitored::stop);
       future.get(terminationTimeoutMs, TimeUnit.MILLISECONDS);
     } catch (Exception e) {
-      LoggerFactory.getLogger(getClass()).error(format("Can not stop in %dms", terminationTimeoutMs), e);
+      LoggerFactory.getLogger(getClass()).error("Can not stop in {}ms", terminationTimeoutMs, e);
     }
     executor.shutdownNow();
     commands.endWatch();
-- 
2.39.5