Fix Quality flaws

8 files changed, 12 insertions, 15 deletions

diff --git a/server/sonar-process/src/main/java/org/sonar/process/systeminfo/JvmStateSection.java b/server/sonar-process/src/main/java/org/sonar/process/systeminfo/JvmStateSection.java
index b5cf9c90f46..0c58e306455 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/systeminfo/JvmStateSection.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/systeminfo/JvmStateSection.java
@@ -24,6 +24,7 @@ import java.lang.management.MemoryMXBean;
 import java.lang.management.MemoryUsage;
 import java.lang.management.OperatingSystemMXBean;
 import java.lang.management.ThreadMXBean;
+import java.util.Locale;
 import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo;
 
 import static java.lang.String.format;
@@ -62,7 +63,7 @@ public class JvmStateSection implements SystemInfoSection {
     addAttributeInMb(protobuf, "Non Heap Max (MB)", nonHeap.getMax());
     addAttributeInMb(protobuf, "Non Heap Used (MB)", nonHeap.getUsed());
     OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean();
-    setAttribute(protobuf,"System Load Average", format("%.1f%% (last minute)", os.getSystemLoadAverage() * 100.0));
+    setAttribute(protobuf,"System Load Average", format(Locale.ENGLISH, "%.1f%% (last minute)", os.getSystemLoadAverage() * 100.0));
     ThreadMXBean thread = ManagementFactory.getThreadMXBean();
     setAttribute(protobuf, "Threads", thread.getThreadCount());
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java
index 425cfb9de3a..4c5b96896aa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStep.java
@@ -93,7 +93,6 @@ public class BuildComponentTreeStep implements ComputationStep {
 
   private ComponentKeyGenerator loadKeyGenerator() {
     return Stream.of(analysisMetadataHolder.getBranch(), Optional.of(new DefaultBranchImpl()))
-      // TODO pull request generator will be added here
       .filter(Optional::isPresent)
       .flatMap(x -> x.map(Stream::of).orElseGet(Stream::empty))
       .findFirst()
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/Facets.java b/server/sonar-server/src/main/java/org/sonar/server/es/Facets.java
index 625f15e3ebd..c45c4fd9fcf 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/Facets.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/Facets.java
@@ -179,11 +179,6 @@ public class Facets {
   }
 
   private LinkedHashMap<String, Long> getOrCreateFacet(String facetName) {
-    LinkedHashMap<String, Long> facet = facetsByName.get(facetName);
-    if (facet == null) {
-      facet = new LinkedHashMap<>();
-      facetsByName.put(facetName, facet);
-    }
-    return facet;
+    return facetsByName.computeIfAbsent(facetName, n -> new LinkedHashMap<>());
   }
 }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java b/server/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java
index 979cc3fe39b..3cde890717c 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/es/SearchResult.java
@@ -33,7 +33,7 @@ public class SearchResult<DOC extends BaseDoc> {
 
   public SearchResult(SearchResponse response, Function<Map<String, Object>, DOC> converter) {
     this.facets = new Facets(response);
-    this.total = response.getHits().totalHits();
+    this.total = response.getHits().getTotalHits();
     this.docs = EsUtils.convertToDocs(response.getHits(), converter);
   }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 4514dda8a3a..7e99634b893 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -344,7 +344,7 @@ public class SearchAction implements IssuesWsAction {
     facets = reorderFacets(facets, options.getFacets());
 
     // FIXME allow long in Paging
-    Paging paging = forPageIndex(options.getPage()).withPageSize(options.getLimit()).andTotal((int) result.getHits().totalHits());
+    Paging paging = forPageIndex(options.getPage()).withPageSize(options.getLimit()).andTotal((int) result.getHits().getTotalHits());
 
     return searchResponseFormat.formatSearch(additionalFields, data, paging, facets);
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java
index 5700c23bdc3..99d4a0e0dc6 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/EsStateSection.java
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.platform.monitoring;
 
+import java.util.Locale;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.cluster.node.stats.NodeStats;
 import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsResponse;
@@ -30,6 +31,7 @@ import org.sonar.process.systeminfo.SystemInfoSection;
 import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo;
 import org.sonar.server.es.EsClient;
 
+import static java.lang.String.format;
 import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
 import static org.sonar.process.systeminfo.SystemInfoUtils.setAttribute;
 
@@ -99,6 +101,6 @@ public class EsStateSection implements SystemInfoSection {
   }
 
   private static String formatPercent(long amount) {
-    return String.format("%.1f%%", 100 * amount * 1.0D / 100L);
+    return format(Locale.ENGLISH, "%.1f%%", 100 * amount * 1.0D / 100L);
   }
 }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java
index 77e46240cfa..ce735982ac1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java
@@ -291,7 +291,7 @@ public class EsTester extends ExternalResource {
   }
 
   public long countDocuments(IndexType indexType) {
-    return client().prepareSearch(indexType).setSize(0).get().getHits().totalHits();
+    return client().prepareSearch(indexType).setSize(0).get().getHits().getTotalHits();
   }
 
   /**
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java
index b8e1c83e4c9..4272c3a0fcf 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java
@@ -937,15 +937,15 @@ public class IssueIndexTest {
     // There are 12 issues in total, with 10 issues per page, the page 2 should only contain 2 elements
     SearchResponse result = underTest.search(query.build(), new SearchOptions().setPage(2, 10));
     assertThat(result.getHits().hits()).hasSize(2);
-    assertThat(result.getHits().totalHits()).isEqualTo(12);
+    assertThat(result.getHits().getTotalHits()).isEqualTo(12);
 
     result = underTest.search(IssueQuery.builder().build(), new SearchOptions().setOffset(0).setLimit(5));
     assertThat(result.getHits().hits()).hasSize(5);
-    assertThat(result.getHits().totalHits()).isEqualTo(12);
+    assertThat(result.getHits().getTotalHits()).isEqualTo(12);
 
     result = underTest.search(IssueQuery.builder().build(), new SearchOptions().setOffset(2).setLimit(0));
     assertThat(result.getHits().hits()).hasSize(10);
-    assertThat(result.getHits().totalHits()).isEqualTo(12);
+    assertThat(result.getHits().getTotalHits()).isEqualTo(12);
   }
 
   @Test