Move functional web framework to web.reactive.function.server

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/package-info.java

-/**
- * Types that make up Spring's functional web framework.
- */
-package org.springframework.web.reactive.function;
\ No newline at end of file

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultHandlerStrategiesBuilder.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultHandlerStrategiesBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.ArrayList;
 import java.util.Collections;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultServerRequest.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.InetSocketAddress;
 import java.net.URI;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/DefaultServerResponseBuilder.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.URI;
 import java.time.ZoneId;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/HandlerFilterFunction.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFilterFunction.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.function.Function;
 
 import reactor.core.publisher.Mono;
 
 import org.springframework.util.Assert;
-import org.springframework.web.reactive.function.support.ServerRequestWrapper;
+import org.springframework.web.reactive.function.server.support.ServerRequestWrapper;
 
 /**
  * Represents a function that filters a {@linkplain HandlerFunction handler function}.

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/HandlerFunction.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import reactor.core.publisher.Mono;
 

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/HandlerStrategies.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/HandlerStrategies.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.function.Supplier;
 import java.util.stream.Stream;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/PathResourceLookupFunction.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/PathResourceLookupFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -107,7 +107,7 @@ class PathResourceLookupFunction implements Function<ServerRequest, Mono<Resourc
 				return true;
 			}
 		}
-		if (path.contains("..")) {
+		if (path.contains("")) {
 			path = StringUtils.cleanPath(path);
 			if (path.contains("../")) {
 				return true;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RequestPredicate.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import org.springframework.util.Assert;
 

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RequestPredicates.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RequestPredicates.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.URI;
 import java.util.Arrays;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/ResourceHandlerFunction.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ResourceHandlerFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RouterFunction.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.Optional;
 

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/RouterFunctions.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/RouterFunctions.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.Map;
 import java.util.function.Function;
@@ -25,6 +25,8 @@ import org.springframework.core.io.Resource;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.HandlerMapping;
+import org.springframework.web.reactive.function.server.support.HandlerFunctionAdapter;
+import org.springframework.web.reactive.function.server.support.ServerResponseResultHandler;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.adapter.HttpWebHandlerAdapter;
@@ -205,8 +207,8 @@ public abstract class RouterFunctions {
 	 * {@link org.springframework.web.reactive.DispatcherHandler}.
 	 * @param routerFunction the router function to convert
 	 * @return an handler mapping that maps HTTP request to a handler using the given router function
-	 * @see org.springframework.web.reactive.function.support.HandlerFunctionAdapter
-	 * @see org.springframework.web.reactive.function.support.ServerResponseResultHandler
+	 * @see HandlerFunctionAdapter
+	 * @see ServerResponseResultHandler
 	 */
 	public static HandlerMapping toHandlerMapping(RouterFunction<?> routerFunction) {
 		return toHandlerMapping(routerFunction, HandlerStrategies.withDefaults());
@@ -220,8 +222,8 @@ public abstract class RouterFunctions {
 	 * @param routerFunction the router function to convert
 	 * @param strategies the strategies to use
 	 * @return an handler mapping that maps HTTP request to a handler using the given router function
-	 * @see org.springframework.web.reactive.function.support.HandlerFunctionAdapter
-	 * @see org.springframework.web.reactive.function.support.ServerResponseResultHandler
+	 * @see HandlerFunctionAdapter
+	 * @see ServerResponseResultHandler
 	 */
 	public static HandlerMapping toHandlerMapping(RouterFunction<?> routerFunction, HandlerStrategies strategies) {
 		Assert.notNull(routerFunction, "RouterFunction must not be null");

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/ServerRequest.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.InetSocketAddress;
 import java.net.URI;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/ServerResponse.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/ServerResponse.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.URI;
 import java.time.ZonedDateTime;

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/package-info.java

+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Types that make up Spring's functional web framework.
+ */
+package org.springframework.web.reactive.function.server;
\ No newline at end of file

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/HandlerFunctionAdapter.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/HandlerFunctionAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function.support;
+package org.springframework.web.reactive.function.server.support;
 
 import java.lang.reflect.Method;
 
@@ -23,9 +23,9 @@ import reactor.core.publisher.Mono;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.reactive.HandlerAdapter;
 import org.springframework.web.reactive.HandlerResult;
-import org.springframework.web.reactive.function.HandlerFunction;
-import org.springframework.web.reactive.function.RouterFunctions;
-import org.springframework.web.reactive.function.ServerRequest;
+import org.springframework.web.reactive.function.server.HandlerFunction;
+import org.springframework.web.reactive.function.server.RouterFunctions;
+import org.springframework.web.reactive.function.server.ServerRequest;
 import org.springframework.web.server.ServerWebExchange;
 
 /**

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/ServerRequestWrapper.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function.support;
+package org.springframework.web.reactive.function.server.support;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
@@ -34,8 +34,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.codec.BodyExtractor;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.util.Assert;
-import org.springframework.web.reactive.function.HandlerFunction;
-import org.springframework.web.reactive.function.ServerRequest;
+import org.springframework.web.reactive.function.server.HandlerFunction;
+import org.springframework.web.reactive.function.server.ServerRequest;
 
 /**
  * Implementation of the {@link ServerRequest} interface that can be subclassed to adapt the request to a

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/ServerResponseResultHandler.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/ServerResponseResultHandler.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function.support;
+package org.springframework.web.reactive.function.server.support;
 
 import reactor.core.publisher.Mono;
 
 import org.springframework.util.Assert;
 import org.springframework.web.reactive.HandlerResult;
 import org.springframework.web.reactive.HandlerResultHandler;
-import org.springframework.web.reactive.function.HandlerStrategies;
-import org.springframework.web.reactive.function.ServerResponse;
+import org.springframework.web.reactive.function.server.HandlerStrategies;
+import org.springframework.web.reactive.function.server.ServerResponse;
 import org.springframework.web.server.ServerWebExchange;
 
 /**

spring-web-reactive/src/main/java/org/springframework/web/reactive/function/support/package-info.java → spring-web-reactive/src/main/java/org/springframework/web/reactive/function/server/support/package-info.java

+/*
+ * Copyright 2002-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 /**
  * Classes supporting the {@code org.springframework.web.reactive.function} package.
  * Contains a {@code HandlerAdapter} that supports {@code HandlerFunction}s,
  * a {@code HandlerResultHandler} that supports {@code ServerResponse}s, and
  * a {@code ServerRequest} wrapper to adapt a request.
  */
-package org.springframework.web.reactive.function.support;
+package org.springframework.web.reactive.function.server.support;
\ No newline at end of file

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/AbstractRouterFunctionIntegrationTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/AbstractRouterFunctionIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import org.springframework.http.server.reactive.AbstractHttpHandlerIntegrationTests;
 import org.springframework.http.server.reactive.HttpHandler;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/DefaultServerRequestTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerRequestTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.InetSocketAddress;
 import java.net.URI;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/DefaultServerResponseBuilderTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DefaultServerResponseBuilderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.URI;
 import java.time.ZonedDateTime;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/DispatcherHandlerIntegrationTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/DispatcherHandlerIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.List;
 import java.util.function.Supplier;
@@ -42,15 +42,15 @@ import org.springframework.web.reactive.DispatcherHandler;
 import org.springframework.web.reactive.HandlerAdapter;
 import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.reactive.config.WebReactiveConfigurationSupport;
-import org.springframework.web.reactive.function.support.HandlerFunctionAdapter;
-import org.springframework.web.reactive.function.support.ServerResponseResultHandler;
+import org.springframework.web.reactive.function.server.support.HandlerFunctionAdapter;
+import org.springframework.web.reactive.function.server.support.ServerResponseResultHandler;
 import org.springframework.web.reactive.result.view.ViewResolver;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 
 import static org.junit.Assert.assertEquals;
 import static org.springframework.http.codec.BodyInserters.fromObject;
 import static org.springframework.http.codec.BodyInserters.fromPublisher;
-import static org.springframework.web.reactive.function.RouterFunctions.route;
+import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 
 /**
  * Tests the use of {@link HandlerFunction} and {@link RouterFunction} in a

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/HandlerStrategiesTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HandlerStrategiesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.Collections;
 import java.util.List;
@@ -36,7 +36,8 @@ import org.springframework.http.ReactiveHttpOutputMessage;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.http.codec.HttpMessageWriter;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/HeadersWrapperTest.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/HeadersWrapperTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRange;
 import org.springframework.http.MediaType;
-import org.springframework.web.reactive.function.support.ServerRequestWrapper;
+import org.springframework.web.reactive.function.server.support.ServerRequestWrapper;
 
 import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/MockServerRequest.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/MockServerRequest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.InetSocketAddress;
 import java.net.URI;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/PathResourceLookupFunctionTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PathResourceLookupFunctionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,9 +34,10 @@ public class PathResourceLookupFunctionTests {
 
 	@Test
 	public void normal() throws Exception {
-		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/");
+		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/server/");
 
-		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
+		PathResourceLookupFunction
+				function = new PathResourceLookupFunction("/resources/**", location);
 		MockServerRequest request = MockServerRequest.builder()
 				.uri(new URI("http://localhost/resources/response.txt"))
 				.build();
@@ -58,14 +59,14 @@ public class PathResourceLookupFunctionTests {
 
 	@Test
 	public void subPath() throws Exception {
-		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/");
+		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/server/");
 
 		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
 		MockServerRequest request = MockServerRequest.builder()
 				.uri(new URI("http://localhost/resources/child/response.txt"))
 				.build();
 		Mono<Resource> result = function.apply(request);
-		File expected = new ClassPathResource("org/springframework/web/reactive/function/child/response.txt").getFile();
+		File expected = new ClassPathResource("org/springframework/web/reactive/function/server/child/response.txt").getFile();
 		StepVerifier.create(result)
 				.expectNextMatches(resource -> {
 					try {
@@ -81,7 +82,7 @@ public class PathResourceLookupFunctionTests {
 
 	@Test
 	public void notFound() throws Exception {
-		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/");
+		ClassPathResource location = new ClassPathResource("org/springframework/web/reactive/function/server/");
 
 		PathResourceLookupFunction function = new PathResourceLookupFunction("/resources/**", location);
 		MockServerRequest request = MockServerRequest.builder()

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/PublisherHandlerFunctionIntegrationTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/PublisherHandlerFunctionIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.URI;
 import java.util.List;
@@ -34,9 +34,9 @@ import org.springframework.web.client.RestTemplate;
 import static org.junit.Assert.assertEquals;
 import static org.springframework.http.codec.BodyExtractors.toMono;
 import static org.springframework.http.codec.BodyInserters.fromPublisher;
-import static org.springframework.web.reactive.function.RequestPredicates.GET;
-import static org.springframework.web.reactive.function.RequestPredicates.POST;
-import static org.springframework.web.reactive.function.RouterFunctions.route;
+import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
+import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
+import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RequestPredicateTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicateTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import org.junit.Test;
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RequestPredicatesTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RequestPredicatesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.net.URI;
 import java.util.Collections;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/ResourceHandlerFunctionTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/ResourceHandlerFunctionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -35,7 +35,9 @@ import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RouterFunctionTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import org.junit.Test;
 import reactor.core.publisher.Mono;

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/RouterFunctionsTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/RouterFunctionsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.util.stream.Stream;
 
@@ -51,7 +51,8 @@ public class RouterFunctionsTests {
 		RequestPredicate requestPredicate = mock(RequestPredicate.class);
 		when(requestPredicate.test(request)).thenReturn(true);
 
-		RouterFunction<ServerResponse> result = RouterFunctions.route(requestPredicate, handlerFunction);
+		RouterFunction<ServerResponse>
+				result = RouterFunctions.route(requestPredicate, handlerFunction);
 		assertNotNull(result);
 
 		Mono<HandlerFunction<ServerResponse>> resultHandlerFunction = result.route(request);

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/SseHandlerFunctionIntegrationTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/SseHandlerFunctionIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function;
+package org.springframework.web.reactive.function.server;
 
 import java.time.Duration;
 
@@ -28,11 +28,11 @@ import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.http.codec.BodyExtractors;
 import org.springframework.http.codec.ServerSentEvent;
-import org.springframework.web.client.reactive.ClientRequest;
-import org.springframework.web.client.reactive.WebClient;
+import org.springframework.web.reactive.function.client.ClientRequest;
+import org.springframework.web.reactive.function.client.WebClient;
 
 import static org.springframework.http.codec.BodyInserters.fromServerSentEvents;
-import static org.springframework.web.reactive.function.RouterFunctions.route;
+import static org.springframework.web.reactive.function.server.RouterFunctions.route;
 
 /**
  * @author Arjen Poutsma

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/support/ServerRequestWrapperTests.java → spring-web-reactive/src/test/java/org/springframework/web/reactive/function/server/support/ServerRequestWrapperTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.web.reactive.function.support;
+package org.springframework.web.reactive.function.server.support;
 
 import java.net.URI;
 import java.util.Collections;
@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.ServerRequest;
+import org.springframework.web.reactive.function.server.ServerRequest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;