DATAES-537 - Upgrade to Elasticsearch 6.6.1.

Adapt tests to use new IndicesOptions defaults.

Original Pull Request: spring-projects#243

Author: mp911de

pom.xml

@@ -19,7 +19,7 @@
 
 	<properties>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>6.5.0</elasticsearch>
+		<elasticsearch>6.6.1</elasticsearch>
 		<log4j>2.9.1</log4j>
 		<springdata.commons>2.2.0.BUILD-SNAPSHOT</springdata.commons>
 		<java-module-name>spring.data.elasticsearch</java-module-name>

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java

@@ -80,6 +80,7 @@
 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 Mono<Status> status() {
 
 	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());
 	}
 
 	// -->

src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java

@@ -50,6 +50,7 @@
 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()));

src/test/java/org/springframework/data/elasticsearch/repository/support/SimpleElasticsearchRepositoryTests.java

@@ -277,7 +277,7 @@ public void shouldReturnTrueGivenDocumentWithIdExists() {
 
 	@Test // DATAES-363
 	public void shouldReturnFalseGivenDocumentWithIdDoesNotExist() {
-		
+
 		// given
 		String documentId = randomNumeric(5);
 

src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.5.0.jar renamed to src/test/resources/test-home-dir/modules/analysis-common/analysis-common-6.6.1.jar

@@ -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

src/test/resources/test-home-dir/modules/analysis-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

src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.5.0.jar renamed to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-dissect-6.6.1.jar

@@ -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

src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.5.0.jar renamed to src/test/resources/test-home-dir/modules/ingest-common/elasticsearch-grok-6.6.1.jar

@@ -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

src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.5.0.jar renamed to src/test/resources/test-home-dir/modules/ingest-common/ingest-common-6.6.1.jar

@@ -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

src/test/resources/test-home-dir/modules/ingest-common/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

src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.5.0.jar renamed to src/test/resources/test-home-dir/modules/lang-expression/lang-expression-6.6.1.jar

@@ -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