diff --git a/pom.xml b/pom.xml index 9be9dbdce..c3c0035da 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.6 - 6.5.0 + 6.6.1 2.9.1 2.2.0.BUILD-SNAPSHOT spring.data.elasticsearch diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java index c19cf11d7..640166b97 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java @@ -80,6 +80,7 @@ import org.elasticsearch.search.Scroll; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHits; import org.reactivestreams.Publisher; + import org.springframework.data.elasticsearch.ElasticsearchException; import org.springframework.data.elasticsearch.client.ClientConfiguration; import org.springframework.data.elasticsearch.client.ClientLogger; @@ -434,8 +435,9 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch private static GetResult getResponseToGetResult(GetResponse response) { - return new GetResult(response.getIndex(), response.getType(), response.getId(), response.getVersion(), - response.isExists(), response.getSourceAsBytesRef(), response.getFields()); + return new GetResult(response.getIndex(), response.getType(), response.getId(), response.getSeqNo(), + response.getPrimaryTerm(), response.getVersion(), response.isExists(), response.getSourceAsBytesRef(), + response.getFields()); } // --> diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java index 7734cf2d7..12cf7ea61 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java @@ -50,6 +50,7 @@ import org.elasticsearch.search.sort.SortOrder; import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.NoSuchIndexException; @@ -90,7 +91,7 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera private final EntityOperations operations; private @Nullable RefreshPolicy refreshPolicy = RefreshPolicy.IMMEDIATE; - private @Nullable IndicesOptions indicesOptions = IndicesOptions.strictExpandOpenAndForbidClosed(); + private @Nullable IndicesOptions indicesOptions = IndicesOptions.strictExpandOpenAndForbidClosedIgnoreThrottled(); public ReactiveElasticsearchTemplate(ReactiveElasticsearchClient client) { this(client, new MappingElasticsearchConverter(new SimpleElasticsearchMappingContext())); diff --git a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java index 1162455e9..2e5c821f4 100644 --- a/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java +++ b/src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java @@ -277,7 +277,7 @@ public class SimpleElasticsearchRepositoryTests { @Test // DATAES-363 public void shouldReturnFalseGivenDocumentWithIdDoesNotExist() { - + // given String documentId = randomNumeric(5); diff --git a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.5.0.jar b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.6.1.jar similarity index 68% rename from src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.5.0.jar rename to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.6.1.jar index 1419c9a07..2658939e2 100644 Binary files a/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.5.0.jar and b/src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties index a6a0ae9dd..34ad15eb6 100644 --- a/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/analysis-common/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Adds "built in" analyzers to Elasticsearch. # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=analysis-common @@ -35,7 +35,7 @@ classname=org.elasticsearch.analysis.common.CommonAnalysisPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.5.0.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.6.1.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.5.0.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.6.1.jar index faae21381..ad6ad4248 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.5.0.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.5.0.jar b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.6.1.jar similarity index 85% rename from src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.5.0.jar rename to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.6.1.jar index e7f166be4..1df28b0ea 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.5.0.jar and b/src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.5.0.jar b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.6.1.jar similarity index 86% rename from src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.5.0.jar rename to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.6.1.jar index 5e7c81652..4c7f81082 100644 Binary files a/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.5.0.jar and b/src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties index 8de780c98..ccbd2cd94 100644 --- a/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/ingest-common/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Module for ingest processors that do not require additional security permissions or have large dependencies and resources # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=ingest-common @@ -35,7 +35,7 @@ classname=org.elasticsearch.ingest.common.IngestCommonPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.5.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.6.1.jar similarity index 64% rename from src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.5.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.6.1.jar index 32571b0a0..44bc67adc 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.5.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.5.0.jar b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.6.0.jar similarity index 87% rename from src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.5.0.jar rename to src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.6.0.jar index d2b8033c3..2ba17e44d 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.5.0.jar and b/src/test/resources/test-home-dir/modules/lang-expression/lucene-expressions-7.6.0.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties index 2ff0578d3..46bf264c9 100644 --- a/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-expression/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Lucene expressions integration for Elasticsearch # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=lang-expression @@ -35,7 +35,7 @@ classname=org.elasticsearch.script.expression.ExpressionPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.5.0.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.5.0.jar deleted file mode 100644 index 61af88ee8..000000000 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.5.0.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.6.1.jar b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.6.1.jar new file mode 100644 index 000000000..bf0cf18de Binary files /dev/null and b/src/test/resources/test-home-dir/modules/lang-painless/elasticsearch-scripting-painless-spi-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.5.0.jar b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.6.1.jar similarity index 72% rename from src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.5.0.jar rename to src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.6.1.jar index 328eb54af..20d4fe281 100644 Binary files a/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.5.0.jar and b/src/test/resources/test-home-dir/modules/lang-painless/lang-painless-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties index 1a7b244c8..755480ed4 100644 --- a/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/lang-painless/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=An easy, safe and fast scripting language for Elasticsearch # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=lang-painless @@ -35,7 +35,7 @@ classname=org.elasticsearch.painless.PainlessPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.5.0.jar b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.6.1.jar similarity index 88% rename from src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.5.0.jar rename to src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.6.1.jar index b73ba7bec..b04fea76e 100644 Binary files a/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.5.0.jar and b/src/test/resources/test-home-dir/modules/mapper-extras/mapper-extras-6.6.1.jar differ diff --git a/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties index 9270f9b18..0b1f1123f 100644 --- a/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/mapper-extras/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Adds advanced field mappers # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=mapper-extras @@ -35,7 +35,7 @@ classname=org.elasticsearch.index.mapper.MapperExtrasPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties index 063327da1..609ce0e6a 100644 --- a/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/reindex/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=The Reindex module adds APIs to reindex from one index to another or update documents in place. # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=reindex @@ -35,7 +35,7 @@ classname=org.elasticsearch.index.reindex.ReindexPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties b/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties index cbced6899..4411a7c17 100644 --- a/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties +++ b/src/test/resources/test-home-dir/modules/repository-url/plugin-descriptor.properties @@ -20,7 +20,7 @@ description=Module for URL repository # # 'version': plugin's version -version=6.5.0 +version=6.6.1 # # 'name': the plugin name name=repository-url @@ -35,7 +35,7 @@ classname=org.elasticsearch.plugin.repository.url.URLRepositoryPlugin java.version=1.8 # # 'elasticsearch.version': version of elasticsearch compiled against -elasticsearch.version=6.5.0 +elasticsearch.version=6.6.1 ### optional elements for plugins: # # 'extended.plugins': other plugins this plugin extends through SPI diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.5.0.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.5.0.jar deleted file mode 100644 index 2f6e55496..000000000 Binary files a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.5.0.jar and /dev/null differ diff --git a/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.6.1.jar b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.6.1.jar new file mode 100644 index 000000000..f9a703bf9 Binary files /dev/null and b/src/test/resources/test-home-dir/modules/repository-url/repository-url-6.6.1.jar differ