Skip to content

S
spring-boot
Commit b0f381bb authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Review conditions of ElasticsearchHealthIndicatorAutoConfiguration 

Closes gh-12249
parent cb96bbd9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticsearchHealthIndicatorAutoConfiguration.java
View file @ b0f381bb
...@@ -32,6 +32,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter; ...@@ -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; ...@@ -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 { ...@@ -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> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment