demote cyclic dependency under reactor-core reactor package

-> reactor.Mono : reactor.core.publisher.Mono
-> reactor.Flux : reactor.core.publisher.Flux
-> reactor.Processors : reactor.core.publisher.Processors
-> reactor.Timers : reactor.core.timer.Timers
-> reactor.Subscribers : reactor.core.subscriber.Subscribers

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/AsyncIntegrationTests.java

@@ -24,10 +24,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import reactor.Mono;
-import reactor.Processors;
-import reactor.Timers;
+import reactor.core.publisher.Mono;
 import reactor.core.publisher.ProcessorGroup;
+import reactor.core.publisher.Processors;
+import reactor.core.timer.Timers;
 import reactor.io.buffer.Buffer;
 import reactor.rx.Stream;
 

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java

@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
-import reactor.Mono;
+import reactor.core.publisher.Mono;
 
 import org.springframework.http.HttpCookie;
 import org.springframework.http.RequestEntity;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/EchoHandler.java

@@ -16,7 +16,7 @@
 
 package org.springframework.http.server.reactive;
 
-import reactor.Mono;
+import reactor.core.publisher.Mono;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpRequest.java

@@ -19,7 +19,7 @@ import java.net.URI;
 import java.nio.ByteBuffer;
 
 import org.reactivestreams.Publisher;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/MockServerHttpResponse.java

@@ -18,8 +18,8 @@ package org.springframework.http.server.reactive;
 import java.nio.ByteBuffer;
 
 import org.reactivestreams.Publisher;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/RandomHandler.java

@@ -23,7 +23,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
-import reactor.Mono;
+import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
 
 import static org.junit.Assert.assertEquals;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/WriteWithOperatorTests.java

@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 import reactor.core.subscriber.SubscriberBarrier;
 import reactor.rx.Stream;
 import reactor.rx.stream.Signal;

spring-web-reactive/src/test/java/org/springframework/http/server/reactive/XmlHandler.java

@@ -22,8 +22,8 @@ import javax.xml.bind.Unmarshaller;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.http.MediaType;

spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/ByteBufferDecoderTests.java

@@ -20,17 +20,18 @@ import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.*;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.support.ByteBufferDecoder;
 import org.springframework.http.MediaType;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JacksonJsonDecoderTests.java

@@ -20,12 +20,8 @@ import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.core.ResolvableType;
@@ -33,6 +29,9 @@ import org.springframework.core.codec.support.JacksonJsonDecoder;
 import org.springframework.http.MediaType;
 import org.springframework.reactive.codec.Pojo;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/Jaxb2DecoderTests.java

@@ -20,12 +20,8 @@ import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.core.ResolvableType;
@@ -33,6 +29,9 @@ import org.springframework.core.codec.support.Jaxb2Decoder;
 import org.springframework.http.MediaType;
 import org.springframework.reactive.codec.Pojo;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/JsonObjectDecoderTests.java

@@ -21,14 +21,15 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.core.codec.support.JsonObjectDecoder;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/decoder/StringDecoderTests.java

@@ -16,16 +16,13 @@
 
 package org.springframework.reactive.codec.decoder;
 
-import static java.util.stream.Collectors.*;
-import static org.junit.Assert.*;
-
 import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
 import org.junit.Test;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.core.publisher.convert.RxJava1SingleConverter;
 import reactor.io.buffer.Buffer;
 import rx.Single;
@@ -34,6 +31,9 @@ import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.support.StringDecoder;
 import org.springframework.http.MediaType;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  * @author Brian Clozel

spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/ByteBufferEncoderTests.java

@@ -20,17 +20,18 @@ import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.*;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.support.ByteBufferEncoder;
 import org.springframework.http.MediaType;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JacksonJsonEncoderTests.java

@@ -16,22 +16,20 @@
 
 package org.springframework.reactive.codec.encoder;
 
-import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 
 import org.springframework.core.codec.support.JacksonJsonEncoder;
 import org.springframework.http.MediaType;
 import org.springframework.reactive.codec.Pojo;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/Jaxb2EncoderTests.java

@@ -20,17 +20,16 @@ import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 
 import org.springframework.core.codec.support.Jaxb2Encoder;
 import org.springframework.http.MediaType;
 import org.springframework.reactive.codec.Pojo;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/JsonObjectEncoderTests.java

@@ -19,14 +19,15 @@ package org.springframework.reactive.codec.encoder;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
-import static org.junit.Assert.assertEquals;
 import org.junit.Test;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.core.codec.support.JsonObjectEncoder;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/reactive/codec/encoder/StringEncoderTests.java

@@ -16,22 +16,20 @@
 
 package org.springframework.reactive.codec.encoder;
 
-import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 import org.junit.Test;
-import reactor.Flux;
+import reactor.core.publisher.Flux;
 
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.support.StringEncoder;
 import org.springframework.http.MediaType;
 
+import static java.util.stream.Collectors.toList;
+import static org.junit.Assert.*;
+
 /**
  * @author Sebastien Deleuze
  */

spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java

@@ -23,7 +23,7 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import reactor.Mono;
+import reactor.core.publisher.Mono;
 import reactor.rx.Stream;
 import reactor.rx.stream.Signal;
 
@@ -57,10 +57,7 @@ import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.WebServerExchange;
 
 import static org.hamcrest.CoreMatchers.startsWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 /**
  * Test the effect of exceptions at different stages of request processing by

spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java

@@ -22,8 +22,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
 
 import org.springframework.context.support.StaticApplicationContext;

spring-web-reactive/src/test/java/org/springframework/web/reactive/method/InvocableHandlerMethodTests.java

@@ -25,8 +25,8 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.rx.Stream;
 import reactor.rx.stream.Signal;
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMappingTests.java

@@ -20,10 +20,10 @@ import java.net.URI;
 import java.util.List;
 import java.util.stream.StreamSupport;
 
-import static java.util.stream.Collectors.toList;
 import org.junit.Before;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
+import reactor.core.publisher.Flux;
 
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.http.HttpMethod;
@@ -37,9 +37,9 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.server.DefaultWebServerExchange;
 import org.springframework.web.server.WebServerExchange;
 
+import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import reactor.Flux;
 
 /**
  * @author Sebastien Deleuze

spring-web-reactive/src/test/java/org/springframework/web/reactive/method/annotation/RequestMappingIntegrationTests.java

@@ -26,8 +26,8 @@ import java.util.concurrent.CompletableFuture;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
-import reactor.Flux;
-import reactor.Mono;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.io.buffer.Buffer;
 import reactor.rx.Promise;
 import reactor.rx.Stream;

spring-web-reactive/src/test/java/org/springframework/web/server/ExceptionHandlingHttpHandlerTests.java

@@ -20,7 +20,7 @@ import java.net.URI;
 
 import org.junit.Before;
 import org.junit.Test;
-import reactor.Mono;
+import reactor.core.publisher.Mono;
 
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;

spring-web-reactive/src/test/java/org/springframework/web/server/FilteringWebHandlerTests.java

@@ -20,7 +20,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Before;
 import org.junit.Test;
-import reactor.Mono;
+import reactor.core.publisher.Mono;
 
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.http.server.reactive.ServerHttpRequest;