From ec721513bdd0a3db42e76fd434ea9bb21a25fa12 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 13 Nov 2018 08:42:25 +0100 Subject: [PATCH] Add condition on reactor's HttpClient. Include class-dependency on Reactor's HttpClient to prevent startup errors when WebFlux is present but not the Reactor HttpClient. See gh-254. --- .../vault/config/VaultReactiveBootstrapConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java index 062be2a9..158dadd3 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultReactiveBootstrapConfiguration.java @@ -19,6 +19,7 @@ import java.time.Duration; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import reactor.netty.http.client.HttpClient; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; @@ -68,7 +69,8 @@ import org.springframework.web.reactive.function.client.WebClient; @Configuration @ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true) @ConditionalOnExpression("${spring.cloud.vault.reactive.enabled:true}") -@ConditionalOnClass({ Flux.class, WebClient.class, ReactiveVaultOperations.class }) +@ConditionalOnClass({ Flux.class, WebClient.class, ReactiveVaultOperations.class, + HttpClient.class }) @EnableConfigurationProperties({ VaultProperties.class }) @Order(Ordered.LOWEST_PRECEDENCE - 10) public class VaultReactiveBootstrapConfiguration {