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 index 9e3f539a9..83e6cd27d 100644 --- 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 index 864d03dd0..8050085d3 100644 --- a/src/test/java/org/springframework/data/elasticsearch/client/elc/DevTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/client/elc/DevTests.java @@ -19,9 +19,6 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.FieldValue; -import co.elastic.clients.elasticsearch._types.Script; -import co.elastic.clients.elasticsearch._types.mapping.RuntimeField; -import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType; import co.elastic.clients.elasticsearch._types.mapping.TypeMapping; import co.elastic.clients.elasticsearch.cluster.HealthRequest; import co.elastic.clients.elasticsearch.cluster.HealthResponse; @@ -30,6 +27,8 @@ import co.elastic.clients.elasticsearch.core.SearchRequest; import co.elastic.clients.elasticsearch.core.search.ResponseBody; import co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesClient; +import co.elastic.clients.elasticsearch.indices.GetIndicesSettingsRequest; +import co.elastic.clients.elasticsearch.indices.GetIndicesSettingsResponse; import co.elastic.clients.elasticsearch.indices.IndexSettings; import co.elastic.clients.transport.ElasticsearchTransport; import co.elastic.clients.transport.TransportOptions; @@ -85,30 +84,12 @@ public class DevTests { void someTest() throws IOException { ElasticsearchClient client = imperativeElasticsearchClient; + ElasticsearchIndicesClient indicesClient = client.indices(); - String index = "testindex"; + indicesClient.create(b -> b.index("testindex")); - var p = new Product("p1", 42.0); - - client.index(ir -> ir // - .index(index)// - .document(p)); - - client.indices().flush(f -> f.index(index)); - - RuntimeField runtimeField = RuntimeField.of(rf -> rf // - .type(RuntimeFieldType.Double) // - .script(Script.of(s -> s // - .inline(i -> i. // - source("emit(doc['price'].value * 1.19)") // - ) // - )) // - ); // - - client.search(sr -> sr // - .index(index) // - .runtimeMappings("priceWithTax", runtimeField), // - Person.class); // + GetIndicesSettingsResponse getIndicesSettingsResponse = indicesClient + .getSettings(GetIndicesSettingsRequest.of(b -> b.index("testindex").includeDefaults(true))); } static class ReactiveClient { @@ -371,7 +352,7 @@ private ResponseBody 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 index 13efae806..8e1f6c7be 100644 --- 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 index a1696f2b8..0a0c31863 100755 --- 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 index 5af02c1f7..75e74b070 100644 --- 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 index 02b221d8f..bb28ae81d 100644 --- 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 index 7dfd87f6f..3f820a5c9 100644 --- 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 index e6e8935cc..0b0063867 100644 --- 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 {