Merge branch '2.7.x'

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

@@ -22,6 +22,8 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientConfigurations.RestClientBuilderConfiguration;
+import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientConfigurations.RestClientConfiguration;
+import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientConfigurations.RestClientFromRestHighLevelClientConfiguration;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientConfigurations.RestClientSnifferConfiguration;
 import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientConfigurations.RestHighLevelClientConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -38,6 +40,7 @@ import org.springframework.context.annotation.Import;
 @ConditionalOnClass(RestClientBuilder.class)
 @EnableConfigurationProperties({ ElasticsearchProperties.class, ElasticsearchRestClientProperties.class })
 @Import({ RestClientBuilderConfiguration.class, RestHighLevelClientConfiguration.class,
+		RestClientFromRestHighLevelClientConfiguration.class, RestClientConfiguration.class,
 		RestClientSnifferConfiguration.class })
 public class ElasticsearchRestClientAutoConfiguration {
 

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

@@ -35,6 +35,7 @@ import org.elasticsearch.client.sniff.SnifferBuilder;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
 import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.context.annotation.Bean;
@@ -45,6 +46,7 @@ import org.springframework.util.StringUtils;
  * Elasticsearch rest client configurations.
  *
  * @author Stephane Nicoll
+ * @author Filip Hrisafov
  */
 class ElasticsearchRestClientConfigurations {
 
@@ -123,15 +125,39 @@ class ElasticsearchRestClientConfigurations {
 
 	@SuppressWarnings("deprecation")
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(Sniffer.class)
+	@ConditionalOnClass(org.elasticsearch.client.RestHighLevelClient.class)
 	@ConditionalOnSingleCandidate(org.elasticsearch.client.RestHighLevelClient.class)
+	@ConditionalOnMissingBean(RestClient.class)
+	static class RestClientFromRestHighLevelClientConfiguration {
+
+		@Bean
+		RestClient elasticsearchRestClient(org.elasticsearch.client.RestHighLevelClient restHighLevelClient) {
+			return restHighLevelClient.getLowLevelClient();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnMissingClass("org.elasticsearch.client.RestHighLevelClient")
+	@ConditionalOnMissingBean(RestClient.class)
+	static class RestClientConfiguration {
+
+		@Bean
+		RestClient elasticsearchRestClient(RestClientBuilder restClientBuilder) {
+			return restClientBuilder.build();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnClass(Sniffer.class)
+	@ConditionalOnSingleCandidate(RestClient.class)
 	static class RestClientSnifferConfiguration {
 
 		@Bean
 		@ConditionalOnMissingBean
-		Sniffer elasticsearchSniffer(org.elasticsearch.client.RestHighLevelClient client,
-				ElasticsearchRestClientProperties properties) {
-			SnifferBuilder builder = Sniffer.builder(client.getLowLevelClient());
+		Sniffer elasticsearchSniffer(RestClient client, ElasticsearchRestClientProperties properties) {
+			SnifferBuilder builder = Sniffer.builder(client);
 			PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
 			Duration interval = properties.getSniffer().getInterval();
 			map.from(interval).asInt(Duration::toMillis).to(builder::setSniffIntervalMillis);

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationIntegrationTests.java

@@ -16,13 +16,19 @@
 
 package org.springframework.boot.autoconfigure.elasticsearch;
 
+import java.io.InputStream;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.elasticsearch.action.get.GetRequest;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.client.Request;
 import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.client.RestClient;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.elasticsearch.ElasticsearchContainer;
 import org.testcontainers.junit.jupiter.Container;
@@ -40,6 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Brian Clozel
  * @author Vedran Pavic
  * @author Evgeniy Cheban
+ * @author Filip Hrisafov
  */
 @Testcontainers(disabledWithoutDocker = true)
 class ElasticsearchRestClientAutoConfigurationIntegrationTests {
@@ -53,7 +60,7 @@ class ElasticsearchRestClientAutoConfigurationIntegrationTests {
 
 	@Test
 	@SuppressWarnings("deprecation")
-	void restClientCanQueryElasticsearchNode() {
+	void restHighLevelClientCanQueryElasticsearchNode() {
 		this.contextRunner
 				.withPropertyValues("spring.elasticsearch.uris=" + elasticsearch.getHttpHostAddress(),
 						"spring.elasticsearch.connection-timeout=120s", "spring.elasticsearch.socket-timeout=120s")
@@ -70,4 +77,23 @@ class ElasticsearchRestClientAutoConfigurationIntegrationTests {
 				});
 	}
 
+	@Test
+	void restClientCanQueryElasticsearchNode() {
+		this.contextRunner
+				.withPropertyValues("spring.elasticsearch.uris=" + elasticsearch.getHttpHostAddress(),
+						"spring.elasticsearch.connection-timeout=120s", "spring.elasticsearch.socket-timeout=120s")
+				.run((context) -> {
+					RestClient client = context.getBean(RestClient.class);
+					Request index = new Request("PUT", "/test/_doc/2");
+					index.setJsonEntity("{" + "  \"a\": \"alpha\"," + "  \"b\": \"bravo\"" + "}");
+					client.performRequest(index);
+					Request getRequest = new Request("GET", "/test/_doc/2");
+					Response response = client.performRequest(getRequest);
+					try (InputStream input = response.getEntity().getContent()) {
+						JsonNode result = new ObjectMapper().readTree(input);
+						assertThat(result.path("found").asBoolean()).isTrue();
+					}
+				});
+	}
+
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/ElasticsearchRestClientAutoConfigurationTests.java

@@ -17,7 +17,6 @@
 package org.springframework.boot.autoconfigure.elasticsearch;
 
 import java.time.Duration;
-import java.util.Map;
 
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
@@ -49,6 +48,7 @@ import static org.mockito.Mockito.mock;
  * @author Vedran Pavic
  * @author Evgeniy Cheban
  * @author Filip Hrisafov
+ * @author Andy Wilkinson
  */
 @SuppressWarnings("deprecation")
 class ElasticsearchRestClientAutoConfigurationTests {
@@ -57,19 +57,22 @@ class ElasticsearchRestClientAutoConfigurationTests {
 			.withConfiguration(AutoConfigurations.of(ElasticsearchRestClientAutoConfiguration.class));
 
 	@Test
-	void configureShouldOnlyCreateHighLevelRestClient() {
-		this.contextRunner.run((context) -> assertThat(context).doesNotHaveBean(RestClient.class)
-				.hasSingleBean(RestClientBuilder.class)
-				.hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class));
-
+	void configureShouldCreateHighLevelAndLowLevelRestClients() {
+		this.contextRunner.run((context) -> {
+			assertThat(context).hasSingleBean(RestClient.class)
+					.hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class)
+					.hasSingleBean(RestClientBuilder.class);
+			assertThat(context.getBean(RestClient.class))
+					.isEqualTo(context.getBean(org.elasticsearch.client.RestHighLevelClient.class).getLowLevelClient());
+		});
 	}
 
 	@Test
-	void configureWithoutRestHighLevelClientShouldOnlyCreateRestClientBuilder() {
+	void configureWithoutRestHighLevelClientShouldOnlyCreateRestClientBuilderAndRestClient() {
 		this.contextRunner.withClassLoader(new FilteredClassLoader(org.elasticsearch.client.RestHighLevelClient.class))
-				.run((context) -> assertThat(context).doesNotHaveBean(RestClient.class)
-						.doesNotHaveBean(org.elasticsearch.client.RestHighLevelClient.class)
-						.hasSingleBean(RestClientBuilder.class));
+				.run((context) -> assertThat(context).hasSingleBean(RestClient.class)
+						.hasSingleBean(RestClientBuilder.class)
+						.doesNotHaveBean(org.elasticsearch.client.RestHighLevelClient.class));
 	}
 
 	@Test
@@ -82,24 +85,33 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	}
 
 	@Test
-	void configureWhenCustomRestHighLevelClientShouldBackOff() {
-		this.contextRunner.withUserConfiguration(CustomRestHighLevelClientConfiguration.class).run(
-				(context) -> assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class));
+	void configureWhenCustomRestHighLevelClientShouldDefineRestClientFromCustomHighLevelClient() {
+		this.contextRunner.withUserConfiguration(CustomRestHighLevelClientConfiguration.class)
+				.run((context) -> assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class)
+						.hasSingleBean(RestClient.class).hasBean("elasticsearchRestClient").getBean(RestClient.class)
+						.isEqualTo(context.getBean(org.elasticsearch.client.RestHighLevelClient.class)
+								.getLowLevelClient()));
 	}
 
 	@Test
-	void configureWhenDefaultRestClientShouldCreateWhenNoUniqueRestHighLevelClient() {
-		this.contextRunner.withUserConfiguration(TwoCustomRestHighLevelClientConfiguration.class).run((context) -> {
-			Map<String, org.elasticsearch.client.RestHighLevelClient> restHighLevelClients = context
-					.getBeansOfType(org.elasticsearch.client.RestHighLevelClient.class);
-			assertThat(restHighLevelClients).hasSize(2);
-		});
+	void configureWhenCustomRestHighLevelClientAndRestClientShouldBackOff() {
+		this.contextRunner.withUserConfiguration(CustomRestHighLevelClientWithRestClientConfiguration.class)
+				.run((context) -> assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class)
+						.hasBean("customRestHighLevelClient").hasSingleBean(RestClient.class)
+						.hasBean("customRestClient"));
+	}
+
+	@Test
+	void configureWhenNoUniqueRestHighLevelClientShouldNotDefineRestClient() {
+		this.contextRunner.withUserConfiguration(TwoCustomRestHighLevelClientsConfiguration.class)
+				.run((context) -> assertThat(context).doesNotHaveBean(RestClient.class));
 	}
 
 	@Test
 	void configureWhenBuilderCustomizerShouldApply() {
 		this.contextRunner.withUserConfiguration(BuilderCustomizerConfiguration.class).run((context) -> {
-			assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class);
+			assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class)
+					.hasSingleBean(RestClient.class);
 			org.elasticsearch.client.RestHighLevelClient restClient = context
 					.getBean(org.elasticsearch.client.RestHighLevelClient.class);
 			RestClient lowLevelClient = restClient.getLowLevelClient();
@@ -112,9 +124,8 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	@Test
 	void configureWithNoTimeoutsApplyDefaults() {
 		this.contextRunner.run((context) -> {
-			assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class);
-			org.elasticsearch.client.RestHighLevelClient restClient = context
-					.getBean(org.elasticsearch.client.RestHighLevelClient.class);
+			assertThat(context).hasSingleBean(RestClient.class);
+			RestClient restClient = context.getBean(RestClient.class);
 			assertTimeouts(restClient, Duration.ofMillis(RestClientBuilder.DEFAULT_CONNECT_TIMEOUT_MILLIS),
 					Duration.ofMillis(RestClientBuilder.DEFAULT_SOCKET_TIMEOUT_MILLIS));
 		});
@@ -124,25 +135,23 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	void configureWithCustomTimeouts() {
 		this.contextRunner.withPropertyValues("spring.elasticsearch.connection-timeout=15s",
 				"spring.elasticsearch.socket-timeout=1m").run((context) -> {
-					assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class);
-					org.elasticsearch.client.RestHighLevelClient restClient = context
-							.getBean(org.elasticsearch.client.RestHighLevelClient.class);
+					assertThat(context).hasSingleBean(RestClient.class);
+					RestClient restClient = context.getBean(RestClient.class);
 					assertTimeouts(restClient, Duration.ofSeconds(15), Duration.ofMinutes(1));
 				});
 	}
 
-	private static void assertTimeouts(org.elasticsearch.client.RestHighLevelClient restClient, Duration connectTimeout,
-			Duration readTimeout) {
-		assertThat(restClient.getLowLevelClient()).extracting("client.defaultConfig.socketTimeout")
+	private static void assertTimeouts(RestClient restClient, Duration connectTimeout, Duration readTimeout) {
+		assertThat(restClient).extracting("client.defaultConfig.socketTimeout")
 				.isEqualTo(Math.toIntExact(readTimeout.toMillis()));
-		assertThat(restClient.getLowLevelClient()).extracting("client.defaultConfig.connectTimeout")
+		assertThat(restClient).extracting("client.defaultConfig.connectTimeout")
 				.isEqualTo(Math.toIntExact(connectTimeout.toMillis()));
 	}
 
 	@Test
 	void configureUriWithNoScheme() {
 		this.contextRunner.withPropertyValues("spring.elasticsearch.uris=localhost:9876").run((context) -> {
-			RestClient client = context.getBean(org.elasticsearch.client.RestHighLevelClient.class).getLowLevelClient();
+			RestClient client = context.getBean(RestClient.class);
 			assertThat(client.getNodes().stream().map(Node::getHost).map(HttpHost::toString))
 					.containsExactly("http://localhost:9876");
 		});
@@ -151,7 +160,7 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	@Test
 	void configureUriWithUsernameOnly() {
 		this.contextRunner.withPropertyValues("spring.elasticsearch.uris=http://user@localhost:9200").run((context) -> {
-			RestClient client = context.getBean(org.elasticsearch.client.RestHighLevelClient.class).getLowLevelClient();
+			RestClient client = context.getBean(RestClient.class);
 			assertThat(client.getNodes().stream().map(Node::getHost).map(HttpHost::toString))
 					.containsExactly("http://localhost:9200");
 			assertThat(client)
@@ -168,8 +177,7 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	void configureUriWithUsernameAndEmptyPassword() {
 		this.contextRunner.withPropertyValues("spring.elasticsearch.uris=http://user:@localhost:9200")
 				.run((context) -> {
-					RestClient client = context.getBean(org.elasticsearch.client.RestHighLevelClient.class)
-							.getLowLevelClient();
+					RestClient client = context.getBean(RestClient.class);
 					assertThat(client.getNodes().stream().map(Node::getHost).map(HttpHost::toString))
 							.containsExactly("http://localhost:9200");
 					assertThat(client)
@@ -190,8 +198,7 @@ class ElasticsearchRestClientAutoConfigurationTests {
 				.withPropertyValues("spring.elasticsearch.uris=http://user:password@localhost:9200,localhost:9201",
 						"spring.elasticsearch.username=admin", "spring.elasticsearch.password=admin")
 				.run((context) -> {
-					RestClient client = context.getBean(org.elasticsearch.client.RestHighLevelClient.class)
-							.getLowLevelClient();
+					RestClient client = context.getBean(RestClient.class);
 					assertThat(client.getNodes().stream().map(Node::getHost).map(HttpHost::toString))
 							.containsExactly("http://localhost:9200", "http://localhost:9201");
 					assertThat(client)
@@ -213,7 +220,7 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	@Test
 	void configureWithCustomPathPrefix() {
 		this.contextRunner.withPropertyValues("spring.elasticsearch.path-prefix=/some/prefix").run((context) -> {
-			RestClient client = context.getBean(org.elasticsearch.client.RestHighLevelClient.class).getLowLevelClient();
+			RestClient client = context.getBean(RestClient.class);
 			assertThat(client).extracting("pathPrefix").isEqualTo("/some/prefix");
 		});
 	}
@@ -222,19 +229,21 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	void configureWithoutSnifferLibraryShouldNotCreateSniffer() {
 		this.contextRunner.withClassLoader(new FilteredClassLoader("org.elasticsearch.client.sniff"))
 				.run((context) -> assertThat(context).hasSingleBean(org.elasticsearch.client.RestHighLevelClient.class)
-						.doesNotHaveBean(Sniffer.class));
+						.hasSingleBean(RestClient.class).doesNotHaveBean(Sniffer.class));
 	}
 
 	@Test
-	void configureShouldCreateSnifferUsingRestHighLevelClient() {
-		this.contextRunner.run((context) -> {
-			assertThat(context).hasSingleBean(Sniffer.class);
-			assertThat(context.getBean(Sniffer.class)).hasFieldOrPropertyWithValue("restClient",
-					context.getBean(org.elasticsearch.client.RestHighLevelClient.class).getLowLevelClient());
-			// Validate shutdown order as the sniffer must be shutdown before the client
-			assertThat(context.getBeanFactory().getDependentBeans("elasticsearchRestHighLevelClient"))
-					.contains("elasticsearchSniffer");
-		});
+	void configureShouldCreateSnifferUsingRestClient() {
+		this.contextRunner.withClassLoader(new FilteredClassLoader(org.elasticsearch.client.RestHighLevelClient.class))
+				.run((context) -> {
+					assertThat(context).hasSingleBean(Sniffer.class);
+					assertThat(context.getBean(Sniffer.class)).hasFieldOrPropertyWithValue("restClient",
+							context.getBean(RestClient.class));
+					// Validate shutdown order as the sniffer must be shutdown before the
+					// client
+					assertThat(context.getBeanFactory().getDependentBeans("elasticsearchRestClient"))
+							.contains("elasticsearchSniffer");
+				});
 	}
 
 	@Test
@@ -299,7 +308,7 @@ class ElasticsearchRestClientAutoConfigurationTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	static class TwoCustomRestHighLevelClientConfiguration {
+	static class CustomRestHighLevelClientWithRestClientConfiguration {
 
 		@Bean
 		org.elasticsearch.client.RestHighLevelClient customRestHighLevelClient(RestClientBuilder builder) {
@@ -307,7 +316,22 @@ class ElasticsearchRestClientAutoConfigurationTests {
 		}
 
 		@Bean
-		org.elasticsearch.client.RestHighLevelClient customoRestHighLevelClient1(RestClientBuilder builder) {
+		RestClient customRestClient(org.elasticsearch.client.RestHighLevelClient restHighLevelClient) {
+			return restHighLevelClient.getLowLevelClient();
+		}
+
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	static class TwoCustomRestHighLevelClientsConfiguration {
+
+		@Bean
+		org.elasticsearch.client.RestHighLevelClient customRestHighLevelClient(RestClientBuilder builder) {
+			return new org.elasticsearch.client.RestHighLevelClient(builder);
+		}
+
+		@Bean
+		org.elasticsearch.client.RestHighLevelClient anotherCustomRestHighLevelClient(RestClientBuilder builder) {
 			return new org.elasticsearch.client.RestHighLevelClient(builder);
 		}
 
@@ -323,4 +347,19 @@ class ElasticsearchRestClientAutoConfigurationTests {
 
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class TwoCustomRestClientConfiguration {
+
+		@Bean
+		RestClient customRestClient(RestClientBuilder builder) {
+			return builder.build();
+		}
+
+		@Bean
+		RestClient customRestClient1(RestClientBuilder builder) {
+			return builder.build();
+		}
+
+	}
+
 }