root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Review conditions of ElasticsearchHealthIndicatorAutoConfiguration 

Closes gh-12249
This commit is contained in:
Stephane Nicoll 2018-02-27 16:37:59 +01:00
parent cb96bbd9be
commit b0f381bb6f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfiguration.java
View File

@ -32,6 +32,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration;
import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration; import org.springframework.boot.autoconfigure.elasticsearch.jest.JestAutoConfiguration;
@ -55,6 +56,7 @@ import org.springframework.context.annotation.Configuration;
public class ElasticsearchHealthIndicatorAutoConfiguration { public class ElasticsearchHealthIndicatorAutoConfiguration {
@Configuration @Configuration
@ConditionalOnClass(Client.class)
@ConditionalOnBean(Client.class) @ConditionalOnBean(Client.class)
@EnableConfigurationProperties(ElasticsearchHealthIndicatorProperties.class) @EnableConfigurationProperties(ElasticsearchHealthIndicatorProperties.class)
static class ElasticsearchClientHealthIndicatorConfiguration extends static class ElasticsearchClientHealthIndicatorConfiguration extends
@ -87,6 +89,7 @@ public class ElasticsearchHealthIndicatorAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(JestClient.class)
@ConditionalOnBean(JestClient.class) @ConditionalOnBean(JestClient.class)
static class ElasticsearchJestHealthIndicatorConfiguration extends static class ElasticsearchJestHealthIndicatorConfiguration extends
CompositeHealthIndicatorConfiguration<ElasticsearchJestHealthIndicator, JestClient> { CompositeHealthIndicatorConfiguration<ElasticsearchJestHealthIndicator, JestClient> {