From 5fc01880bceac0dcbcfa68abaa7f1a5917c5a5bf Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 7 Sep 2017 09:55:50 +0200 Subject: [PATCH 1/2] Polish --- ...asticsearchDataAutoConfigurationTests.java | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java index 46619269f06..6de7ca62050 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java @@ -33,6 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Phillip Webb * @author Artur Konczak + * @author Stephane Nicoll */ public class ElasticsearchDataAutoConfigurationTests { @@ -47,45 +48,37 @@ public class ElasticsearchDataAutoConfigurationTests { @Test public void templateExists() { - this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.elasticsearch.properties.path.data:target/data", + load("spring.data.elasticsearch.properties.path.data:target/data", "spring.data.elasticsearch.properties.path.logs:target/logs"); - this.context.register(PropertyPlaceholderAutoConfiguration.class, - ElasticsearchAutoConfiguration.class, - ElasticsearchDataAutoConfiguration.class); - this.context.refresh(); assertThat(this.context.getBeanNamesForType(ElasticsearchTemplate.class)) .hasSize(1); } @Test public void mappingContextExists() { - this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.elasticsearch.properties.path.data:target/data", + load("spring.data.elasticsearch.properties.path.data:target/data", "spring.data.elasticsearch.properties.path.logs:target/logs"); - this.context.register(PropertyPlaceholderAutoConfiguration.class, - ElasticsearchAutoConfiguration.class, - ElasticsearchDataAutoConfiguration.class); - this.context.refresh(); assertThat( this.context.getBeanNamesForType(SimpleElasticsearchMappingContext.class)) - .hasSize(1); + .hasSize(1); } @Test public void converterExists() { - this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.elasticsearch.properties.path.data:target/data", + load("spring.data.elasticsearch.properties.path.data:target/data", "spring.data.elasticsearch.properties.path.logs:target/logs"); - this.context.register(PropertyPlaceholderAutoConfiguration.class, - ElasticsearchAutoConfiguration.class, - ElasticsearchDataAutoConfiguration.class); - this.context.refresh(); assertThat(this.context.getBeanNamesForType(ElasticsearchConverter.class)) .hasSize(1); } + private void load(String... environment) { + AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); + EnvironmentTestUtils.addEnvironment(ctx, environment); + ctx.register(PropertyPlaceholderAutoConfiguration.class, + ElasticsearchAutoConfiguration.class, + ElasticsearchDataAutoConfiguration.class); + ctx.refresh(); + this.context = ctx; + } + } From db18abc542e2604ddceb64745ed634972e37d88e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 7 Sep 2017 10:32:21 +0200 Subject: [PATCH 2/2] Fix Elasticsearch template condition if no client is defined This commit makes sure to backoff if a Client bean is not available. Closes gh-10143 --- .../elasticsearch/ElasticsearchDataAutoConfiguration.java | 4 +++- .../ElasticsearchDataAutoConfigurationTests.java | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java index 9ac3908ebc5..048ff4be1c7 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2017 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. @@ -20,6 +20,7 @@ import org.elasticsearch.client.Client; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; @@ -49,6 +50,7 @@ public class ElasticsearchDataAutoConfiguration { @Bean @ConditionalOnMissingBean + @ConditionalOnBean(Client.class) public ElasticsearchTemplate elasticsearchTemplate(Client client, ElasticsearchConverter converter) { try { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java index 6de7ca62050..d2cb1850d36 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java @@ -46,6 +46,14 @@ public class ElasticsearchDataAutoConfigurationTests { } } + @Test + public void templateBackOffWithNoClient() { + this.context = new AnnotationConfigApplicationContext( + ElasticsearchDataAutoConfiguration.class); + assertThat(this.context.getBeanNamesForType(ElasticsearchTemplate.class)) + .isEmpty(); + } + @Test public void templateExists() { load("spring.data.elasticsearch.properties.path.data:target/data",