From e23eaf26ec5868322bce3f17092f88a5dfe40cb4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Lesaint?=
 <sebastien.lesaint@sonarsource.com>
Date: Mon, 28 Sep 2015 11:39:46 +0200
Subject: [PATCH] fix quality flaws

---
 .../sqale/SqaleNewMeasuresVisitor.java        |  2 +-
 .../sonar/core/util/logs/DefaultProfiler.java | 70 ++++++++++++-------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/sqale/SqaleNewMeasuresVisitor.java b/server/sonar-server/src/main/java/org/sonar/server/computation/sqale/SqaleNewMeasuresVisitor.java
index 851273b7fb6..07a0092683d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/sqale/SqaleNewMeasuresVisitor.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/sqale/SqaleNewMeasuresVisitor.java
@@ -141,7 +141,7 @@ public class SqaleNewMeasuresVisitor extends PathAwareVisitorAdapter<SqaleNewMea
     if (measure.hasVariations() && measure.getVariations().hasVariation(period.getIndex())) {
       return (long) measure.getVariations().getVariation(period.getIndex());
     }
-    return 0l;
+    return 0L;
   }
 
   private void initNewDebtRatioCounter(Component file, Path<NewDevelopmentCostCounter> path) {
diff --git a/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java b/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java
index 562f20a36f2..fbfce14c40f 100644
--- a/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java
@@ -193,45 +193,65 @@ class DefaultProfiler extends Profiler {
   void log(LoggerLevel level, String msg, @Nullable Object[] args) {
     switch (level) {
       case TRACE:
-        if (args == null) {
-          logger.trace(msg);
-        } else {
-          logger.trace(msg, args);
-        }
+        logTrace(msg, args);
         break;
       case DEBUG:
-        if (args == null) {
-          logger.debug(msg);
-        } else {
-          logger.debug(msg, args);
-        }
+        logDebug(msg, args);
         break;
       case INFO:
-        if (args == null) {
-          logger.info(msg);
-        } else {
-          logger.info(msg, args);
-        }
+        logInfo(msg, args);
         break;
       case WARN:
-        if (args == null) {
-          logger.warn(msg);
-        } else {
-          logger.warn(msg, args);
-        }
+        logWarn(msg, args);
         break;
       case ERROR:
-        if (args == null) {
-          logger.error(msg);
-        } else {
-          logger.error(msg, args);
-        }
+        logError(msg, args);
         break;
       default:
         throw new IllegalArgumentException("Unsupported LoggerLevel value: " + level);
     }
   }
 
+  private void logTrace(String msg, @Nullable Object[] args) {
+    if (args == null) {
+      logger.trace(msg);
+    } else {
+      logger.trace(msg, args);
+    }
+  }
+
+  private void logDebug(String msg, @Nullable Object[] args) {
+    if (args == null) {
+      logger.debug(msg);
+    } else {
+      logger.debug(msg, args);
+    }
+  }
+
+  private void logInfo(String msg, @Nullable Object[] args) {
+    if (args == null) {
+      logger.info(msg);
+    } else {
+      logger.info(msg, args);
+    }
+  }
+
+  private void logWarn(String msg, @Nullable Object[] args) {
+    if (args == null) {
+      logger.warn(msg);
+    } else {
+      logger.warn(msg, args);
+    }
+  }
+
+  private void logError(String msg, @Nullable Object[] args) {
+    if (args == null) {
+      logger.error(msg);
+    } else {
+      logger.error(msg, args);
+    }
+  }
+
   private static boolean shouldLog(Logger logger, LoggerLevel level) {
     if (level == LoggerLevel.TRACE && !logger.isTraceEnabled()) {
       return false;
-- 
2.39.5