diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java index 328cd891859..e04512dcebc 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandler.java @@ -22,9 +22,6 @@ import reactor.Mono; * Contract for handling HTTP requests in a non-blocking way. * * @author Arjen Poutsma - * @author Rossen Stoyanchev - * @author Sebastien Deleuze - * @see HttpFilter */ public interface HttpHandler { diff --git a/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java index 713a6928710..23127784966 100644 --- a/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/reactive/ResponseStatusExceptionHandler.java @@ -17,7 +17,7 @@ package org.springframework.web.reactive; import reactor.Mono; -import org.springframework.http.server.reactive.HttpExceptionHandler; +import org.springframework.web.server.HttpExceptionHandler; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.web.ResponseStatusException; diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/ErrorHandlingHttpHandler.java similarity index 89% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/ErrorHandlingHttpHandler.java index 09cf6a64137..3edbcfc50e4 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/ErrorHandlingHttpHandler.java @@ -13,13 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import java.util.Arrays; import java.util.List; import reactor.Mono; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/FilterChainHttpHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/FilterChainHttpHandler.java similarity index 88% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/FilterChainHttpHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/FilterChainHttpHandler.java index 80ac46057b5..2026ab3c076 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/FilterChainHttpHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/FilterChainHttpHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import java.util.Arrays; import java.util.Collections; @@ -21,6 +21,10 @@ import java.util.List; import reactor.Mono; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; + /** * {@link HttpHandler} that delegates to a chain of {@link HttpFilter}s followed * by a target {@link HttpHandler}. diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpExceptionHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpExceptionHandler.java similarity index 85% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpExceptionHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/HttpExceptionHandler.java index d982c115a79..2d0dc801135 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpExceptionHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpExceptionHandler.java @@ -13,10 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import reactor.Mono; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; + /** * A contract for resolving exceptions from HTTP request handling. * diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpFilter.java b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpFilter.java similarity index 86% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpFilter.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/HttpFilter.java index b21b1c2b0fa..e1433a26f79 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpFilter.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpFilter.java @@ -14,11 +14,14 @@ * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; -import org.reactivestreams.Publisher; import reactor.Mono; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; + /** * Contract for interception-style, chained processing of HTTP requests. * diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpFilterChain.java b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpFilterChain.java similarity index 86% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpFilterChain.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/HttpFilterChain.java index 0bb70708bc4..5188785610b 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpFilterChain.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpFilterChain.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import reactor.Mono; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; + /** * Represents a chain of {@link HttpFilter}s allowing each {@link HttpFilter} to * delegate to the next in the chain. diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandlerDecorator.java b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpHandlerDecorator.java similarity index 84% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandlerDecorator.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/HttpHandlerDecorator.java index 49190be05d3..c2062755ce2 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/HttpHandlerDecorator.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/HttpHandlerDecorator.java @@ -13,10 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import reactor.Mono; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.util.Assert; /** diff --git a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java b/spring-web-reactive/src/main/java/org/springframework/web/server/InternalServerErrorExceptionHandler.java similarity index 86% rename from spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java rename to spring-web-reactive/src/main/java/org/springframework/web/server/InternalServerErrorExceptionHandler.java index 8d6cc4a22a8..a5580d794a6 100644 --- a/spring-web-reactive/src/main/java/org/springframework/http/server/reactive/InternalServerErrorExceptionHandler.java +++ b/spring-web-reactive/src/main/java/org/springframework/web/server/InternalServerErrorExceptionHandler.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import reactor.Mono; import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; /** * Handle any exception by setting the response status to 500. diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java index 5a43444de45..5f7c3e3197b 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/DispatcherHandlerErrorTests.java @@ -37,11 +37,11 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.ResponseStatusException; -import org.springframework.http.server.reactive.ErrorHandlingHttpHandler; -import org.springframework.http.server.reactive.FilterChainHttpHandler; -import org.springframework.http.server.reactive.HttpExceptionHandler; -import org.springframework.http.server.reactive.HttpFilter; -import org.springframework.http.server.reactive.HttpFilterChain; +import org.springframework.web.server.ErrorHandlingHttpHandler; +import org.springframework.web.server.FilterChainHttpHandler; +import org.springframework.web.server.HttpExceptionHandler; +import org.springframework.web.server.HttpFilter; +import org.springframework.web.server.HttpFilterChain; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.MockServerHttpRequest; import org.springframework.http.server.reactive.MockServerHttpResponse; diff --git a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java index 5b7a76143ae..3507f005f4e 100644 --- a/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/reactive/handler/SimpleUrlHandlerMappingIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests; -import org.springframework.http.server.reactive.ErrorHandlingHttpHandler; +import org.springframework.web.server.ErrorHandlingHttpHandler; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/server/ErrorHandlingHttpHandlerTests.java similarity index 88% rename from spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/server/ErrorHandlingHttpHandlerTests.java index 925eeacc7c2..43b431c90d6 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/ErrorHandlingHttpHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/server/ErrorHandlingHttpHandlerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import java.net.URI; @@ -27,6 +27,14 @@ import reactor.rx.stream.Signal; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.MockServerHttpRequest; +import org.springframework.http.server.reactive.MockServerHttpResponse; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; +import org.springframework.web.server.ErrorHandlingHttpHandler; +import org.springframework.web.server.HttpExceptionHandler; +import org.springframework.web.server.InternalServerErrorExceptionHandler; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/FilterChainHttpHandlerTests.java b/spring-web-reactive/src/test/java/org/springframework/web/server/FilterChainHttpHandlerTests.java similarity index 94% rename from spring-web-reactive/src/test/java/org/springframework/http/server/reactive/FilterChainHttpHandlerTests.java rename to spring-web-reactive/src/test/java/org/springframework/web/server/FilterChainHttpHandlerTests.java index 3f88b4b97a1..370dd644db3 100644 --- a/spring-web-reactive/src/test/java/org/springframework/http/server/reactive/FilterChainHttpHandlerTests.java +++ b/spring-web-reactive/src/test/java/org/springframework/web/server/FilterChainHttpHandlerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.http.server.reactive; +package org.springframework.web.server; import org.apache.commons.logging.Log; @@ -22,6 +22,10 @@ import org.junit.Before; import org.junit.Test; import reactor.Mono; +import org.springframework.http.server.reactive.HttpHandler; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpResponse; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock;