Auto-configure reactive Elasticsearch components

As of Spring Data Moore, a new reactive template and the
corresponding repositories support have been added.

This commit auto-configures a `ReactiveElasticsearchTemplate`
with the configuration properties under the
`spring.data.elasticsearch.client.reactive` namespace.
To enable this feature, applications require both Spring Data
Elasticsearch dependencies (typically
`spring-boot-starter-data-elasticsearch`) and dependencies
for a `WebClient` (often `spring-boot-starter-webflux`).

The support for the reactive Elasticsearch repositories is
also provided.

Closes gh-16214

Author: bclozel

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java

@@ -24,27 +24,30 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Elasticsearch
  * support.
  * <p>
- * Registers an {@link ElasticsearchTemplate} if no other bean of the same type is
- * configured.
+ * Registers an {@link ElasticsearchTemplate} if no other bean of the same type and the
+ * same name {@code "elasticsearchTemplate"} is configured.
  *
  * @author Brian Clozel
  * @author Artur Konczak
  * @author Mohsin Husen
  * @see EnableElasticsearchRepositories
+ * @see EnableReactiveElasticsearchRepositories
  * @since 1.1.0
  */
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass({ ElasticsearchTemplate.class })
 @AutoConfigureAfter({ ElasticsearchAutoConfiguration.class,
-		RestClientAutoConfiguration.class })
+		RestClientAutoConfiguration.class, ReactiveRestClientAutoConfiguration.class })
 @Import({ ElasticsearchDataConfiguration.BaseConfiguration.class,
 		ElasticsearchDataConfiguration.TransportClientConfiguration.class,
-		ElasticsearchDataConfiguration.RestHighLevelClientConfiguration.class })
+		ElasticsearchDataConfiguration.RestClientConfiguration.class,
+		ElasticsearchDataConfiguration.ReactiveRestClientConfiguration.class })
 public class ElasticsearchDataAutoConfiguration {
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.data.elasticsearch;
 
+import org.elasticsearch.action.support.IndicesOptions;
+import org.elasticsearch.action.support.WriteRequest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.RestHighLevelClient;
 
@@ -24,12 +26,20 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
+import org.springframework.data.elasticsearch.core.DefaultEntityMapper;
+import org.springframework.data.elasticsearch.core.DefaultResultMapper;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.EntityMapper;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.ResultsMapper;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.web.reactive.function.client.WebClient;
 
 /**
  * Configuration classes for Spring Data for Elasticsearch
@@ -57,19 +67,33 @@ public SimpleElasticsearchMappingContext mappingContext() {
 			return new SimpleElasticsearchMappingContext();
 		}
 
+		@Bean
+		public EntityMapper entityMapper(
+				SimpleElasticsearchMappingContext mappingContext) {
+			return new DefaultEntityMapper(mappingContext);
+		}
+
+		@Bean
+		@ConditionalOnMissingBean
+		public ResultsMapper resultsMapper(
+				SimpleElasticsearchMappingContext mappingContext,
+				EntityMapper entityMapper) {
+			return new DefaultResultMapper(mappingContext, entityMapper);
+		}
+
 	}
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(RestHighLevelClient.class)
-	static class RestHighLevelClientConfiguration {
+	static class RestClientConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean(value = ElasticsearchOperations.class,
 				name = "elasticsearchTemplate")
 		@ConditionalOnBean(RestHighLevelClient.class)
 		public ElasticsearchRestTemplate elasticsearchTemplate(RestHighLevelClient client,
-				ElasticsearchConverter converter) {
-			return new ElasticsearchRestTemplate(client, converter);
+				ElasticsearchConverter converter, ResultsMapper resultsMapper) {
+			return new ElasticsearchRestTemplate(client, converter, resultsMapper);
 		}
 
 	}
@@ -83,9 +107,9 @@ static class TransportClientConfiguration {
 				name = "elasticsearchTemplate")
 		@ConditionalOnBean(Client.class)
 		public ElasticsearchTemplate elasticsearchTemplate(Client client,
-				ElasticsearchConverter converter) {
+				ElasticsearchConverter converter, ResultsMapper resultsMapper) {
 			try {
-				return new ElasticsearchTemplate(client, converter);
+				return new ElasticsearchTemplate(client, converter, resultsMapper);
 			}
 			catch (Exception ex) {
 				throw new IllegalStateException(ex);
@@ -94,4 +118,24 @@ public ElasticsearchTemplate elasticsearchTemplate(Client client,
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass({ WebClient.class, ReactiveElasticsearchOperations.class })
+	static class ReactiveRestClientConfiguration {
+
+		@Bean
+		@ConditionalOnMissingBean(value = ReactiveElasticsearchOperations.class,
+				name = "reactiveElasticsearchTemplate")
+		@ConditionalOnBean(ReactiveElasticsearchClient.class)
+		public ReactiveElasticsearchTemplate reactiveElasticsearchTemplate(
+				ReactiveElasticsearchClient client, ElasticsearchConverter converter,
+				ResultsMapper resultsMapper) {
+			ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(
+					client, converter, resultsMapper);
+			template.setIndicesOptions(IndicesOptions.strictExpandOpenAndForbidClosed());
+			template.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+			return template;
+		}
+
+	}
+
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesAutoConfiguration.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.data.elasticsearch;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
+import org.springframework.data.elasticsearch.repository.ReactiveElasticsearchRepository;
+import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
+import org.springframework.data.elasticsearch.repository.support.ReactiveElasticsearchRepositoryFactoryBean;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's Elasticsearch
+ * Reactive Repositories.
+ *
+ * @author Brian Clozel
+ * @see EnableReactiveElasticsearchRepositories
+ * @since 2.2.0
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass({ ReactiveElasticsearchClient.class,
+		ReactiveElasticsearchRepository.class })
+@ConditionalOnProperty(prefix = "spring.data.elasticsearch.repositories",
+		name = "enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnMissingBean(ReactiveElasticsearchRepositoryFactoryBean.class)
+@Import(ReactiveElasticsearchRepositoriesRegistrar.class)
+public class ReactiveElasticsearchRepositoriesAutoConfiguration {
+
+}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveElasticsearchRepositoriesRegistrar.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.data.elasticsearch;
+
+import java.lang.annotation.Annotation;
+
+import org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.data.elasticsearch.repository.config.EnableReactiveElasticsearchRepositories;
+import org.springframework.data.elasticsearch.repository.config.ReactiveElasticsearchRepositoryConfigurationExtension;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;
+
+/**
+ * {@link ImportBeanDefinitionRegistrar} used to auto-configure Spring Data Elasticsearch
+ * Reactive Repositories.
+ *
+ * @author Brian Clozel
+ * @since 2.2.0
+ */
+class ReactiveElasticsearchRepositoriesRegistrar
+		extends AbstractRepositoryConfigurationSourceSupport {
+
+	@Override
+	protected Class<? extends Annotation> getAnnotation() {
+		return EnableReactiveElasticsearchRepositories.class;
+	}
+
+	@Override
+	protected Class<?> getConfiguration() {
+		return EnableElasticsearchRepositoriesConfiguration.class;
+	}
+
+	@Override
+	protected RepositoryConfigurationExtension getRepositoryConfigurationExtension() {
+		return new ReactiveElasticsearchRepositoryConfigurationExtension();
+	}
+
+	@EnableReactiveElasticsearchRepositories
+	private static class EnableElasticsearchRepositoriesConfiguration {
+
+	}
+
+}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ReactiveRestClientAutoConfiguration.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.autoconfigure.data.elasticsearch;
+
+import reactor.netty.http.client.HttpClient;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.context.properties.PropertyMapper;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.elasticsearch.client.ClientConfiguration;
+import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient;
+import org.springframework.data.elasticsearch.client.reactive.ReactiveRestClients;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * {@link EnableAutoConfiguration Auto-configuration} for Elasticsearch Reactive REST
+ * clients.
+ *
+ * @author Brian Clozel
+ * @since 2.2.0
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass({ ReactiveRestClients.class, WebClient.class, HttpClient.class })
+@EnableConfigurationProperties(ReactiveRestClientProperties.class)
+public class ReactiveRestClientAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ClientConfiguration clientConfiguration(
+			ReactiveRestClientProperties properties) {
+		ClientConfiguration.MaybeSecureClientConfigurationBuilder builder = ClientConfiguration
+				.builder().connectedTo(properties.getEndpoints().toArray(new String[0]));
+		if (properties.isUseSsl()) {
+			builder.usingSsl();
+		}
+		configureTimeouts(builder, properties);
+		return builder.build();
+	}
+
+	private void configureTimeouts(
+			ClientConfiguration.TerminalClientConfigurationBuilder builder,
+			ReactiveRestClientProperties properties) {
+		PropertyMapper map = PropertyMapper.get();
+		map.from(properties.getConnectionTimeout()).whenNonNull()
+				.to(builder::withConnectTimeout);
+		map.from(properties.getSocketTimeout()).whenNonNull()
+				.to(builder::withSocketTimeout);
+		map.from(properties.getUsername()).whenHasText().to((username) -> {
+			HttpHeaders headers = new HttpHeaders();
+			headers.setBasicAuth(username, properties.getPassword());
+			builder.withDefaultHeaders(headers);
+		});
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ReactiveElasticsearchClient reactiveElasticsearchClient(
+			ClientConfiguration clientConfiguration) {
+		return ReactiveRestClients.create(clientConfiguration);
+	}
+
+}