Fix quality flaws

18 files changed, 22 insertions, 33 deletions

diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyBulkRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyBulkRequestBuilderTest.java
index b31c40f3fcf..929cff7ed07 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyBulkRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyBulkRequestBuilderTest.java
@@ -39,7 +39,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyBulkRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterHealthRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterHealthRequestBuilderTest.java
index 60fb4459b9b..94a6f75f1e1 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterHealthRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterHealthRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyClusterHealthRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStateRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStateRequestBuilderTest.java
index 671eef906dd..adb934cbc08 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStateRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStateRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyClusterStateRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStatsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStatsRequestBuilderTest.java
index 814a8e5fd46..d7263de3979 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStatsRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyClusterStatsRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyClusterStatsRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCountRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCountRequestBuilderTest.java
index e927fefe5b2..8b37cb6b1bb 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCountRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCountRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyCountRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCreateIndexRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCreateIndexRequestBuilderTest.java
index 054d0c94492..a083c03ec43 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCreateIndexRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyCreateIndexRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyCreateIndexRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteByQueryRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteByQueryRequestBuilderTest.java
index e053315b5fb..48bad6992c3 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteByQueryRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteByQueryRequestBuilderTest.java
@@ -34,7 +34,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyDeleteByQueryRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteRequestBuilderTest.java
index 128d6695d61..ec6897e1269 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyDeleteRequestBuilderTest.java
@@ -31,7 +31,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyDeleteRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyFlushRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyFlushRequestBuilderTest.java
index 354f333b3cc..7f4b3cb25d7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyFlushRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyFlushRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyFlushRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyGetRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyGetRequestBuilderTest.java
index 0ca52fe95f5..07c5c752b7f 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyGetRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyGetRequestBuilderTest.java
@@ -34,7 +34,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyGetRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesExistsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesExistsRequestBuilderTest.java
index 881bf7ff65c..175dc3095c6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesExistsRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesExistsRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyIndicesExistsRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesStatsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesStatsRequestBuilderTest.java
index 55b80f340c5..f7d19771995 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesStatsRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyIndicesStatsRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyIndicesStatsRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyMultiGetRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyMultiGetRequestBuilderTest.java
index eac43b06bb8..e581c86bbe7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyMultiGetRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyMultiGetRequestBuilderTest.java
@@ -36,7 +36,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyMultiGetRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyNodesStatsRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyNodesStatsRequestBuilderTest.java
index 0536a91cd1e..27c8cd4aa8a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyNodesStatsRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyNodesStatsRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyNodesStatsRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyPutMappingRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyPutMappingRequestBuilderTest.java
index c129c2bf663..386c83edd3a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyPutMappingRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyPutMappingRequestBuilderTest.java
@@ -38,7 +38,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyPutMappingRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyRefreshRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyRefreshRequestBuilderTest.java
index 3d3efb956b3..b68f59618f6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyRefreshRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxyRefreshRequestBuilderTest.java
@@ -34,7 +34,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxyRefreshRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchRequestBuilderTest.java
index 682d6a68f81..011ed411811 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchRequestBuilderTest.java
@@ -33,7 +33,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxySearchRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
diff --git a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchScrollRequestBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchScrollRequestBuilderTest.java
index 34f5db920c0..773e3246f0b 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchScrollRequestBuilderTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/search/request/ProxySearchScrollRequestBuilderTest.java
@@ -20,14 +20,11 @@
 
 package org.sonar.server.search.request;
 
-import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.common.unit.TimeValue;
 import org.junit.After;
 import org.junit.Test;
 import org.sonar.api.config.Settings;
 import org.sonar.core.profiling.Profiling;
-import org.sonar.server.search.IndexDefinition;
 import org.sonar.server.search.SearchClient;
 
 import static org.fest.assertions.Assertions.assertThat;
@@ -35,7 +32,7 @@ import static org.fest.assertions.Fail.fail;
 
 public class ProxySearchScrollRequestBuilderTest {
 
-  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.FULL.name()));
+  Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.NONE.name()));
   SearchClient searchClient = new SearchClient(new Settings(), profiling);
 
   @After
@@ -46,17 +43,13 @@ public class ProxySearchScrollRequestBuilderTest {
   @Test
   public void search_scroll() {
     try {
-      SearchResponse search = searchClient.prepareSearch(IndexDefinition.RULE.getIndexName())
-        .setSearchType(SearchType.SCAN)
-        .setScroll(TimeValue.timeValueSeconds(3L))
-        .get();
-      searchClient.prepareSearchScroll(search.getScrollId()).get();
+      searchClient.prepareSearchScroll("scrollId").get();
 
       // expected to fail because elasticsearch is not correctly configured, but that does not matter
       fail();
     } catch (Exception e) {
       assertThat(e).isInstanceOf(IllegalStateException.class);
-      assertThat(e.getMessage()).contains("Fail to execute ES search request '{}' on indices '[rules]'");
+      assertThat(e.getMessage()).contains("Fail to execute ES search scroll request for scroll id 'null'");
     }
   }
 
@@ -65,17 +58,13 @@ public class ProxySearchScrollRequestBuilderTest {
     Profiling profiling = new Profiling(new Settings().setProperty(Profiling.CONFIG_PROFILING_LEVEL, Profiling.Level.BASIC.name()));
     SearchClient searchClient = new SearchClient(new Settings(), profiling);
     try {
-      SearchResponse search = searchClient.prepareSearch(IndexDefinition.RULE.getIndexName())
-        .setSearchType(SearchType.SCAN)
-        .setScroll(TimeValue.timeValueSeconds(3L))
-        .get();
-      searchClient.prepareSearchScroll(search.getScrollId()).get();
+      searchClient.prepareSearchScroll("scrollId").get();
 
       // expected to fail because elasticsearch is not correctly configured, but that does not matter
       fail();
     } catch (Exception e) {
       assertThat(e).isInstanceOf(IllegalStateException.class);
-      assertThat(e.getMessage()).contains("Fail to execute ES search request '{}' on indices '[rules]'");
+      assertThat(e.getMessage()).contains("Fail to execute ES search scroll request for scroll id 'null'");
     }
     searchClient.stop();
   }