diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java index 303aac3075..96941fcf48 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java @@ -81,9 +81,6 @@ public class WebReactiveConfiguration implements ApplicationContextAware { private static final boolean jaxb2Present = ClassUtils.isPresent("javax.xml.bind.Binder", WebReactiveConfiguration.class.getClassLoader()); - private static final boolean rxJava1Present = - ClassUtils.isPresent("rx.Observable", WebReactiveConfiguration.class.getClassLoader()); - private PathMatchConfigurer pathMatchConfigurer; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java index ac115ec848..284d881816 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java @@ -20,14 +20,10 @@ import java.net.URI; import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; -import java.util.concurrent.CompletableFuture; import javax.xml.bind.annotation.XmlRootElement; import org.junit.Before; import org.junit.Test; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; -import rx.Observable; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -172,18 +168,6 @@ public class WebReactiveConfigurationTests { assertHasMessageReader(messageReaders, TestBean.class, APPLICATION_XML); } - @Test - public void mvcConversionService() throws Exception { - ApplicationContext context = loadConfig(WebReactiveConfiguration.class); - - String name = "mvcConversionService"; - ConversionService service = context.getBean(name, ConversionService.class); - assertNotNull(service); - - service.canConvert(CompletableFuture.class, Mono.class); - service.canConvert(Observable.class, Flux.class); - } - @Test public void responseEntityResultHandler() throws Exception { ApplicationContext context = loadConfig(WebReactiveConfiguration.class);