Test code cleanup.

Original Pull Request #2572
Closes #2571

Author: sothawo

src/test/java/org/springframework/data/elasticsearch/NewElasticsearchClientDevelopment.java

@@ -45,11 +45,6 @@ IndexNameProvider indexNameProvider() {
 		}
 	}
 
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
-
 	@Override
 	protected Query nativeQueryForBoundingBox(String fieldName, double top, double left, double bottom, double right) {
 		return NativeQuery.builder() //

src/test/java/org/springframework/data/elasticsearch/core/geo/GeoELCIntegrationTests.java

@@ -26,7 +26,6 @@
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.GeoPointField;
 import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
@@ -56,16 +55,11 @@
  *         Latitude , max Longitude , max Latitude
  */
 @SpringIntegrationTest
-public abstract class GeoIntegrationTests implements NewElasticsearchClientDevelopment {
+public abstract class GeoIntegrationTests {
 
 	@Autowired private ElasticsearchOperations operations;
 	@Autowired private IndexNameProvider indexNameProvider;
 
-	boolean rhlcWithCluster8() {
-		var clusterVersion = ((AbstractElasticsearchTemplate) operations).getClusterVersion();
-		return (oldElasticsearchClient() && clusterVersion != null && clusterVersion.startsWith("8"));
-	}
-
 	@BeforeEach
 	public void before() {
 		indexNameProvider.increment();
@@ -227,7 +221,6 @@ public void shouldFindAnnotatedGeoMarkersInRangeForGivenCriteriaQueryUsingGeohas
 		assertThat(geoAuthorsForGeoCriteria).hasSize(3);
 	}
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test
 	public void shouldFindAllMarkersForNativeSearchQuery() {
 
@@ -245,7 +238,6 @@ public void shouldFindAllMarkersForNativeSearchQuery() {
 	protected abstract Query nativeQueryForBoundingBox(String fieldName, double top, double left, double bottom,
 			double right);
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test
 	public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingGeoBox() {
 
@@ -264,7 +256,6 @@ public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingGeoBox() {
 				.containsExactlyInAnyOrder("def", "ghi");
 	}
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test
 	public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingGeohash() {
 
@@ -283,7 +274,6 @@ public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingGeohash() {
 				.containsExactlyInAnyOrder("def", "ghi");
 	}
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test
 	public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingGeoPoints() {
 
@@ -302,7 +292,6 @@ public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingGeoPoints() {
 				.containsExactlyInAnyOrder("def", "ghi");
 	}
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test
 	public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingPoints() {
 
@@ -321,7 +310,6 @@ public void shouldFindAuthorMarkersInBoxForGivenCriteriaQueryUsingPoints() {
 				.containsExactlyInAnyOrder("def", "ghi");
 	}
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test
 	public void shouldFindLocationWithGeoHashPrefix() {
 

src/test/java/org/springframework/data/elasticsearch/core/geo/GeoIntegrationTests.java

@@ -23,9 +23,4 @@
  * @since 4.4
  */
 @ContextConfiguration(classes = { ElasticsearchTemplateConfiguration.class })
-public class IndexTemplateELCIntegrationTests extends IndexTemplateIntegrationTests {
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
-}
+public class IndexTemplateELCIntegrationTests extends IndexTemplateIntegrationTests { }

src/test/java/org/springframework/data/elasticsearch/core/index/IndexTemplateELCIntegrationTests.java

@@ -25,15 +25,12 @@
 import org.json.JSONException;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIf;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 import org.springframework.data.elasticsearch.annotations.Setting;
-import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.IndexOperations;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
@@ -47,16 +44,10 @@
  * @author Peter-Josef Meisch
  */
 @SpringIntegrationTest
-public abstract class IndexTemplateIntegrationTests implements NewElasticsearchClientDevelopment {
+public abstract class IndexTemplateIntegrationTests {
 
 	@Autowired ElasticsearchOperations operations;
 
-	boolean rhlcWithCluster8() {
-		var clusterVersion = ((AbstractElasticsearchTemplate) operations).getClusterVersion();
-		return (oldElasticsearchClient() && clusterVersion != null && clusterVersion.startsWith("8"));
-	}
-
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test // DATAES-612
 	void shouldPutTemplate() {
 
@@ -78,7 +69,6 @@ void shouldPutTemplate() {
 		assertThat(acknowledged).isTrue();
 	}
 
-	@DisabledIf(value = "oldElasticsearchClient", disabledReason = "not implemented for the deprecated old client")
 	@Test // #1458
 	@DisplayName("should create component template")
 	void shouldCreateComponentTemplate() {
@@ -108,7 +98,6 @@ void shouldCreateComponentTemplate() {
 		assertThat(acknowledged).isTrue();
 	}
 
-	@DisabledIf(value = "oldElasticsearchClient", disabledReason = "not implemented for the deprecated old client")
 	@Test // #1458
 	@DisplayName("should get component template")
 	void shouldGetComponentTemplate() throws JSONException {
@@ -157,7 +146,6 @@ void shouldGetComponentTemplate() throws JSONException {
 		assertThat(alias2.getAlias()).isEqualTo("alias2");
 	}
 
-	@DisabledIf(value = "oldElasticsearchClient", disabledReason = "not implemented for the deprecated old client")
 	@Test // #1458
 	@DisplayName("should delete component template")
 	void shouldDeleteComponentTemplate() {
@@ -185,7 +173,6 @@ void shouldDeleteComponentTemplate() {
 		assertThat(exists).isFalse();
 	}
 
-	@DisabledIf(value = "oldElasticsearchClient", disabledReason = "not implemented for the deprecated old client")
 	@Test // #1458
 	@DisplayName("should put, get and delete index template with template")
 	void shouldPutGetAndDeleteIndexTemplateWithTemplate() {
@@ -225,7 +212,6 @@ void shouldPutGetAndDeleteIndexTemplateWithTemplate() {
 		assertThat(exists).isFalse();
 	}
 
-	@DisabledIf(value = "oldElasticsearchClient", disabledReason = "not implemented for the deprecated old client")
 	@Test // #1458
 	@DisplayName("should put, get and delete index template of components")
 	void shouldPutGetAndDeleteIndexTemplateOfComponents() {
@@ -316,7 +302,6 @@ void shouldReturnNullOnNonExistingGetTemplate() {
 		assertThat(templateData).isNull();
 	}
 
-	@DisabledIf(value = "rhlcWithCluster8", disabledReason = "RHLC fails to parse response from ES 8.2")
 	@Test // DATAES-612, #2073
 	void shouldGetTemplate() throws JSONException {
 		IndexOperations indexOps = operations.indexOps(IndexCoordinates.of("dont-care"));

src/test/java/org/springframework/data/elasticsearch/core/index/IndexTemplateIntegrationTests.java

@@ -37,9 +37,4 @@ IndexNameProvider indexNameProvider() {
 			return new IndexNameProvider("mappingbuilder");
 		}
 	}
-
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
 }

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderELCIntegrationTests.java

@@ -39,7 +39,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.annotations.*;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.IndexOperations;
@@ -64,8 +63,7 @@
  * @author Morgan Lutz
  */
 @SpringIntegrationTest
-public abstract class MappingBuilderIntegrationTests extends MappingContextBaseTests
-		implements NewElasticsearchClientDevelopment {
+public abstract class MappingBuilderIntegrationTests extends MappingContextBaseTests {
 
 	@Autowired private ElasticsearchOperations operations;
 	@Autowired protected IndexNameProvider indexNameProvider;

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java

@@ -35,9 +35,4 @@ IndexNameProvider indexNameProvider() {
 			return new IndexNameProvider("reactive-indexoperations");
 		}
 	}
-
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
 }

src/test/java/org/springframework/data/elasticsearch/core/index/ReactiveIndexOperationsELCIntegrationTests.java

@@ -30,7 +30,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
@@ -49,17 +48,12 @@
  * @author Peter-Josef Meisch
  */
 @SpringIntegrationTest
-public abstract class ReactiveIndexOperationsIntegrationTests implements NewElasticsearchClientDevelopment {
+public abstract class ReactiveIndexOperationsIntegrationTests {
 
 	@Autowired private ReactiveElasticsearchOperations operations;
 	@Autowired private IndexNameProvider indexNameProvider;
 	private ReactiveIndexOperations indexOperations;
 
-	boolean rhlcWithCluster8() {
-		var clusterVersion = ((AbstractReactiveElasticsearchTemplate) operations).getClusterVersion().block();
-		return (oldElasticsearchClient() && clusterVersion != null && clusterVersion.startsWith("8"));
-	}
-
 	@BeforeEach
 	void setUp() {
 		indexNameProvider.increment();

src/test/java/org/springframework/data/elasticsearch/core/index/ReactiveIndexOperationsIntegrationTests.java

@@ -35,9 +35,4 @@ IndexNameProvider indexNameProvider() {
 			return new IndexNameProvider("reactive-index-template");
 		}
 	}
-
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
 }