From a2451079763bfc04f0e0bcdbd2ee158da3446fe4 Mon Sep 17 00:00:00 2001
From: Daniel Trebbien <dtrebbien@gmail.com>
Date: Mon, 9 Oct 2017 10:54:17 -0500
Subject: [PATCH] Fix two logger calls

One logger call was using incorrect syntax for a formatting anchor
('%s' should be '{}').

The other logger call had three formatting anchors, but only passed two
values.

These issues were found by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
---
 .../java/org/sonar/application/config/FileSystemSettings.java | 4 ++--
 .../src/main/java/org/sonar/api/utils/TimeProfiler.java       | 2 +-
 .../src/test/java/org/sonar/api/utils/TimeProfilerTest.java   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java b/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
index b7953aca498..baa056012fe 100644
--- a/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
+++ b/server/sonar-main/src/main/java/org/sonar/application/config/FileSystemSettings.java
@@ -44,13 +44,13 @@ public class FileSystemSettings implements Consumer<Props> {
   }
 
   private static File ensurePropertyIsAbsolutePath(Props props, String propKey) {
-    File homeDir = props.nonNullValueAsFile(PATH_HOME);
     // default values are set by ProcessProperties
     String path = props.nonNullValue(propKey);
     File d = new File(path);
     if (!d.isAbsolute()) {
+      File homeDir = props.nonNullValueAsFile(PATH_HOME);
       d = new File(homeDir, path);
-      LOG.trace("Overriding property {} from relative path '{}' to absolute path '{}'", path, d.getAbsolutePath());
+      LOG.trace("Overriding property {} from relative path '{}' to absolute path '{}'", propKey, path, d.getAbsolutePath());
       props.set(propKey, d.getAbsolutePath());
     }
     return d;
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 efe9fc38e73..440448794fc 100644
--- 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
@@ -55,7 +55,7 @@ public class TimeProfiler {
     this.name = name;
     this.start = System.currentTimeMillis();
     if (debug) {
-      logger.debug("%s ...", name);
+      logger.debug("{} ...", name);
     } else {
       logger.info("{}...", name);
     }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/TimeProfilerTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/TimeProfilerTest.java
index 2786c8ba63d..ddc537947f5 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/TimeProfilerTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/TimeProfilerTest.java
@@ -38,7 +38,7 @@ public class TimeProfilerTest {
   public void testBasicProfiling() {
     TimeProfiler profiler = new TimeProfiler(logger);
     profiler.start("Cycle analysis");
-    verify(logger).info("Cycle analysis...");
+    verify(logger).info(eq("{}..."), eq("Cycle analysis"));
 
     profiler.stop();
     verify(logger).info(eq("{} done: {} ms"), eq("Cycle analysis"), anyInt());
@@ -52,7 +52,7 @@ public class TimeProfilerTest {
     profiler.stop();
     profiler.stop();
     profiler.stop();
-    verify(logger, times(1)).info(anyString()); // start() executes log() with 1 parameter
+    verify(logger, times(1)).info(anyString(), anyString()); // start() executes log() with 1 parameter
     verify(logger, times(1)).info(anyString(), anyString(), anyInt()); // stop() executes log() with 3 parameters
   }
 
-- 
2.39.5