Fix code quality issues

7 files changed, 38 insertions, 39 deletions

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClient.java b/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClient.java
index eeb66afc1ac..8233054a817 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClient.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/es/EsClient.java
@@ -92,12 +92,11 @@ import static org.sonar.server.es.EsRequestDetails.computeDetailsAsString;
  * with context) and profiling of requests.
  */
 public class EsClient implements Closeable {
+  public static final Logger LOGGER = Loggers.get("es");
   private static final String ES_USERNAME = "elastic";
   private final RestHighLevelClient restHighLevelClient;
   private final Gson gson;
 
-  public static final Logger LOGGER = Loggers.get("es");
-
   public EsClient(HttpHost... hosts) {
     this(new MinimalRestHighLevelClient(null, hosts));
   }
@@ -274,6 +273,10 @@ public class EsClient implements Closeable {
       super(buildHttpClient(searchPassword, hosts));
     }
 
+    MinimalRestHighLevelClient(RestClient restClient) {
+      super(restClient, RestClient::close, Lists.newArrayList());
+    }
+
     @NotNull
     private static RestClientBuilder buildHttpClient(@Nullable String searchPassword,
       HttpHost[] hosts) {
@@ -296,9 +299,6 @@ public class EsClient implements Closeable {
       return provider;
     }
 
-    MinimalRestHighLevelClient(RestClient restClient) {
-      super(restClient, RestClient::close, Lists.newArrayList());
-    }
   }
 
   <R> R execute(EsRequestExecutor<R> executor) {
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/measure/DebtRatingGrid.java b/server/sonar-server-common/src/main/java/org/sonar/server/measure/DebtRatingGrid.java
index a726267e519..a0fc119f686 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/measure/DebtRatingGrid.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/measure/DebtRatingGrid.java
@@ -62,7 +62,7 @@ public class DebtRatingGrid {
   private static EnumMap<Rating, Bounds> buildRatingBounds(double[] gridValues) {
     checkState(gridValues.length == 4, "Rating grid should contains 4 values");
     EnumMap<Rating, Bounds> ratingBounds = new EnumMap<>(Rating.class);
-    ratingBounds.put(A, new Bounds(0d, gridValues[0]));
+    ratingBounds.put(A, new Bounds(0D, gridValues[0]));
     ratingBounds.put(B, new Bounds(gridValues[0], gridValues[1]));
     ratingBounds.put(C, new Bounds(gridValues[1], gridValues[2]));
     ratingBounds.put(D, new Bounds(gridValues[2], gridValues[3]));
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndex.java b/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndex.java
index dd1c529d799..40ff6350176 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndex.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/rule/index/RuleIndex.java
@@ -217,7 +217,7 @@ public class RuleIndex {
       .stream().map(token -> boolQuery().should(
       matchQuery(
         SEARCH_GRAMS_ANALYZER.subField(FIELD_RULE_NAME),
-        StringUtils.left(token, DefaultIndexSettings.MAXIMUM_NGRAM_LENGTH)).boost(20f))
+        StringUtils.left(token, DefaultIndexSettings.MAXIMUM_NGRAM_LENGTH)).boost(20F))
       .should(
         matchPhraseQuery(
           ENGLISH_HTML_ANALYZER.subField(FIELD_RULE_HTML_DESCRIPTION),
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java
index 7ff947d2c54..82647a6ec02 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/issue/index/IssueIteratorFactoryTest.java
@@ -91,7 +91,7 @@ public class IssueIteratorFactoryTest {
     assertThat(issue.directoryPath()).isEqualTo("src/main/java");
     assertThat(issue.filePath()).isEqualTo("src/main/java/Action.java");
     assertThat(issue.getTags()).containsOnly("tag1", "tag2", "tag3");
-    assertThat(issue.effort().toMinutes()).isGreaterThan(0L);
+    assertThat(issue.effort().toMinutes()).isPositive();
     assertThat(issue.type().getDbConstant()).isEqualTo(2);
   }
 
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java
index b41cd8980b4..ef1c1044962 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/project/ProjectTest.java
@@ -59,21 +59,20 @@ public class ProjectTest {
     Project project1 = new Project("U1", "K1", "N1", null, emptyList());
     Project project2 = new Project("U1", "K1", "N1", "D1", emptyList());
 
-    assertThat(project1).isEqualTo(project1);
-    assertThat(project1).isNotEqualTo(null);
-    assertThat(project1).isNotEqualTo(new Object());
-    assertThat(project1).isEqualTo(new Project("U1", "K1", "N1", null, emptyList()));
-    assertThat(project1).isNotEqualTo(new Project("U1", "K2", "N1", null, emptyList()));
-    assertThat(project1).isNotEqualTo(new Project("U1", "K1", "N2", null, emptyList()));
-    assertThat(project1).isEqualTo(project2);
+    assertThat(project1).isEqualTo(project1)
+      .isNotEqualTo(null)
+      .isNotEqualTo(new Object())
+      .isEqualTo(new Project("U1", "K1", "N1", null, emptyList()))
+      .isNotEqualTo(new Project("U1", "K2", "N1", null, emptyList()))
+      .isNotEqualTo(new Project("U1", "K1", "N2", null, emptyList()))
+      .isEqualTo(project2);
 
-    assertThat(project1.hashCode()).isEqualTo(project1.hashCode());
-    assertThat(project1.hashCode()).isNotEqualTo(null);
+    assertThat(project1).hasSameHashCodeAs(project1);
     assertThat(project1.hashCode()).isNotEqualTo(new Object().hashCode());
-    assertThat(project1.hashCode()).isEqualTo(new Project("U1", "K1", "N1", null, emptyList()).hashCode());
+    assertThat(project1).hasSameHashCodeAs(new Project("U1", "K1", "N1", null, emptyList()));
     assertThat(project1.hashCode()).isNotEqualTo(new Project("U1", "K2", "N1", null, emptyList()).hashCode());
     assertThat(project1.hashCode()).isNotEqualTo(new Project("U1", "K1", "N2", null, emptyList()).hashCode());
-    assertThat(project1.hashCode()).isEqualTo(project2.hashCode());
+    assertThat(project1).hasSameHashCodeAs(project2);
   }
 
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/HotspotRuleDescriptionTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/rule/HotspotRuleDescriptionTest.java
index f936c385a00..dde32340f59 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/HotspotRuleDescriptionTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/rule/HotspotRuleDescriptionTest.java
@@ -63,7 +63,7 @@ public class HotspotRuleDescriptionTest {
 
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
-    assertThat(result.getRisk().get()).isEqualTo(description);
+    assertThat(result.getRisk()).contains(description);
     assertThat(result.getVulnerable()).isEmpty();
     assertThat(result.getFixIt()).isEmpty();
   }
@@ -85,8 +85,8 @@ public class HotspotRuleDescriptionTest {
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
     assertThat(result.getRisk()).isEmpty();
-    assertThat(result.getVulnerable().get()).isEqualTo(ASKATRISK);
-    assertThat(result.getFixIt().get()).isEqualTo(RECOMMENTEDCODINGPRACTICE);
+    assertThat(result.getVulnerable()).contains(ASKATRISK);
+    assertThat(result.getFixIt()).contains(RECOMMENTEDCODINGPRACTICE);
   }
 
   @Test
@@ -95,9 +95,9 @@ public class HotspotRuleDescriptionTest {
 
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
-    assertThat(result.getRisk().get()).isEqualTo(DESCRIPTION);
+    assertThat(result.getRisk()).contains(DESCRIPTION);
     assertThat(result.getVulnerable()).isEmpty();
-    assertThat(result.getFixIt().get()).isEqualTo(RECOMMENTEDCODINGPRACTICE);
+    assertThat(result.getFixIt()).contains(RECOMMENTEDCODINGPRACTICE);
   }
 
   @Test
@@ -106,8 +106,8 @@ public class HotspotRuleDescriptionTest {
 
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
-    assertThat(result.getRisk().get()).isEqualTo(DESCRIPTION);
-    assertThat(result.getVulnerable().get()).isEqualTo(ASKATRISK);
+    assertThat(result.getRisk()).contains(DESCRIPTION);
+    assertThat(result.getVulnerable()).contains(ASKATRISK);
     assertThat(result.getFixIt()).isEmpty();
   }
 
@@ -117,9 +117,9 @@ public class HotspotRuleDescriptionTest {
 
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
-    assertThat(result.getRisk().get()).isEqualTo(DESCRIPTION);
-    assertThat(result.getVulnerable().get()).isEqualTo(NONCOMPLIANTCODE);
-    assertThat(result.getFixIt().get()).isEqualTo(COMPLIANTCODE);
+    assertThat(result.getRisk()).contains(DESCRIPTION);
+    assertThat(result.getVulnerable()).contains(NONCOMPLIANTCODE);
+    assertThat(result.getFixIt()).contains(COMPLIANTCODE);
   }
 
   @Test
@@ -128,10 +128,10 @@ public class HotspotRuleDescriptionTest {
 
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
-    assertThat(result.getRisk().get()).isEqualTo(DESCRIPTION);
+    assertThat(result.getRisk()).contains(DESCRIPTION);
 
-    assertThat(result.getVulnerable().get()).isEqualTo(NONCOMPLIANTCODE);
-    assertThat(result.getFixIt().get()).isEqualTo(RECOMMENTEDCODINGPRACTICE + SEE);
+    assertThat(result.getVulnerable()).contains(NONCOMPLIANTCODE);
+    assertThat(result.getFixIt()).contains(RECOMMENTEDCODINGPRACTICE + SEE);
 
   }
 
@@ -141,9 +141,9 @@ public class HotspotRuleDescriptionTest {
 
     HotspotRuleDescription result = HotspotRuleDescription.from(dto);
 
-    assertThat(result.getRisk().get()).isEqualTo(DESCRIPTION);
-    assertThat(result.getVulnerable().get()).isEqualTo(ASKATRISK + SENSITIVECODE);
-    assertThat(result.getFixIt().get()).isEqualTo(RECOMMENTEDCODINGPRACTICE + SEE);
+    assertThat(result.getRisk()).contains(DESCRIPTION);
+    assertThat(result.getVulnerable()).contains(ASKATRISK + SENSITIVECODE);
+    assertThat(result.getFixIt()).contains(RECOMMENTEDCODINGPRACTICE + SEE);
   }
 
   @Test
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/security/SecurityReviewRatingTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/security/SecurityReviewRatingTest.java
index 33180576567..a6c88c5998d 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/security/SecurityReviewRatingTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/security/SecurityReviewRatingTest.java
@@ -68,10 +68,10 @@ public class SecurityReviewRatingTest {
   @Test
   public void compute_percent() {
     assertThat(computePercent(0, 0)).isEmpty();
-    assertThat(computePercent(0, 10).get()).isEqualTo(100.0);
-    assertThat(computePercent(1, 3).get()).isEqualTo(75.0);
+    assertThat(computePercent(0, 10)).contains(100.0);
+    assertThat(computePercent(1, 3)).contains(75.0);
     assertThat(computePercent(3, 4).get()).isEqualTo(57.14, DOUBLE_OFFSET);
-    assertThat(computePercent(10, 10).get()).isEqualTo(50.0);
-    assertThat(computePercent(10, 0).get()).isEqualTo(0.0);
+    assertThat(computePercent(10, 10)).contains(50.0);
+    assertThat(computePercent(10, 0)).contains(0.0);
   }
 }