Adapt to Elasticsearch client fix (ES client issue 286)

sothawo · sothawo · commit b55decd6db0b · 2022-09-23T07:32:48.000+02:00
Closes #2165
diff --git a/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java b/src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java
@@ -402,7 +402,6 @@ private SettingsParameter buildSettingsParameter(Class<?> clazz) {
 		settingsParameter.shards = 1;
 		settingsParameter.replicas = 1;
 		settingsParameter.refreshIntervall = "1s";
-		settingsParameter.indexStoreType = "fs";
 
 		if (settingAnnotation != null) {
 			processSettingAnnotation(settingAnnotation, settingsParameter);
@@ -516,7 +515,7 @@ Settings toSettings() {
 				index.append("refresh_interval", refreshIntervall);
 			}
 
-			if (indexStoreType != null) {
+			if (indexStoreType != null && !"fs".equals(indexStoreType)) {
 				index.append("store", new Settings().append("type", indexStoreType));
 			}
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/client/elc/DevTests.java b/src/test/java/org/springframework/data/elasticsearch/client/elc/DevTests.java
@@ -88,8 +88,8 @@ void someTest() throws IOException {
 
 		indicesClient.create(b -> b.index("testindex"));
 
-		GetIndicesSettingsResponse getIndicesSettingsResponse = indicesClient.getSettings(GetIndicesSettingsRequest
-				.of(b -> b.index("testindex").includeDefaults(true)));
+		GetIndicesSettingsResponse getIndicesSettingsResponse = indicesClient
+				.getSettings(GetIndicesSettingsRequest.of(b -> b.index("testindex").includeDefaults(true)));
 	}
 
 	static class ReactiveClient {
@@ -352,7 +352,7 @@ private ResponseBody<EntityAsMap> searchReactive(SearchRequest searchRequest) {
 
 	private ClientConfiguration clientConfiguration() {
 		return ClientConfiguration.builder() //
-				.connectedTo("thranduil.local.:9200")//
+				.connectedTo("localhost:9200")//
 				.withBasicAuth("elastic", "hcraescitsale").withProxy("localhost:8080") //
 				.withHeaders(() -> {
 					HttpHeaders headers = new HttpHeaders();
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchELCIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchELCIntegrationTests.java
@@ -91,11 +91,6 @@ public void shouldSortResultsBySortOptions() {
 						e -> assertThat(e.getId()).isEqualTo("2"));
 	}
 
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
-
 	@Override
 	protected Query queryWithIds(String... ids) {
 		return ELCQueries.queryWithIds(ids);
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java
@@ -48,7 +48,6 @@
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -60,7 +59,6 @@
 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.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -116,7 +114,7 @@
  * @author Sijia Liu
  */
 @SpringIntegrationTest
-public abstract class ElasticsearchIntegrationTests implements NewElasticsearchClientDevelopment {
+public abstract class ElasticsearchIntegrationTests {
 
 	static final Integer INDEX_MAX_RESULT_WINDOW = 10_000;
 
@@ -2782,7 +2780,6 @@ 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() {
 
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchELCIntegrationTests.java
@@ -57,11 +57,6 @@ IndexNameProvider indexNameProvider() {
 		}
 	}
 
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
-
 	@Override
 	protected Query getTermsAggsQuery(String aggsName, String aggsField) {
 		return ELCQueries.getTermsAggsQuery(aggsName, aggsField);
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchIntegrationTests.java
@@ -46,7 +46,6 @@
 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;
@@ -58,7 +57,6 @@
 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;
@@ -96,7 +94,7 @@
  */
 @SuppressWarnings("SpringJavaAutowiredMembersInspection")
 @SpringIntegrationTest
-public abstract class ReactiveElasticsearchIntegrationTests implements NewElasticsearchClientDevelopment {
+public abstract class ReactiveElasticsearchIntegrationTests {
 
 	@Autowired private ReactiveElasticsearchOperations operations;
 	@Autowired private IndexNameProvider indexNameProvider;
@@ -1065,7 +1063,6 @@ 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() {
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indices/IndexOperationsELCIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/indices/IndexOperationsELCIntegrationTests.java
@@ -36,9 +36,4 @@ IndexNameProvider indexNameProvider() {
 			return new IndexNameProvider("indexoperations");
 		}
 	}
-
-	@Override
-	public boolean newElasticsearchClient() {
-		return true;
-	}
 }
diff --git a/src/test/java/org/springframework/data/elasticsearch/core/indices/IndexOperationsIntegrationTests.java b/src/test/java/org/springframework/data/elasticsearch/core/indices/IndexOperationsIntegrationTests.java
@@ -27,11 +27,9 @@
 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.data.annotation.Id;
-import org.springframework.data.elasticsearch.NewElasticsearchClientDevelopment;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.annotations.Setting;
@@ -52,7 +50,7 @@
  * @author Peter-Josef Meisch
  */
 @SpringIntegrationTest
-public abstract class IndexOperationsIntegrationTests implements NewElasticsearchClientDevelopment {
+public abstract class IndexOperationsIntegrationTests {
 
 	@Autowired private ElasticsearchOperations operations;
 	private IndexOperations indexOperations;
@@ -73,7 +71,6 @@ void cleanup() {
 		operations.indexOps(IndexCoordinates.of(indexNameProvider.getPrefix() + "*")).delete();
 	}
 
-//	@DisabledIf(value = "newElasticsearchClient", disabledReason = "todo #2165, ES issue 286")
 	@Test // #1646, #1718
 	@DisplayName("should return a list of info for specific index")
 	void shouldReturnInformationList() throws JSONException {

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,6 @@ private SettingsParameter buildSettingsParameter(Class<?> clazz) {`
`402`	`402`	`settingsParameter.shards = 1;`
`403`	`403`	`settingsParameter.replicas = 1;`
`404`	`404`	`settingsParameter.refreshIntervall = "1s";`
`405`		`- settingsParameter.indexStoreType = "fs";`
`406`	`405`
`407`	`406`	`if (settingAnnotation != null) {`
`408`	`407`	`processSettingAnnotation(settingAnnotation, settingsParameter);`
`@@ -516,7 +515,7 @@ Settings toSettings() {`
`516`	`515`	`index.append("refresh_interval", refreshIntervall);`
`517`	`516`	`}`
`518`	`517`
`519`		`- if (indexStoreType != null) {`
	`518`	`+ if (indexStoreType != null && !"fs".equals(indexStoreType)) {`
`520`	`519`	`index.append("store", new Settings().append("type", indexStoreType));`
`521`	`520`	`}`
`522`	`521`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,6 @@ IndexNameProvider indexNameProvider() {`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- @Override`
`61`		`- public boolean newElasticsearchClient() {`
`62`		`- return true;`
`63`		`- }`
`64`		`-`
`65`	`60`	`@Override`
`66`	`61`	`protected Query getTermsAggsQuery(String aggsName, String aggsField) {`
`67`	`62`	`return ELCQueries.getTermsAggsQuery(aggsName, aggsField);`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,4 @@ IndexNameProvider indexNameProvider() {`
`36`	`36`	`return new IndexNameProvider("indexoperations");`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`-`
`40`		`- @Override`
`41`		`- public boolean newElasticsearchClient() {`
`42`		`- return true;`
`43`		`- }`
`44`	`39`	`}`