spring-projects#2158 wip

Author: sothawo

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java

@@ -2783,6 +2783,7 @@ public void shouldNotIncludeDefaultsGetIndexSettings() {
 		assertThat(settings).doesNotContainKey("index.max_result_window");
 	}
 
+	@DisabledIf(value = "newElasticsearchClient", disabledReason = "todo #2165, ES issue 286")
 	@Test // DATAES-709
 	public void shouldIncludeDefaultsOnGetIndexSettings() {
 

src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java

@@ -56,6 +56,12 @@ IndexNameProvider indexNameProvider() {
 			return new IndexNameProvider("reactive-template");
 		}
 	}
+
+	@Override
+	public boolean newElasticsearchClient() {
+		return true;
+	}
+
 	@Override
 	protected Query getTermsAggsQuery(String aggsName, String aggsField) {
 		return ELCQueries.getTermsAggsQuery(aggsName, aggsField);

src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchIntegrationTests.java

@@ -45,6 +45,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
@@ -54,6 +55,7 @@
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.RestStatusException;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
@@ -88,7 +90,7 @@
  */
 @SuppressWarnings("SpringJavaAutowiredMembersInspection")
 @SpringIntegrationTest
-public abstract class ReactiveElasticsearchIntegrationTests {
+public abstract class ReactiveElasticsearchIntegrationTests implements NewElasticsearchClientDevelopment {
 
 	@Autowired private ReactiveElasticsearchOperations operations;
 	@Autowired private IndexNameProvider indexNameProvider;
@@ -1072,6 +1074,7 @@ void shouldReturnExplanationWhenRequested() {
 		}).verifyComplete();
 	}
 
+	@DisabledIf(value = "newElasticsearchClient", disabledReason = "todo #2165, ES issue 286")
 	@Test // #1646, #1718
 	@DisplayName("should return a list of info for specific index")
 	void shouldReturnInformationListOfAllIndices() {