Speed-up the unit tests relying on Elasticsearch

Creation of an index is slow in Elasticsearch. It should not executed
before each test.

server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java

@@ -56,8 +56,8 @@
 /**
  * Helper to bulk requests in an efficient way :
  * <ul>
- *   <li>bulk request is sent on the wire when its size is higher than 5Mb</li>
- *   <li>on large table indexing, replicas and automatic refresh can be temporarily disabled</li>
+ * <li>bulk request is sent on the wire when its size is higher than 5Mb</li>
+ * <li>on large table indexing, replicas and automatic refresh can be temporarily disabled</li>
  * </ul>
  */
 public class BulkIndexer {
@@ -160,6 +160,9 @@ public void addDeletion(SearchRequestBuilder searchRequest) {
       }
 
       String scrollId = searchResponse.getScrollId();
+      if (scrollId == null) {
+        break;
+      }
       searchResponse = client.prepareSearchScroll(scrollId).setScroll(TimeValue.timeValueMinutes(5)).get();
       if (hits.length == 0) {
         client.nativeClient().prepareClearScroll().addScrollId(scrollId).get();
@@ -179,7 +182,7 @@ public void addDeletion(IndexType indexType, String id, @Nullable String routing
   /**
    * Delete all the documents matching the given search request. This method is blocking.
    * Index is refreshed, so docs are not searchable as soon as method is executed.
-   *
+   * <p>
    * Note that the parameter indexType could be removed if progress logs are not needed.
    */
   public static IndexingResult delete(EsClient client, IndexType indexType, SearchRequestBuilder searchRequest) {
@@ -216,7 +219,9 @@ public void afterBulk(long executionId, BulkRequest req, Throwable e) {
   }
 
   public enum Size {
-    /** Use this size for a limited number of documents. */
+    /**
+     * Use this size for a limited number of documents.
+     */
     REGULAR {
       @Override
       SizeHandler createHandler(Runtime2 runtime2) {

server/sonar-server/src/main/java/org/sonar/server/es/IndexCreator.java

@@ -20,8 +20,10 @@
 package org.sonar.server.es;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
@@ -74,7 +76,7 @@ public void start() {
       createIndex(new Index(index), false);
     }
 
-    checkDbCompatibility();
+    checkDbCompatibility(definitions.getIndices().values());
 
     // create indices that do not exist or that have a new definition (different mapping, cluster enabled, ...)
     for (Index index : definitions.getIndices().values()) {
@@ -140,13 +142,13 @@ private boolean hasDefinitionChange(Index index) {
       }).orElse(true);
   }
 
-  private void checkDbCompatibility() {
+  private void checkDbCompatibility(Collection<Index> definitions) {
     boolean disabledCheck = configuration.getBoolean(PROPERY_DISABLE_CHECK).orElse(false);
     if (disabledCheck) {
       LOGGER.warn("Automatic drop of search indices in turned off (see property " + PROPERY_DISABLE_CHECK + ")");
     }
 
-    List<String> existingIndices = loadExistingIndicesExceptMetadata();
+    List<String> existingIndices = loadExistingIndicesExceptMetadata(definitions);
     if (!disabledCheck && !existingIndices.isEmpty()) {
       boolean delete = false;
       if (!esDbCompatibility.hasSameDbVendor()) {
@@ -163,8 +165,10 @@ private void checkDbCompatibility() {
     esDbCompatibility.markAsCompatible();
   }
 
-  private List<String> loadExistingIndicesExceptMetadata() {
+  private List<String> loadExistingIndicesExceptMetadata(Collection<Index> definitions) {
+    Set<String> definedNames = definitions.stream().map(Index::getName).collect(Collectors.toSet());
     return Arrays.stream(client.nativeClient().admin().indices().prepareGetIndex().get().getIndices())
+      .filter(definedNames::contains)
       .filter(index -> !MetadataIndexDefinition.INDEX_TYPE_METADATA.getIndex().equals(index))
       .collect(Collectors.toList());
   }

server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndexDefinition.java

@@ -19,8 +19,8 @@
  */
 package org.sonar.server.issue.index;
 
-import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.config.Configuration;
+import org.sonar.api.config.internal.MapSettings;
 import org.sonar.server.es.IndexDefinition;
 import org.sonar.server.es.IndexType;
 import org.sonar.server.es.NewIndex;
@@ -109,9 +109,8 @@ private IssueIndexDefinition(Configuration config, boolean enableSource) {
    * Keep the document sources in index so that indexer tests can verify content
    * of indexed documents.
    */
-  @VisibleForTesting
-  public static IssueIndexDefinition createForTest(Configuration config) {
-    return new IssueIndexDefinition(config, true);
+  public static IssueIndexDefinition createForTest() {
+    return new IssueIndexDefinition(new MapSettings().asConfig(), true);
   }
 
   @Override

server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java

@@ -19,11 +19,11 @@
  */
 package org.sonar.server.rule.index;
 
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
 import org.sonar.api.config.Configuration;
+import org.sonar.api.config.internal.MapSettings;
 import org.sonar.server.es.IndexDefinition;
 import org.sonar.server.es.IndexType;
 import org.sonar.server.es.NewIndex;
@@ -39,7 +39,7 @@
  */
 public class RuleIndexDefinition implements IndexDefinition {
 
-  static final String INDEX = "rules";
+  private static final String INDEX = "rules";
 
   public static final IndexType INDEX_TYPE_RULE = new IndexType(INDEX, "rule");
   public static final String FIELD_RULE_ID = "id";
@@ -66,7 +66,9 @@ public class RuleIndexDefinition implements IndexDefinition {
 
   // Rule extension fields
   public static final IndexType INDEX_TYPE_RULE_EXTENSION = new IndexType(INDEX, "ruleExtension");
-  /** The uuid of a {@link RuleExtensionScope} */
+  /**
+   * The uuid of a {@link RuleExtensionScope}
+   */
   public static final String FIELD_RULE_EXTENSION_SCOPE = "scope";
   public static final String FIELD_RULE_EXTENSION_RULE_ID = "ruleId";
   public static final String FIELD_RULE_EXTENSION_TAGS = "tags";
@@ -95,9 +97,8 @@ private RuleIndexDefinition(Configuration config, boolean enableSource) {
    * Keep the document sources in index so that indexer tests can verify content
    * of indexed documents.
    */
-  @VisibleForTesting
-  public static RuleIndexDefinition createForTest(Configuration config) {
-    return new RuleIndexDefinition(config, true);
+  public static RuleIndexDefinition createForTest() {
+    return new RuleIndexDefinition(new MapSettings().asConfig(), true);
   }
 
   @Override