fix quality flaws

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 851273b7fb67dcf5a3e8e287c309e61f008fb811..07a0092683dea1b084e74bb9dbc89fff871701b9 100644 (file)
--- 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 562f20a36f2ac2fffdc323af81b5ba9f8bda5d68..fbfce14c40f6b6da614d1d20762908593bcc957d 100644 (file)
--- 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;