diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java index 10a60be070..35ce3803bf 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/AbstractEncoder.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.Encoder; import org.springframework.util.MimeType; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java index 5694887b4b..a7a9d45660 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceDecoder.java @@ -23,7 +23,6 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.AbstractDecoder; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; diff --git a/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java index 8c9d0bd362..3823c4d709 100644 --- a/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java +++ b/spring-web-reactive/src/main/java/org/springframework/core/codec/ResourceEncoder.java @@ -22,7 +22,6 @@ import java.io.InputStream; import reactor.core.publisher.Flux; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.AbstractSingleValueEncoder; import org.springframework.core.io.Resource; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DataBufferFactory; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodySubscriber.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodySubscriber.java index e1b6457453..049d74b205 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodySubscriber.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/AbstractResponseBodySubscriber.java @@ -26,7 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Subscriber; import org.reactivestreams.Subscription; -import reactor.core.util.BackpressureUtils; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.FlushingDataBuffer; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java index bb710f40b4..c238f60e55 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/boot/HttpServerSupport.java @@ -16,8 +16,6 @@ package org.springframework.http.server.reactive.boot; - -import org.springframework.beans.factory.InitializingBean; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.util.SocketUtils; diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java index 6e9a3265d7..23b3a695b9 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/MediaTypeExpression.java @@ -17,7 +17,6 @@ package org.springframework.web.reactive.result.condition; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.RequestMapping; /** * A contract for media type expressions (e.g. "text/plain", "!text/plain") as diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java index 8818330c02..1f4dd561ae 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/NameValueExpression.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.condition; -import org.springframework.web.bind.annotation.RequestMapping; - /** * A contract for {@code "name!=value"} style expression used to specify request * parameters and request header conditions in {@code @RequestMapping}. diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java index 99bc2f2aa8..d21f85829b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/condition/RequestCondition.java @@ -16,8 +16,6 @@ package org.springframework.web.reactive.result.condition; -import javax.servlet.http.HttpServletRequest; - import org.springframework.web.server.ServerWebExchange; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/View.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/View.java index a6e82eb517..3b9ee66f56 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/View.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/result/view/View.java @@ -16,12 +16,9 @@ package org.springframework.web.reactive.result.view; import java.util.List; -import java.util.Optional; -import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; import org.springframework.web.reactive.HandlerResult; import org.springframework.web.server.ServerWebExchange; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java index d44f7cb544..8162200f34 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferDecoderTests.java @@ -24,7 +24,6 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.ByteBufferDecoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java index 5160395698..dc44221899 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ByteBufferEncoderTests.java @@ -26,7 +26,6 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.ByteBufferEncoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java index 22b8e5a426..15db097214 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceDecoderTests.java @@ -23,7 +23,6 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.ResourceDecoder; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java index fb747bb3a0..75bb8a07c3 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/ResourceEncoderTests.java @@ -24,7 +24,6 @@ import reactor.core.publisher.Mono; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.ResourceEncoder; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java index adce87826a..c6624efdeb 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringDecoderTests.java @@ -23,7 +23,6 @@ import reactor.core.publisher.Mono; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.StringDecoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java index 850775311f..6bcf51c6ca 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/codec/StringEncoderTests.java @@ -26,7 +26,6 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.ResolvableType; -import org.springframework.core.codec.StringEncoder; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.support.DataBufferUtils; import org.springframework.http.MediaType; diff --git a/spring-web-reactive/src/test/java/org/springframework/core/convert/support/MonoToCompletableFutureConverterTests.java b/spring-web-reactive/src/test/java/org/springframework/core/convert/support/MonoToCompletableFutureConverterTests.java index c62ee2b12e..64b33cc9b8 100644 --- a/spring-web-reactive/src/test/java/org/springframework/core/convert/support/MonoToCompletableFutureConverterTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/core/convert/support/MonoToCompletableFutureConverterTests.java @@ -22,8 +22,6 @@ import org.junit.Test; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import rx.Observable; -import rx.Single; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java index cc7bf4d4bd..6f33966118 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/json/JacksonJsonEncoderTests.java @@ -28,7 +28,6 @@ import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.http.MediaType; import org.springframework.http.codec.Pojo; -import org.springframework.http.codec.json.JacksonJsonEncoder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java index fa942c9b94..09a82eb9ac 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/codec/xml/XmlEventDecoderTests.java @@ -23,7 +23,6 @@ import reactor.core.publisher.Flux; import reactor.core.test.TestSubscriber; import org.springframework.core.io.buffer.AbstractDataBufferAllocatingTestCase; -import org.springframework.http.codec.xml.XmlEventDecoder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java index e6c056b7f8..730e88f088 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ChannelSendOperatorTests.java @@ -20,7 +20,6 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import org.junit.Before; import org.junit.Test; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java index 0f45e8826a..73c45012ae 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/WebHandlerIntegrationTests.java @@ -26,11 +26,9 @@ import org.junit.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import org.springframework.beans.MutablePropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.io.buffer.DataBuffer; import org.springframework.core.io.buffer.DefaultDataBufferFactory; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java index fac9daa7ff..147c269acc 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java @@ -36,7 +36,6 @@ import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; import org.springframework.ui.ExtendedModelMap; import org.springframework.ui.ModelMap; -import org.springframework.web.method.HandlerMethod; import org.springframework.web.reactive.HandlerResult; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.adapter.DefaultServerWebExchange;