Commit a7352e68 authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #11138 from izeye:conditional-on-class

* pr/11138:
  Harmonize CouchbaseReactiveRepositoriesAutoConfiguration conditions
parents 16b090c9 7d946959
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package org.springframework.boot.autoconfigure.data.couchbase; package org.springframework.boot.autoconfigure.data.couchbase;
import com.couchbase.client.java.Bucket; import com.couchbase.client.java.Bucket;
import reactor.core.publisher.Flux;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
...@@ -38,7 +39,7 @@ import org.springframework.data.couchbase.repository.support.ReactiveCouchbaseRe ...@@ -38,7 +39,7 @@ import org.springframework.data.couchbase.repository.support.ReactiveCouchbaseRe
* @since 2.0.0 * @since 2.0.0
*/ */
@Configuration @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) @ConditionalOnProperty(prefix = "spring.data.couchbase.reactiverepositories", name = "enabled", havingValue = "true", matchIfMissing = true)
@ConditionalOnBean(ReactiveRepositoryOperationsMapping.class) @ConditionalOnBean(ReactiveRepositoryOperationsMapping.class)
@ConditionalOnMissingBean(ReactiveCouchbaseRepositoryFactoryBean.class) @ConditionalOnMissingBean(ReactiveCouchbaseRepositoryFactoryBean.class)
......
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