From 82d052e1a5f5fe29d6603ef38435606569dd90fe Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 19 Jul 2016 09:05:09 +0200
Subject: [PATCH] Fix Quality flaws

---
 .../src/main/java/org/sonar/server/component/ws/AppAction.java | 2 +-
 .../src/main/java/org/sonar/server/search/ws/BaseMapping.java  | 1 +
 .../main/java/org/sonar/api/utils/command/CommandExecutor.java | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java
index 551718ed9af..27dd6d5a5e4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java
@@ -178,7 +178,7 @@ public class AppAction implements RequestHandler {
   }
 
   @CheckForNull
-  private String formatCoverageMeasure(Map<String, MeasureDto> measuresByMetricKey) {
+  private static String formatCoverageMeasure(Map<String, MeasureDto> measuresByMetricKey) {
     MeasureDto overallCoverage = measuresByMetricKey.get(CoreMetrics.OVERALL_COVERAGE_KEY);
     if (overallCoverage != null) {
       return formatMeasure(overallCoverage, CoreMetrics.OVERALL_COVERAGE);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java b/server/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java
index d613edf3469..db221363f5d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/ws/BaseMapping.java
@@ -90,6 +90,7 @@ public abstract class BaseMapping<DOC extends BaseDoc, CTX> {
     return this;
   }
 
+  @FunctionalInterface
   public interface Mapper<DOC extends BaseDoc, CTX> {
     void write(JsonWriter json, DOC doc, CTX context);
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
index 79ff15faf90..b546b2aca9b 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/utils/command/CommandExecutor.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -79,7 +80,7 @@ public class CommandExecutor {
 
       final Process finalProcess = process;
       executorService = Executors.newSingleThreadExecutor();
-      Future<Integer> ft = executorService.submit(() -> finalProcess.waitFor());
+      Future<Integer> ft = executorService.submit((Callable<Integer>) finalProcess::waitFor);
       int exitCode;
       if (timeoutMilliseconds < 0) {
         exitCode = ft.get();
-- 
2.39.5