Commit 9f9cef1e authored by Andy Wilkinson's avatar Andy Wilkinson

Merge pull request #9940 from Johnny Lim

* gh-9940:
  Add more ConditionalOnClass checks in HealthIndicatorAutoConfiguration
parents dc33ec1a ee3de15e
...@@ -281,6 +281,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -281,6 +281,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
...@@ -302,6 +303,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -302,6 +303,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
...@@ -323,6 +325,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -323,6 +325,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
...@@ -361,6 +364,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -361,6 +364,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
...@@ -382,6 +386,7 @@ public class HealthIndicatorAutoConfiguration { ...@@ -382,6 +386,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