root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stephane Maldini 2016-01-19 20:18:47 +00:00
parent 53b76e90fc
commit 198e316412
77 changed files with 126 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/core/codec/Decoder.java
View File

@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.util.MimeType;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/Encoder.java
View File

@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.util.MimeType;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/AbstractRawByteStreamDecoder.java
View File

@ -22,7 +22,7 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import reactor.Flux;
import reactor.core.publisher.Flux;
import reactor.core.subscriber.SubscriberBarrier;
import reactor.core.subscription.BackpressureUtils;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferDecoder.java
View File

@ -19,7 +19,7 @@ package org.springframework.core.codec.support;
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.util.MimeType;

4
spring-web-reactive/src/main/java/org/springframework/core/codec/support/ByteBufferEncoder.java
View File

@ -19,7 +19,7 @@ package org.springframework.core.codec.support;
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.util.MimeType;
@ -47,7 +47,7 @@ public class ByteBufferEncoder extends AbstractEncoder<ByteBuffer> {
MimeType mimeType, Object... hints) {
//noinspection unchecked
return Flux.from((Publisher<ByteBuffer>)inputStream);
return Flux.from(inputStream);
}
}

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonDecoder.java
View File

@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.core.codec.CodecException;

4
spring-web-reactive/src/main/java/org/springframework/core/codec/support/JacksonJsonEncoder.java
View File

@ -22,8 +22,8 @@ import java.nio.charset.StandardCharsets;
import com.fasterxml.jackson.databind.ObjectMapper;
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 org.springframework.core.ResolvableType;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Decoder.java
View File

@ -34,7 +34,7 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.XMLReaderFactory;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.core.codec.CodecException;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/Jaxb2Encoder.java
View File

@ -26,7 +26,7 @@ import javax.xml.bind.MarshalException;
import javax.xml.bind.Marshaller;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import reactor.io.buffer.Buffer;
import org.springframework.core.ResolvableType;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectDecoder.java
View File

@ -25,7 +25,7 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import reactor.fn.Function;
import org.springframework.core.ResolvableType;

4
spring-web-reactive/src/main/java/org/springframework/core/codec/support/JsonObjectEncoder.java
View File

@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import reactor.Flux;
import reactor.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.subscriber.SubscriberBarrier;
import reactor.core.subscription.BackpressureUtils;
import reactor.io.buffer.Buffer;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringDecoder.java
View File

@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import reactor.Flux;
import reactor.core.publisher.Flux;
import reactor.core.subscriber.SubscriberBarrier;
import org.springframework.core.ResolvableType;

2
spring-web-reactive/src/main/java/org/springframework/core/codec/support/StringEncoder.java
View File

@ -21,7 +21,7 @@ import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.core.ResolvableType;
import org.springframework.util.MimeType;

2
spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpInputMessage.java
View File

@ -19,7 +19,7 @@ package org.springframework.http;
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
/**
* An "reactive" HTTP input message that exposes the input as {@link Publisher}.

2
spring-web-reactive/src/main/java/org/springframework/http/ReactiveHttpOutputMessage.java
View File

@ -19,7 +19,7 @@ package org.springframework.http;
import java.nio.ByteBuffer;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* A "reactive" HTTP output message that accepts output as a {@link Publisher}.

4
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
View File

@ -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;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java
View File

@ -16,7 +16,7 @@
package org.springframework.http.server.reactive;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* Contract for handling HTTP requests in a non-blocking way.

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorHttpHandlerAdapter.java
View File

@ -15,7 +15,7 @@
*/
package org.springframework.http.server.reactive;
import reactor.Mono;
import reactor.core.publisher.Mono;
import reactor.io.buffer.Buffer;
import reactor.io.net.ReactiveChannelHandler;
import reactor.io.net.http.HttpChannel;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java
View File

@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import reactor.Flux;
import reactor.core.publisher.Flux;
import reactor.io.buffer.Buffer;
import reactor.io.net.http.HttpChannel;
import reactor.io.net.http.model.Cookie;

4
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpResponse.java
View File

@ -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 reactor.io.buffer.Buffer;
import reactor.io.net.http.HttpChannel;
import reactor.io.net.http.model.Cookie;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpRequest.java
View File

@ -26,7 +26,7 @@ import java.util.Map;
import io.netty.buffer.ByteBuf;
import io.netty.handler.codec.http.cookie.Cookie;
import io.reactivex.netty.protocol.http.server.HttpServerRequest;
import reactor.Flux;
import reactor.core.publisher.Flux;
import reactor.core.publisher.convert.RxJava1Converter;
import rx.Observable;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/RxNettyServerHttpResponse.java
View File

@ -23,7 +23,7 @@ import io.netty.handler.codec.http.cookie.Cookie;
import io.netty.handler.codec.http.cookie.DefaultCookie;
import io.reactivex.netty.protocol.http.server.HttpServerResponse;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
import reactor.core.publisher.convert.RxJava1Converter;
import rx.Observable;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
View File

@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpStatus;
import org.springframework.util.Assert;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpRequest.java
View File

@ -28,7 +28,7 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpHeaders;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
View File

@ -25,7 +25,7 @@ import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpStatus;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowHttpHandlerAdapter.java
View File

@ -35,7 +35,7 @@ import org.reactivestreams.Subscription;
import org.xnio.ChannelListener;
import org.xnio.channels.StreamSinkChannel;
import org.xnio.channels.StreamSourceChannel;
import reactor.Mono;
import reactor.core.publisher.Mono;
import reactor.core.subscriber.BaseSubscriber;
import reactor.core.subscription.BackpressureUtils;
import reactor.core.support.Exceptions;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpRequest.java
View File

@ -27,7 +27,7 @@ import io.undertow.server.HttpServerExchange;
import io.undertow.server.handlers.Cookie;
import io.undertow.util.HeaderValues;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.core.publisher.Flux;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpHeaders;

2
spring-web-reactive/src/main/java/org/springframework/http/server/reactive/UndertowServerHttpResponse.java
View File

@ -26,7 +26,7 @@ import io.undertow.server.handlers.Cookie;
import io.undertow.server.handlers.CookieImpl;
import io.undertow.util.HttpString;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpCookie;
import org.springframework.http.HttpStatus;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/DispatcherHandler.java
View File

@ -23,8 +23,8 @@ import java.util.function.Function;
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 org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactoryUtils;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerAdapter.java
View File

@ -18,7 +18,7 @@ package org.springframework.web.reactive;
import java.util.function.Function;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.web.server.WebServerExchange;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerMapping.java
View File

@ -16,7 +16,7 @@
package org.springframework.web.reactive;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.web.server.WebServerExchange;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResult.java
View File

@ -18,7 +18,7 @@ package org.springframework.web.reactive;
import java.util.function.Function;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType;
import org.springframework.util.Assert;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/HandlerResultHandler.java
View File

@ -16,7 +16,7 @@
package org.springframework.web.reactive;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.web.server.WebServerExchange;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java
View File

@ -15,7 +15,7 @@
*/
package org.springframework.web.reactive;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.web.ResponseStatusException;
import org.springframework.web.server.WebExceptionHandler;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/HttpHandlerHandlerAdapter.java
View File

@ -17,7 +17,7 @@
package org.springframework.web.reactive.handler;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.ResolvableType;
import org.springframework.web.reactive.DispatcherHandler;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleHandlerResultHandler.java
View File

@ -17,7 +17,7 @@
package org.springframework.web.reactive.handler;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.Ordered;
import org.springframework.core.ResolvableType;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMapping.java
View File

@ -19,8 +19,8 @@ package org.springframework.web.reactive.handler;
import java.util.HashMap;
import java.util.Map;
import reactor.Flux;
import reactor.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.web.reactive.HandlerMapping;
import org.springframework.web.server.WebServerExchange;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/HandlerMethodArgumentResolver.java
View File

@ -16,7 +16,7 @@
package org.springframework.web.reactive.method;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter;
import org.springframework.web.server.WebServerExchange;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/InvocableHandlerMethod.java
View File

@ -25,7 +25,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.GenericTypeResolver;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestBodyArgumentResolver.java
View File

@ -20,8 +20,8 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.reactivestreams.Publisher;
import reactor.Flux;
import reactor.Mono;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter;
import org.springframework.core.ResolvableType;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerAdapter.java
View File

@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.codec.Decoder;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestMappingHandlerMapping.java
View File

@ -27,8 +27,8 @@ import java.util.TreeSet;
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 org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ApplicationContext;

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/RequestParamArgumentResolver.java
View File

@ -16,7 +16,7 @@
package org.springframework.web.reactive.method.annotation;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.annotation.RequestParam;

4
spring-web-reactive/src/main/java/org/springframework/web/reactive/method/annotation/ResponseBodyResultHandler.java
View File

@ -16,7 +16,6 @@
package org.springframework.web.reactive.method.annotation;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@ -28,12 +27,11 @@ import java.util.Set;
import java.util.stream.Collectors;
import org.reactivestreams.Publisher;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.core.MethodParameter;
import org.springframework.core.Ordered;
import org.springframework.core.ResolvableType;
import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.codec.Encoder;
import org.springframework.core.convert.ConversionService;

2
spring-web-reactive/src/main/java/org/springframework/web/server/ExceptionHandlingWebHandler.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpStatus;

2
spring-web-reactive/src/main/java/org/springframework/web/server/FilteringWebHandler.java
View File

@ -19,7 +19,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* {@code WebHandler} that decorates another with a chain of {@link WebFilter}s.

2
spring-web-reactive/src/main/java/org/springframework/web/server/WebExceptionHandler.java
View File

@ -15,7 +15,7 @@
*/
package org.springframework.web.server;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* Contract for handling exceptions during web server exchange processing.

2
spring-web-reactive/src/main/java/org/springframework/web/server/WebFilter.java
View File

@ -16,7 +16,7 @@
package org.springframework.web.server;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* Contract for interception-style, chained processing of Web requests that may

2
spring-web-reactive/src/main/java/org/springframework/web/server/WebFilterChain.java
View File

@ -15,7 +15,7 @@
*/
package org.springframework.web.server;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* Contract to allow a {@link WebFilter} to delegate to the next in the chain.

2
spring-web-reactive/src/main/java/org/springframework/web/server/WebHandler.java
View File

@ -16,7 +16,7 @@
package org.springframework.web.server;
import reactor.Mono;
import reactor.core.publisher.Mono;
/**
* Contract to handle a web server exchange.

2
spring-web-reactive/src/main/java/org/springframework/web/server/WebHandlerDecorator.java
View File

@ -15,7 +15,7 @@
*/
package org.springframework.web.server;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.util.Assert;

2
spring-web-reactive/src/main/java/org/springframework/web/server/WebToHttpHandlerAdapter.java
View File

@ -17,7 +17,7 @@ package org.springframework.web.server;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import reactor.Mono;
import reactor.core.publisher.Mono;
import org.springframework.http.HttpStatus;
import org.springframework.http.server.reactive.HttpHandler;

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

@ -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;

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

@ -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;

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

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

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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
*/

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

@ -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
*/

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

@ -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
*/

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

@ -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
*/

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

@ -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

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

@ -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
*/

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

@ -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
*/

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

@ -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
*/

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

@ -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
*/

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

@ -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
*/

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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

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

@ -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;

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

@ -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;

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

@ -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;