From 7d9469593663a75a11af757bde2e29ec84e0be0b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Fri, 24 Nov 2017 23:28:02 +0900 Subject: [PATCH] Harmonize CouchbaseReactiveRepositoriesAutoConfiguration conditions Closes gh-11138 --- .../CouchbaseReactiveRepositoriesAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java index b45f604830..562a990809 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseReactiveRepositoriesAutoConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.boot.autoconfigure.data.couchbase; import com.couchbase.client.java.Bucket; +import reactor.core.publisher.Flux; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -38,7 +39,7 @@ import org.springframework.data.couchbase.repository.support.ReactiveCouchbaseRe * @since 2.0.0 */ @Configuration -@ConditionalOnClass({ Bucket.class, ReactiveCouchbaseRepository.class }) +@ConditionalOnClass({ Bucket.class, ReactiveCouchbaseRepository.class, Flux.class }) @ConditionalOnProperty(prefix = "spring.data.couchbase.reactiverepositories", name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnBean(ReactiveRepositoryOperationsMapping.class) @ConditionalOnMissingBean(ReactiveCouchbaseRepositoryFactoryBean.class)