From 4c5cd24403d3c153ec029d97fe8dde66c34789bb Mon Sep 17 00:00:00 2001 From: Scott Frederick Date: Wed, 2 Jan 2019 15:00:12 -0600 Subject: [PATCH] Use class names instead of types in @ConditionalOnClass annotations. --- .../credhub/autoconfig/CredHubOAuth2AutoConfiguration.java | 2 +- .../credhub/autoconfig/CredHubTemplateAutoConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java index aaf00a4..69a5945 100644 --- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java +++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java @@ -49,7 +49,7 @@ import java.util.List; @Configuration @EnableConfigurationProperties(OAuth2ClientProperties.class) @AutoConfigureBefore(ReactiveOAuth2ClientAutoConfiguration.class) -@ConditionalOnClass(ClientRegistration.class) +@ConditionalOnClass(name = "org.springframework.security.oauth2.client.registration.ClientRegistration") @Conditional(ClientsConfiguredCondition.class) public class CredHubOAuth2AutoConfiguration { diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java index d3ffa70..ed35d66 100644 --- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java +++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubTemplateAutoConfiguration.java @@ -95,7 +95,7 @@ public class CredHubTemplateAutoConfiguration { */ @Bean @ConditionalOnMissingBean - @ConditionalOnClass(WebClient.class) + @ConditionalOnClass(name = "org.springframework.web.reactive.function.client.WebClient") public ReactiveCredHubOperations reactiveCredHubTemplate( CredHubProperties credHubProperties, ClientOptions clientOptions, @Autowired(required = false) ReactiveClientRegistrationRepository clientRegistrationRepository,