Skip to content

S
spring-boot
Commit 63cd0afa authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.5.x'

parents 66f9696a 9f9cef1e
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
View file @ 63cd0afa
...@@ -307,6 +307,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -307,6 +307,7 @@ public class HealthIndicatorAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(RedisConnectionFactory.class)
@ConditionalOnBean(RedisConnectionFactory.class) @ConditionalOnBean(RedisConnectionFactory.class)
@ConditionalOnEnabledHealthIndicator("redis") @ConditionalOnEnabledHealthIndicator("redis")
public static class RedisHealthIndicatorConfiguration extends public static class RedisHealthIndicatorConfiguration extends
...@@ -328,6 +329,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -328,6 +329,7 @@ public class HealthIndicatorAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(RabbitTemplate.class)
@ConditionalOnBean(RabbitTemplate.class) @ConditionalOnBean(RabbitTemplate.class)
@ConditionalOnEnabledHealthIndicator("rabbit") @ConditionalOnEnabledHealthIndicator("rabbit")
public static class RabbitHealthIndicatorConfiguration extends public static class RabbitHealthIndicatorConfiguration extends
...@@ -349,6 +351,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -349,6 +351,7 @@ public class HealthIndicatorAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(SolrClient.class)
@ConditionalOnBean(SolrClient.class) @ConditionalOnBean(SolrClient.class)
@ConditionalOnEnabledHealthIndicator("solr") @ConditionalOnEnabledHealthIndicator("solr")
public static class SolrHealthIndicatorConfiguration extends public static class SolrHealthIndicatorConfiguration extends
...@@ -387,6 +390,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -387,6 +390,7 @@ public class HealthIndicatorAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(JavaMailSenderImpl.class)
@ConditionalOnBean(JavaMailSenderImpl.class) @ConditionalOnBean(JavaMailSenderImpl.class)
@ConditionalOnEnabledHealthIndicator("mail") @ConditionalOnEnabledHealthIndicator("mail")
public static class MailHealthIndicatorConfiguration extends public static class MailHealthIndicatorConfiguration extends
...@@ -408,6 +412,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -408,6 +412,7 @@ public class HealthIndicatorAutoConfiguration {
} }
@Configuration @Configuration
@ConditionalOnClass(ConnectionFactory.class)
@ConditionalOnBean(ConnectionFactory.class) @ConditionalOnBean(ConnectionFactory.class)
@ConditionalOnEnabledHealthIndicator("jms") @ConditionalOnEnabledHealthIndicator("jms")
public static class JmsHealthIndicatorConfiguration extends public static class JmsHealthIndicatorConfiguration extends
......
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