Merge pull request #21769 from tszmytka

snicoll · snicoll · commit 6c926f78496c · 2020-06-10T18:13:08.000+02:00
* pr/21769: Back-off if a custom ReactiveSessionFactory is defined Closes gh-21769
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java
@@ -55,6 +55,7 @@ public ReactiveSession reactiveCassandraSession(CqlSession session) {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public ReactiveSessionFactory reactiveCassandraSessionFactory(ReactiveSession reactiveCassandraSession) {
 		return new DefaultReactiveSessionFactory(reactiveCassandraSession);
 	}

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public ReactiveSession reactiveCassandraSession(CqlSession session) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Bean`
	`58`	`+ @ConditionalOnMissingBean`
`58`	`59`	`public ReactiveSessionFactory reactiveCassandraSessionFactory(ReactiveSession reactiveCassandraSession) {`
`59`	`60`	`return new DefaultReactiveSessionFactory(reactiveCassandraSession);`
`60`	`61`	`}`