Rename EsTester factory methods

server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java

@@ -73,7 +73,7 @@ public class SsoAuthenticatorTest {
   @Rule
   public DbTester db = DbTester.create(new AlwaysIncreasingSystem2());
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private static final String DEFAULT_LOGIN = "john";
   private static final String DEFAULT_NAME = "John";

server/sonar-server/src/test/java/org/sonar/server/authentication/UserIdentityAuthenticatorTest.java

@@ -79,7 +79,7 @@ public class UserIdentityAuthenticatorTest {
   @Rule
   public DbTester db = DbTester.create(new AlwaysIncreasingSystem2());
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   private UserIndexer userIndexer = new UserIndexer(db.getDbClient(), es.client());
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
   private OrganizationCreation organizationCreation = mock(OrganizationCreation.class);

server/sonar-server/src/test/java/org/sonar/server/branch/pr/ws/ListActionTest.java

@@ -82,7 +82,7 @@ public class ListActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/branch/ws/ListActionTest.java

@@ -78,7 +78,7 @@ public class ListActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexSearchTest.java

@@ -45,7 +45,7 @@ import static org.sonar.db.component.ComponentTesting.newFileDto;
 
 public class ComponentIndexSearchTest {
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexTest.java

@@ -47,7 +47,7 @@ import static org.sonar.api.resources.Qualifiers.PROJECT;
 public abstract class ComponentIndexTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);

server/sonar-server/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java

@@ -52,7 +52,7 @@ public class ComponentIndexerTest {
   private System2 system2 = System2.INSTANCE;
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(system2);
 

server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java

@@ -85,7 +85,7 @@ public class SearchActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private I18nRule i18n = new I18nRule();
   private TestDefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);

server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java

@@ -110,7 +110,7 @@ public class SearchProjectsActionTest {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
 

server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java

@@ -89,7 +89,7 @@ public class SuggestionsActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
   public ResourceTypesRule resourceTypes = new ResourceTypesRule();

server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java

@@ -43,7 +43,7 @@ public class ScmAccountToUserLoaderTest {
   private static final String ORGANIZATION_UUID = "my-organization";
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java

@@ -43,7 +43,7 @@ public class BulkIndexerTest {
   private TestSystem2 testSystem2 = new TestSystem2().setNow(1_000L);
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition().setReplicas(1));
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition().setReplicas(1));
   @Rule
   public DbTester dbTester = DbTester.create(testSystem2);
 

server/sonar-server/src/test/java/org/sonar/server/es/EsClientTest.java

@@ -44,7 +44,7 @@ import static org.sonar.server.es.FakeIndexDefinition.INDEX_TYPE_FAKE;
 public class EsClientTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Test
   public void proxify_requests() {

server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java

@@ -101,7 +101,7 @@ public class EsTester extends ExternalResource {
   /**
    * New instance which contains the core indices (rules, issues, ...).
    */
-  public static EsTester core() {
+  public static EsTester create() {
     if (!CORE_INDICES_CREATED.get()) {
       Configuration config = new MapSettings().asConfig();
       List<IndexDefinitions.Index> createdIndices = createIndices(
@@ -123,7 +123,7 @@ public class EsTester extends ExternalResource {
    * New instance which contains the specified indices. Note that
    * core indices may exist.
    */
-  public static EsTester custom(IndexDefinition... definitions) {
+  public static EsTester createCustom(IndexDefinition... definitions) {
     createIndices(definitions);
     return new EsTester(true);
   }

server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java

@@ -48,7 +48,7 @@ public class IndexCreatorTest {
   public LogTester logTester = new LogTester();
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   private MetadataIndexDefinition metadataIndexDefinition = new MetadataIndexDefinition(new MapSettings().asConfig());
   private MetadataIndex metadataIndex = new MetadataIndex(es.client());

server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java

@@ -37,7 +37,7 @@ import static org.sonar.server.es.FakeIndexDefinition.INDEX_TYPE_FAKE;
 public class IndexerStartupTaskTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   private final MapSettings settings = new MapSettings();
   private final MetadataIndex metadataIndex = mock(MetadataIndex.class);

server/sonar-server/src/test/java/org/sonar/server/es/OneToManyResilientIndexingListenerTest.java

@@ -39,7 +39,7 @@ import static org.sonar.server.issue.index.IssueIndexDefinition.INDEX_TYPE_ISSUE
 public class OneToManyResilientIndexingListenerTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/es/OneToOneResilientIndexingListenerTest.java

@@ -39,7 +39,7 @@ import static org.sonar.server.issue.index.IssueIndexDefinition.INDEX_TYPE_ISSUE
 public class OneToOneResilientIndexingListenerTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java

@@ -63,7 +63,7 @@ public class RecoveryIndexerTest {
   private MapSettings emptySettings = new MapSettings();
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
   @Rule
   public DbTester db = DbTester.create(system2);
   @Rule

server/sonar-server/src/test/java/org/sonar/server/es/metadata/EsDbCompatibilityImplTest.java

@@ -38,7 +38,7 @@ public class EsDbCompatibilityImplTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule
-  public EsTester es = EsTester.custom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition());
   private DbClient dbClient = mock(DbClient.class, Mockito.RETURNS_DEEP_STUBS);
   private MigrationHistory migrationHistory = mock(MigrationHistory.class);
   private MetadataIndex metadataIndex = new MetadataIndex(es.client());

server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java

@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class MetadataIndexTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new MetadataIndexDefinitionBridge(), new FakeIndexDefinition());
   private final MetadataIndex underTest = new MetadataIndex(es.client());
   private final String index = randomAlphanumeric(20);
 

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyBulkRequestBuilderTest.java

@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ProxyBulkRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyClearCacheRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyClearCacheRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyCreateIndexRequestBuilderTest.java

@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
 public class ProxyCreateIndexRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyDeleteRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyDeleteRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyFlushRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyFlushRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyGetRequestBuilderTest.java

@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
 public class ProxyGetRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndexRequestBuilderTest.java

@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
 public class ProxyIndexRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesExistsRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyIndicesExistsRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyIndicesStatsRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyIndicesStatsRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyMultiGetRequestBuilderTest.java

@@ -36,7 +36,7 @@ import static org.junit.Assert.fail;
 public class ProxyMultiGetRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyNodesStatsRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ProxyNodesStatsRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyPutMappingRequestBuilderTest.java

@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
 public class ProxyPutMappingRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyRefreshRequestBuilderTest.java

@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
 public class ProxyRefreshRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchRequestBuilderTest.java

@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
 public class ProxySearchRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxySearchScrollRequestBuilderTest.java

@@ -34,7 +34,7 @@ import static org.junit.Assert.fail;
 public class ProxySearchScrollRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerHealthRequestBuilderTest.java

@@ -35,7 +35,7 @@ import static org.junit.Assert.fail;
 public class ProxyWebServerHealthRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStateRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyWebServerStateRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/es/request/ProxyWebServerStatsRequestBuilderTest.java

@@ -33,7 +33,7 @@ import static org.junit.Assert.fail;
 public class ProxyWebServerStatsRequestBuilderTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   @Rule
   public LogTester logTester = new LogTester();

server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java

@@ -38,7 +38,7 @@ import static org.mockito.Mockito.when;
 public class EsStatusClusterCheckTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   private final Random random = new Random();
   private EsStatusClusterCheck underTest = new EsStatusClusterCheck(es.client());

server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java

@@ -31,7 +31,7 @@ import static org.mockito.Mockito.when;
 public class EsStatusNodeCheckTest {
 
   @Rule
-  public EsTester es = EsTester.custom();
+  public EsTester es = EsTester.createCustom();
 
   private EsStatusNodeCheck underTest = new EsStatusNodeCheck(es.client());
 

server/sonar-server/src/test/java/org/sonar/server/issue/IssueUpdaterTest.java

@@ -68,7 +68,7 @@ public class IssueUpdaterTest {
   public DbTester dbTester = DbTester.create(system2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DbClient dbClient = dbTester.getDbClient();
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester);

server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexDebtTest.java

@@ -58,7 +58,7 @@ public class IssueIndexDebtTest {
   private System2 system2 = new TestSystem2().setNow(1_500_000_000_000L).setDefaultTimeZone(TimeZone.getTimeZone("GMT-01:00"));
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java

@@ -50,7 +50,7 @@ public class IssueIndexProjectStatisticsTest {
 
   private System2 system2 = mock(System2.class);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexTest.java

@@ -85,7 +85,7 @@ import static org.sonar.server.issue.IssueDocTesting.newDoc;
 public class IssueIndexTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexerTest.java

@@ -60,7 +60,7 @@ import static org.sonar.server.permission.index.AuthorizationTypeSupport.TYPE_AU
 public class IssueIndexerTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/issue/ws/AddCommentActionTest.java

@@ -79,7 +79,7 @@ public class AddCommentActionTest {
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();

server/sonar-server/src/test/java/org/sonar/server/issue/ws/AssignActionTest.java

@@ -74,7 +74,7 @@ public class AssignActionTest {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(system2);
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/AuthorsActionTest.java

@@ -42,7 +42,7 @@ public class AuthorsActionTest {
   @Rule
   public DbTester db = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/BulkChangeActionTest.java

@@ -99,7 +99,7 @@ public class BulkChangeActionTest {
   @Rule
   public DbTester db = DbTester.create(system2);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/DoTransitionActionTest.java

@@ -87,7 +87,7 @@ public class DoTransitionActionTest {
   public DbTester dbTester = DbTester.create(system2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();

server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java

@@ -89,7 +89,7 @@ public class SearchActionComponentsTest {
   @Rule
   public DbTester db = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DbClient dbClient = db.getDbClient();
   private IssueIndex issueIndex = new IssueIndex(es.client(), System2.INSTANCE, userSession, new AuthorizationTypeSupport(userSession));

server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java

@@ -95,7 +95,7 @@ public class SearchActionTest {
   @Rule
   public DbTester db = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetSeverityActionTest.java

@@ -77,7 +77,7 @@ public class SetSeverityActionTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java

@@ -76,7 +76,7 @@ public class SetTagsActionTest {
   @Rule
   public DbTester db = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTypeActionTest.java

@@ -78,7 +78,7 @@ public class SetTypeActionTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java

@@ -57,7 +57,7 @@ public class TagsActionTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private IssueIndexer issueIndexer = new IssueIndexer(es.client(), dbTester.getDbClient(), new IssueIteratorFactory(dbTester.getDbClient()));
   private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), dbTester.getDbClient());

server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/CreateActionTest.java

@@ -73,7 +73,7 @@ public class CreateActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DbClient dbClient = db.getDbClient();
   private ComponentDto project;

server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/MetricsActionTest.java

@@ -53,7 +53,7 @@ public class MetricsActionTest {
   private static final String DEFAULT_PROJECT_KEY = "project-key";
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/SearchActionTest.java

@@ -64,7 +64,7 @@ public class SearchActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private WsTester ws;
   private DbClient dbClient = db.getDbClient();

server/sonar-server/src/test/java/org/sonar/server/measure/custom/ws/UpdateActionTest.java

@@ -63,7 +63,7 @@ public class UpdateActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DbClient dbClient = db.getDbClient();
   private DbSession dbSession = db.getSession();

server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java

@@ -96,7 +96,7 @@ public class ProjectMeasuresIndexTest {
   private static final GroupDto GROUP2 = newGroupDto();
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();

server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTextSearchTest.java

@@ -56,7 +56,7 @@ public class ProjectMeasuresIndexTextSearchTest {
   private static final OrganizationDto ORG = OrganizationTesting.newOrganizationDto();
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();

server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexerTest.java

@@ -55,7 +55,7 @@ public class ProjectMeasuresIndexerTest {
   private System2 system2 = System2.INSTANCE;
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(system2);
 

server/sonar-server/src/test/java/org/sonar/server/organization/OrganizationCreationImplTest.java

@@ -89,7 +89,7 @@ public class OrganizationCreationImplTest {
   @Rule
   public DbTester db = DbTester.create(system2);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java

@@ -65,7 +65,7 @@ public class AddMemberActionTest {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone().logIn().setRoot();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   private UserIndex userIndex = new UserIndex(es.client(), System2.INSTANCE);
   @Rule
   public DbTester db = DbTester.create();

server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java

@@ -84,7 +84,7 @@ public class CreateActionTest {
   @Rule
   public DbTester dbTester = DbTester.create(system2).setDisableDefaultOrganization(true);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 

server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java

@@ -100,7 +100,7 @@ public class DeleteActionTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java

@@ -68,7 +68,7 @@ public class EnableSupportActionTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(dbTester);
   private OrganizationFlags organizationFlags = new OrganizationFlagsImpl(dbTester.getDbClient());

server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java

@@ -72,7 +72,7 @@ public class RemoveMemberActionTest {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone().logIn().setRoot();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create();
   private DbClient dbClient = db.getDbClient();

server/sonar-server/src/test/java/org/sonar/server/organization/ws/SearchMembersActionTest.java

@@ -60,7 +60,7 @@ public class SearchMembersActionTest {
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public DbTester db = DbTester.create();

server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerTest.java

@@ -53,7 +53,7 @@ public class PermissionIndexerTest {
   @Rule
   public DbTester db = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.custom(new FooIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FooIndexDefinition());
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/permission/ws/BasePermissionWsTest.java

@@ -53,7 +53,7 @@ public abstract class BasePermissionWsTest<A extends PermissionsWsAction> {
   public DbTester db = DbTester.create(new AlwaysIncreasingSystem2());
 
   @Rule
-  public EsTester es = EsTester.custom(new FooIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FooIndexDefinition());
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();

server/sonar-server/src/test/java/org/sonar/server/platform/BackendCleanupTest.java

@@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class BackendCleanupTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);

server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsIndexesSectionTest.java

@@ -35,7 +35,7 @@ import static org.sonar.server.platform.monitoring.SystemInfoTesting.assertThatA
 public class EsIndexesSectionTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private EsIndexesSection underTest = new EsIndexesSection(es.client());
 

server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/EsStateSectionTest.java

@@ -36,7 +36,7 @@ import static org.sonar.server.platform.monitoring.SystemInfoTesting.assertThatA
 public class EsStateSectionTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private EsStateSection underTest = new EsStateSection(es.client());
 

server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/EsClusterStateSectionTest.java

@@ -30,7 +30,7 @@ import static org.sonar.process.systeminfo.SystemInfoUtils.attribute;
 public class EsClusterStateSectionTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private EsClusterStateSection underTest = new EsClusterStateSection(es.client());
 

server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/SearchNodesInfoLoaderImplTest.java

@@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class SearchNodesInfoLoaderImplTest {
 
   @Rule
-  public EsTester es = EsTester.custom(new FakeIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FakeIndexDefinition());
 
   private SearchNodesInfoLoaderImpl underTest = new SearchNodesInfoLoaderImpl(es.client());
 

server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java

@@ -73,7 +73,7 @@ public class BulkUpdateKeyActionTest {
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone().logIn().setRoot();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(system2);
 

server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateVisibilityActionTest.java

@@ -85,7 +85,7 @@ public class UpdateVisibilityActionTest {
   @Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
   @Rule
-  public EsTester es = EsTester.custom(new FooIndexDefinition());
+  public EsTester es = EsTester.createCustom(new FooIndexDefinition());
   @Rule
   public UserSessionRule userSessionRule = UserSessionRule.standalone().logIn();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java

@@ -52,7 +52,7 @@ public class SearchActionTest {
   private static final OrganizationDto ORG = OrganizationTesting.newOrganizationDto();
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public ExpectedException expectedException = ExpectedException.none();

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java

@@ -56,7 +56,7 @@ public class QProfileComparisonTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DbClient db;
   private DbSession dbSession;

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java

@@ -77,7 +77,7 @@ public class QProfileRuleImplTest {
   @Rule
   public DbTester db = DbTester.create(system2);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   private RuleIndex ruleIndex = new RuleIndex(es.client(), system2);

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java

@@ -59,7 +59,7 @@ public class QProfileTreeImplTest {
   @Rule
   public DbTester db = DbTester.create(system2);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   private ActiveRuleIndexer activeRuleIndexer = new ActiveRuleIndexer(db.getDbClient(), es.client());

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java

@@ -53,7 +53,7 @@ public class ActiveRuleIndexerTest {
   public DbTester db = DbTester.create(system2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private ActiveRuleIndexer underTest = new ActiveRuleIndexer(db.getDbClient(), es.client());
   private RuleDefinitionDto rule1;

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java

@@ -80,7 +80,7 @@ public class ChangeParentActionTest {
   @Rule
   public DbTester db = new DbTester(System2.INSTANCE, null);
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java

@@ -82,7 +82,7 @@ public class CreateActionTest {
   @Rule
   public DbTester db = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java

@@ -72,7 +72,7 @@ public class InheritanceActionTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public UserSessionRule userSession = UserSessionRule.standalone();
 

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java

@@ -77,7 +77,7 @@ public class QProfilesWsMediumTest {
   public UserSessionRule userSessionRule = UserSessionRule.standalone()
     .logIn().setRoot();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester dbTester = DbTester.create();
 

server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ShowActionTest.java

@@ -61,7 +61,7 @@ public class ShowActionTest {
   private static Languages LANGUAGES = new Languages(XOO1, XOO2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create();
   @Rule

server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java

@@ -103,7 +103,7 @@ public class RegisterRulesTest {
   @org.junit.Rule
   public DbTester dbTester = DbTester.create(system);
   @org.junit.Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @org.junit.Rule
   public LogTester logTester = new LogTester();
 

server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java

@@ -64,7 +64,7 @@ public class RuleCreatorTest {
   public DbTester dbTester = DbTester.create(system2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private RuleIndex ruleIndex = new RuleIndex(es.client(), system2);
   private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), dbTester.getDbClient());

server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java

@@ -77,7 +77,7 @@ public class RuleUpdaterTest {
   public DbTester db = DbTester.create(system2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private RuleIndex ruleIndex = new RuleIndex(es.client(), system2);
   private RuleIndexer ruleIndexer = new RuleIndexer(es.client(), db.getDbClient());

server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java

@@ -46,7 +46,7 @@ public class RuleIndexDefinitionTest {
   private RuleIndexDefinition underTest = new RuleIndexDefinition(settings.asConfig());
 
   @Rule
-  public EsTester tester = EsTester.core();
+  public EsTester tester = EsTester.create();
 
   @Test
   public void test_definition_of_index() {

server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexTest.java

@@ -90,7 +90,7 @@ public class RuleIndexTest {
   private System2 system2 = new AlwaysIncreasingSystem2();
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public DbTester db = DbTester.create(system2);
   @Rule

server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexerTest.java

@@ -45,7 +45,7 @@ import static org.elasticsearch.index.query.QueryBuilders.termQuery;
 public class RuleIndexerTest {
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   @Rule
   public DbTester dbTester = DbTester.create();

server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java

@@ -70,7 +70,7 @@ public class CreateActionTest {
   public DbTester db = DbTester.create(system2);
 
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
 

server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java

@@ -54,7 +54,7 @@ public class DeleteActionTest {
   @Rule
   public DbTester dbTester = DbTester.create();
   @Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
   @Rule
   public ExpectedException thrown = ExpectedException.none();
 

server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java

@@ -101,7 +101,7 @@ public class SearchActionTest {
   @org.junit.Rule
   public DbTester db = DbTester.create(system2);
   @org.junit.Rule
-  public EsTester es = EsTester.core();
+  public EsTester es = EsTester.create();
 
   private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db);
   private RuleIndex ruleIndex = new RuleIndex(es.client(), system2);