Skip to content

Commit 7227dd1

Browse files
author
nietsnie
committed
Fixing collision with netflix-core library.
1 parent b1abbd9 commit 7227dd1

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/main/java/io/jmnarloch/spring/boot/rxjava/config/RxJavaMvcAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ public class RxJavaMvcAutoConfiguration {
4646
@RxJava
4747
@ConditionalOnMissingBean
4848
@ConditionalOnClass(Observable.class)
49-
public ObservableReturnValueHandler observableReturnValueHandler() {
49+
public ObservableReturnValueHandler rx2observableReturnValueHandler() {
5050
return new ObservableReturnValueHandler();
5151
}
5252

5353
@Bean
5454
@RxJava
5555
@ConditionalOnMissingBean
5656
@ConditionalOnClass(Single.class)
57-
public SingleReturnValueHandler singleReturnValueHandler() {
57+
public SingleReturnValueHandler rx2singleReturnValueHandler() {
5858
return new SingleReturnValueHandler();
5959
}
6060

0 commit comments

Comments
 (0)