Refactor reactive mock request and response support

MockServerHttpRequest and MockServerHttpResponse now extend the same
abstract base classes that server-specific implementations do and
therefore approximate their behavior more closely.

As an immediate consequence MockServerHttpRequest is read-only after
it is created. Instead it now exposes static builder methods similar
to those found in RequestEntity. This enforces more strictness as well
as recycling of requests in tests and provides nicer builder methods.

To simplify tests DefaultServerWebExchange now offers a constructor
with just a request and response, and automatically creating a
DefaultWebSessionManager.

The spring-test module now also contains client-side reactive mock
request and response implementations. The mock client request extends
the same AbstractClientHttpRequest as client-specific implementations
do. There is no abstract base class for client responses.

Issue: SPR-14590

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

@@ -19,6 +19,7 @@ package org.springframework.web.reactive;
 import java.time.Duration;
 import java.util.Collections;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.reactivestreams.Publisher;
@@ -29,7 +30,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.codec.CharSequenceEncoder;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
@@ -50,7 +50,6 @@ import org.springframework.web.server.WebExceptionHandler;
 import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.handler.ExceptionHandlingWebHandler;
-import org.springframework.web.server.session.MockWebSessionManager;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.startsWith;
@@ -58,6 +57,7 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 
 /**
@@ -76,28 +76,20 @@ public class DispatcherHandlerErrorTests {
 
 	private MockServerHttpRequest request;
 
-	private ServerWebExchange exchange;
-
 
 	@Before
 	public void setUp() throws Exception {
 		AnnotationConfigApplicationContext appContext = new AnnotationConfigApplicationContext();
 		appContext.register(TestConfig.class);
 		appContext.refresh();
-
 		this.dispatcherHandler = new DispatcherHandler(appContext);
-
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		MockWebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(this.request, response, sessionManager);
 	}
 
 
 	@Test
 	public void noHandler() throws Exception {
-		this.request.setUri("/does-not-exist");
-		Mono<Void> publisher = this.dispatcherHandler.handle(this.exchange);
+		this.request = MockServerHttpRequest.get("/does-not-exist").build();
+		Mono<Void> publisher = this.dispatcherHandler.handle(createExchange());
 
 		StepVerifier.create(publisher)
 				.consumeErrorWith(error -> {
@@ -110,8 +102,8 @@ public class DispatcherHandlerErrorTests {
 
 	@Test
 	public void controllerReturnsMonoError() throws Exception {
-		this.request.setUri("/error-signal");
-		Mono<Void> publisher = this.dispatcherHandler.handle(this.exchange);
+		this.request = MockServerHttpRequest.get("/error-signal").build();
+		Mono<Void> publisher = this.dispatcherHandler.handle(createExchange());
 
 		StepVerifier.create(publisher)
 				.consumeErrorWith(error -> assertSame(EXCEPTION, error))
@@ -120,8 +112,8 @@ public class DispatcherHandlerErrorTests {
 
 	@Test
 	public void controllerThrowsException() throws Exception {
-		this.request.setUri("/raise-exception");
-		Mono<Void> publisher = this.dispatcherHandler.handle(this.exchange);
+		this.request = MockServerHttpRequest.get("/raise-exception").build();
+		Mono<Void> publisher = this.dispatcherHandler.handle(createExchange());
 
 		StepVerifier.create(publisher)
 				.consumeErrorWith(error -> assertSame(EXCEPTION, error))
@@ -130,8 +122,8 @@ public class DispatcherHandlerErrorTests {
 
 	@Test
 	public void unknownReturnType() throws Exception {
-		this.request.setUri("/unknown-return-type");
-		Mono<Void> publisher = this.dispatcherHandler.handle(this.exchange);
+		this.request = MockServerHttpRequest.get("/unknown-return-type").build();
+		Mono<Void> publisher = this.dispatcherHandler.handle(createExchange());
 
 		StepVerifier.create(publisher)
 				.consumeErrorWith(error -> {
@@ -143,8 +135,8 @@ public class DispatcherHandlerErrorTests {
 
 	@Test
 	public void responseBodyMessageConversionError() throws Exception {
-		this.request.setUri("/request-body").setHeader("Accept", "application/json").setBody("body");
-		Mono<Void> publisher = this.dispatcherHandler.handle(this.exchange);
+		this.request = MockServerHttpRequest.post("/request-body").accept(APPLICATION_JSON).body("body");
+		Mono<Void> publisher = this.dispatcherHandler.handle(createExchange());
 
 		StepVerifier.create(publisher)
 				.consumeErrorWith(error -> assertThat(error, instanceOf(NotAcceptableStatusException.class)))
@@ -153,8 +145,8 @@ public class DispatcherHandlerErrorTests {
 
 	@Test
 	public void requestBodyError() throws Exception {
-		this.request.setUri("/request-body").setBody(Mono.error(EXCEPTION));
-		Mono<Void> publisher = this.dispatcherHandler.handle(this.exchange);
+		this.request = MockServerHttpRequest.post("/request-body").body(Mono.error(EXCEPTION));
+		Mono<Void> publisher = this.dispatcherHandler.handle(createExchange());
 
 		StepVerifier.create(publisher)
 				.consumeErrorWith(error -> {
@@ -166,13 +158,19 @@ public class DispatcherHandlerErrorTests {
 
 	@Test
 	public void webExceptionHandler() throws Exception {
-		this.request.setUri("/unknown-argument-type");
+		this.request = MockServerHttpRequest.get("/unknown-argument-type").build();
+		ServerWebExchange exchange = createExchange();
 
 		WebExceptionHandler exceptionHandler = new ServerError500ExceptionHandler();
 		WebHandler webHandler = new ExceptionHandlingWebHandler(this.dispatcherHandler, exceptionHandler);
-		webHandler.handle(this.exchange).block(Duration.ofSeconds(5));
+		webHandler.handle(exchange).block(Duration.ofSeconds(5));
 
-		assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, this.exchange.getResponse().getStatusCode());
+		assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, exchange.getResponse().getStatusCode());
+	}
+
+	@NotNull
+	private ServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/CompositeContentTypeResolverBuilderTests.java

@@ -17,19 +17,17 @@ package org.springframework.web.reactive.accept;
 
 import java.net.URISyntaxException;
 import java.util.Collections;
+import java.util.List;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.NotAcceptableStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -54,14 +52,13 @@ public class CompositeContentTypeResolverBuilderTests {
 		assertEquals("Should ignore unknown extensions by default",
 				Collections.<MediaType>emptyList(), resolver.resolveMediaTypes(exchange));
 
-		exchange = createExchange("/flower");
-		exchange.getRequest().getQueryParams().add("format", "gif");
+		exchange = createExchange("/flower?format=gif");
 
 		assertEquals("Should not resolve request parameters by default",
 				Collections.<MediaType>emptyList(), resolver.resolveMediaTypes(exchange));
 
-		exchange = createExchange("/flower");
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.IMAGE_GIF));
+		ServerHttpRequest request = MockServerHttpRequest.get("/flower").accept(MediaType.IMAGE_GIF).build();
+		exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		assertEquals("Should resolve Accept header by default",
 				Collections.singletonList(MediaType.IMAGE_GIF), resolver.resolveMediaTypes(exchange));
@@ -108,9 +105,7 @@ public class CompositeContentTypeResolverBuilderTests {
 				.ignoreUnknownPathExtensions(false)
 				.build();
 
-		ServerWebExchange exchange = createExchange("/flower.xyz");
-		exchange.getRequest().getQueryParams().add("format", "json");
-
+		ServerWebExchange exchange = createExchange("/flower.xyz?format=json");
 		resolver.resolveMediaTypes(exchange);
 	}
 
@@ -121,11 +116,9 @@ public class CompositeContentTypeResolverBuilderTests {
 				.mediaType("json", MediaType.APPLICATION_JSON)
 				.build();
 
-		ServerWebExchange exchange = createExchange("/flower");
-		exchange.getRequest().getQueryParams().add("format", "json");
+		ServerWebExchange exchange = createExchange("/flower?format=json");
 
-		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON),
-				resolver.resolveMediaTypes(exchange));
+		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON), resolver.resolveMediaTypes(exchange));
 	}
 
 	@Test(expected = NotAcceptableStatusException.class) // SPR-10170
@@ -134,9 +127,7 @@ public class CompositeContentTypeResolverBuilderTests {
 				.favorParameter(true)
 				.build();
 
-		ServerWebExchange exchange = createExchange("/flower");
-		exchange.getRequest().getQueryParams().add("format", "xyz");
-
+		ServerWebExchange exchange = createExchange("/flower?format=xyz");
 		resolver.resolveMediaTypes(exchange);
 	}
 
@@ -146,8 +137,8 @@ public class CompositeContentTypeResolverBuilderTests {
 				.ignoreAcceptHeader(true)
 				.build();
 
-		ServerWebExchange exchange = createExchange("/flower");
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.IMAGE_GIF));
+		ServerHttpRequest request = MockServerHttpRequest.get("/flower").accept(MediaType.IMAGE_GIF).build();
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		assertEquals(Collections.<MediaType>emptyList(), resolver.resolveMediaTypes(exchange));
 	}
@@ -158,15 +149,10 @@ public class CompositeContentTypeResolverBuilderTests {
 				.defaultContentType(MediaType.APPLICATION_JSON)
 				.build();
 
-		ServerWebExchange exchange = createExchange("/");
+		ServerHttpRequest request = MockServerHttpRequest.get("/").accept(MediaType.ALL).build();
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
-		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON),
-				resolver.resolveMediaTypes(exchange));
-
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.ALL));
-
-		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON),
-				resolver.resolveMediaTypes(exchange));
+		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON), resolver.resolveMediaTypes(exchange));
 	}
 
 	@Test // SPR-12286
@@ -175,21 +161,20 @@ public class CompositeContentTypeResolverBuilderTests {
 				.defaultContentTypeResolver(new FixedContentTypeResolver(MediaType.APPLICATION_JSON))
 				.build();
 
+		List<MediaType> expected = Collections.singletonList(MediaType.APPLICATION_JSON);
+
 		ServerWebExchange exchange = createExchange("/");
+		assertEquals(expected, resolver.resolveMediaTypes(exchange));
 
-		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON),
-				resolver.resolveMediaTypes(exchange));
-
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.ALL));
-		assertEquals(Collections.singletonList(MediaType.APPLICATION_JSON),
-				resolver.resolveMediaTypes(exchange));
+		ServerHttpRequest request = MockServerHttpRequest.get("/").accept(MediaType.ALL).build();
+		exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
+		assertEquals(expected, resolver.resolveMediaTypes(exchange));
 	}
 
 
-	private ServerWebExchange createExchange(String path) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, path);
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+	private ServerWebExchange createExchange(String url) throws URISyntaxException {
+		ServerHttpRequest request = MockServerHttpRequest.get(url).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/HeaderContentTypeResolverTests.java

@@ -21,16 +21,13 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.NotAcceptableStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -70,12 +67,12 @@ public class HeaderContentTypeResolverTests {
 
 
 	private ServerWebExchange createExchange(String accept) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		if (accept != null) {
-			request.getHeaders().add("Accept", accept);
-		}
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+
+		ServerHttpRequest request = (accept != null ?
+				MockServerHttpRequest.get("/").header("accept", accept).build() :
+				MockServerHttpRequest.get("/").build());
+
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/accept/PathExtensionContentTypeResolverTests.java

@@ -22,11 +22,10 @@ import java.util.Map;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.NotAcceptableStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
@@ -110,7 +109,7 @@ public class PathExtensionContentTypeResolverTests {
 
 
 	private ServerWebExchange createExchange(String path) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, path);
+		ServerHttpRequest request = MockServerHttpRequest.get(path).build();
 		WebSessionManager sessionManager = new MockWebSessionManager();
 		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
 	}

spring-web-reactive/src/test/java/org/springframework/web/reactive/config/ResourceHandlerRegistryTests.java

@@ -30,7 +30,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.buffer.support.DataBufferTestUtils;
 import org.springframework.http.CacheControl;
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.reactive.HandlerMapping;
@@ -47,8 +46,6 @@ import org.springframework.web.reactive.resource.VersionResourceResolver;
 import org.springframework.web.reactive.resource.WebJarsResourceResolver;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -78,10 +75,9 @@ public class ResourceHandlerRegistryTests {
 		this.registration = this.registry.addResourceHandler("/resources/**");
 		this.registration.addResourceLocations("classpath:org/springframework/web/reactive/config/");
 
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "");
+		MockServerHttpRequest request = MockServerHttpRequest.get("").build();
 		this.response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, this.response, manager);
+		this.exchange = new DefaultServerWebExchange(request, this.response);
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationSupportTests.java

@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.List;
 import javax.xml.bind.annotation.XmlRootElement;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -34,7 +35,6 @@ import org.springframework.core.codec.CharSequenceEncoder;
 import org.springframework.core.codec.StringDecoder;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.DecoderHttpMessageReader;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
@@ -63,13 +63,19 @@ import org.springframework.web.reactive.result.view.ViewResolutionResultHandler;
 import org.springframework.web.reactive.result.view.ViewResolver;
 import org.springframework.web.reactive.result.view.freemarker.FreeMarkerConfigurer;
 import org.springframework.web.reactive.result.view.freemarker.FreeMarkerViewResolver;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebHandler;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.springframework.http.MediaType.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
+import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM;
+import static org.springframework.http.MediaType.APPLICATION_XML;
+import static org.springframework.http.MediaType.IMAGE_PNG;
+import static org.springframework.http.MediaType.TEXT_PLAIN;
 
 /**
  * Unit tests for {@link WebReactiveConfigurationSupport}.
@@ -79,14 +85,10 @@ public class WebReactiveConfigurationSupportTests {
 
 	private MockServerHttpRequest request;
 
-	private ServerWebExchange exchange;
-
 
 	@Before
 	public void setUp() throws Exception {
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, response, new MockWebSessionManager());
+		this.request = MockServerHttpRequest.get("/").build();
 	}
 
 
@@ -108,12 +110,12 @@ public class WebReactiveConfigurationSupportTests {
 		RequestedContentTypeResolver resolver = context.getBean(name, RequestedContentTypeResolver.class);
 		assertSame(resolver, mapping.getContentTypeResolver());
 
-		this.request.setUri("/path.json");
+		this.request = MockServerHttpRequest.get("/path.json").build();
 		List<MediaType> list = Collections.singletonList(MediaType.APPLICATION_JSON);
-		assertEquals(list, resolver.resolveMediaTypes(this.exchange));
+		assertEquals(list, resolver.resolveMediaTypes(createExchange()));
 
-		this.request.setUri("/path.xml");
-		assertEquals(Collections.emptyList(), resolver.resolveMediaTypes(this.exchange));
+		this.request = MockServerHttpRequest.get("/path.xml").build();
+		assertEquals(Collections.emptyList(), resolver.resolveMediaTypes(createExchange()));
 	}
 
 	@Test
@@ -267,6 +269,11 @@ public class WebReactiveConfigurationSupportTests {
 		assertNotNull(webHandler);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 
 	private void assertHasMessageReader(List<HttpMessageReader<?>> readers, Class<?> clazz, MediaType mediaType) {
 		ResolvableType type = ResolvableType.forClass(clazz);

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/BodyExtractorsTests.java

@@ -47,9 +47,9 @@ import org.springframework.http.codec.json.Jackson2JsonDecoder;
 import org.springframework.http.codec.xml.Jaxb2XmlDecoder;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 
-import static org.springframework.http.codec.json.AbstractJackson2Codec.JSON_VIEW_HINT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.springframework.http.codec.json.AbstractJackson2Codec.JSON_VIEW_HINT;
 
 /**
  * @author Arjen Poutsma
@@ -91,9 +91,7 @@ public class BodyExtractorsTests {
 				factory.wrap(ByteBuffer.wrap("foo".getBytes(StandardCharsets.UTF_8)));
 		Flux<DataBuffer> body = Flux.just(dataBuffer);
 
-		MockServerHttpRequest request = new MockServerHttpRequest();
-		request.setBody(body);
-
+		MockServerHttpRequest request = MockServerHttpRequest.post("/").body(body);
 		Mono<String> result = extractor.extract(request, this.context);
 
 		StepVerifier.create(result)
@@ -112,9 +110,9 @@ public class BodyExtractorsTests {
 				factory.wrap(ByteBuffer.wrap("{\"username\":\"foo\",\"password\":\"bar\"}".getBytes(StandardCharsets.UTF_8)));
 		Flux<DataBuffer> body = Flux.just(dataBuffer);
 
-		MockServerHttpRequest request = new MockServerHttpRequest();
-		request.getHeaders().setContentType(MediaType.APPLICATION_JSON);
-		request.setBody(body);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(body);
 
 		Mono<User> result = extractor.extract(request, this.context);
 
@@ -136,9 +134,7 @@ public class BodyExtractorsTests {
 				factory.wrap(ByteBuffer.wrap("foo".getBytes(StandardCharsets.UTF_8)));
 		Flux<DataBuffer> body = Flux.just(dataBuffer);
 
-		MockServerHttpRequest request = new MockServerHttpRequest();
-		request.setBody(body);
-
+		MockServerHttpRequest request = MockServerHttpRequest.post("/").body(body);
 		Flux<String> result = extractor.extract(request, this.context);
 
 		StepVerifier.create(result)
@@ -157,9 +153,9 @@ public class BodyExtractorsTests {
 				factory.wrap(ByteBuffer.wrap("[{\"username\":\"foo\",\"password\":\"bar\"},{\"username\":\"bar\",\"password\":\"baz\"}]".getBytes(StandardCharsets.UTF_8)));
 		Flux<DataBuffer> body = Flux.just(dataBuffer);
 
-		MockServerHttpRequest request = new MockServerHttpRequest();
-		request.getHeaders().setContentType(MediaType.APPLICATION_JSON);
-		request.setBody(body);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(body);
 
 		Flux<User> result = extractor.extract(request, this.context);
 
@@ -185,9 +181,9 @@ public class BodyExtractorsTests {
 				factory.wrap(ByteBuffer.wrap("foo".getBytes(StandardCharsets.UTF_8)));
 		Flux<DataBuffer> body = Flux.just(dataBuffer);
 
-		MockServerHttpRequest request = new MockServerHttpRequest();
-		request.getHeaders().setContentType(MediaType.APPLICATION_JSON);
-		request.setBody(body);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.contentType(MediaType.APPLICATION_JSON)
+				.body(body);
 
 		BodyExtractor.Context emptyContext = new BodyExtractor.Context() {
 			@Override
@@ -215,9 +211,7 @@ public class BodyExtractorsTests {
 				factory.wrap(ByteBuffer.wrap("foo".getBytes(StandardCharsets.UTF_8)));
 		Flux<DataBuffer> body = Flux.just(dataBuffer);
 
-		MockServerHttpRequest request = new MockServerHttpRequest();
-		request.setBody(body);
-
+		MockServerHttpRequest request = MockServerHttpRequest.post("/").body(body);
 		Flux<DataBuffer> result = extractor.extract(request, this.context);
 
 		StepVerifier.create(result)
@@ -229,6 +223,7 @@ public class BodyExtractorsTests {
 
 	interface SafeToDeserialize {}
 
+	@SuppressWarnings("unused")
 	private static class User {
 
 		@JsonView(SafeToDeserialize.class)

spring-web-reactive/src/test/java/org/springframework/web/reactive/function/client/DefaultClientRequestBuilderTests.java

@@ -36,7 +36,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.client.reactive.ClientHttpRequest;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
 import org.springframework.http.codec.HttpMessageWriter;
-import org.springframework.web.client.reactive.test.MockClientHttpRequest;
+import org.springframework.mock.http.client.reactive.test.MockClientHttpRequest;
 import org.springframework.web.reactive.function.BodyInserter;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -171,7 +171,7 @@ public class DefaultClientRequestBuilderTests {
 				.cookie("foo", "bar")
 				.build();
 
-		MockClientHttpRequest request = new MockClientHttpRequest();
+		MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, "/");
 		WebClientStrategies strategies = mock(WebClientStrategies.class);
 
 		result.writeTo(request, strategies).block();
@@ -196,14 +196,13 @@ public class DefaultClientRequestBuilderTests {
 		ClientRequest<String> result = ClientRequest.POST("http://example.com")
 				.body(inserter);
 
-		MockClientHttpRequest request = new MockClientHttpRequest();
-
 		List<HttpMessageWriter<?>> messageWriters = new ArrayList<>();
-		messageWriters.add(new EncoderHttpMessageWriter<CharSequence>(new CharSequenceEncoder()));
+		messageWriters.add(new EncoderHttpMessageWriter<>(new CharSequenceEncoder()));
 
 		WebClientStrategies strategies = mock(WebClientStrategies.class);
 		when(strategies.messageWriters()).thenReturn(messageWriters::stream);
 
+		MockClientHttpRequest request = new MockClientHttpRequest(HttpMethod.GET, "/");
 		result.writeTo(request, strategies).block();
 		assertNotNull(request.getBody());
 	}

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

@@ -51,8 +51,7 @@ public class ResourceHandlerFunctionTests {
 
 	@Test
 	public void get() throws IOException {
-		MockServerHttpRequest mockRequest =
-				new MockServerHttpRequest(HttpMethod.GET, "http://localhost");
+		MockServerHttpRequest mockRequest = MockServerHttpRequest.get("http://localhost").build();
 		MockServerHttpResponse mockResponse = new MockServerHttpResponse();
 		ServerWebExchange exchange = new DefaultServerWebExchange(mockRequest, mockResponse,
 				new MockWebSessionManager());
@@ -93,8 +92,7 @@ TODO: enable when ServerEntityResponse is reintroduced
 
 	@Test
 	public void head() throws IOException {
-		MockServerHttpRequest mockRequest =
-				new MockServerHttpRequest(HttpMethod.HEAD, "http://localhost");
+		MockServerHttpRequest mockRequest = MockServerHttpRequest.head("http://localhost").build();
 		MockServerHttpResponse mockResponse = new MockServerHttpResponse();
 		ServerWebExchange exchange = new DefaultServerWebExchange(mockRequest, mockResponse,
 				new MockWebSessionManager());
@@ -123,8 +121,7 @@ TODO: enable when ServerEntityResponse is reintroduced
 
 	@Test
 	public void options() {
-		MockServerHttpRequest mockRequest =
-				new MockServerHttpRequest(HttpMethod.OPTIONS, "http://localhost");
+		MockServerHttpRequest mockRequest = MockServerHttpRequest.options("http://localhost").build();
 		MockServerHttpResponse mockResponse = new MockServerHttpResponse();
 		ServerWebExchange exchange = new DefaultServerWebExchange(mockRequest, mockResponse,
 				new MockWebSessionManager());

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

@@ -22,7 +22,6 @@ import org.junit.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.http.codec.HttpMessageWriter;
 import org.springframework.http.server.reactive.HttpHandler;
@@ -145,8 +144,7 @@ public class RouterFunctionsTests {
 		HttpHandler result = RouterFunctions.toHttpHandler(routerFunction, strategies);
 		assertNotNull(result);
 
-		MockServerHttpRequest httpRequest =
-				new MockServerHttpRequest(HttpMethod.GET, "http://localhost");
+		MockServerHttpRequest httpRequest = MockServerHttpRequest.get("http://localhost").build();
 		MockServerHttpResponse serverHttpResponse = new MockServerHttpResponse();
 		result.handle(httpRequest, serverHttpResponse);
 	}

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

@@ -17,8 +17,6 @@ package org.springframework.web.reactive.handler;
 
 import java.util.Collections;
 
-import static org.junit.Assert.*;
-import static org.junit.Assert.assertSame;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -31,8 +29,12 @@ import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.reactive.CorsConfigurationSource;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 /**
  * Unit tests for CORS support at {@link AbstractUrlHandlerMapping} level.
@@ -135,12 +137,12 @@ public class CorsUrlHandlerMappingTests {
 	private ServerWebExchange createExchange(HttpMethod method, String path, String origin,
 			String accessControlRequestMethod) {
 
-		ServerHttpRequest request = new MockServerHttpRequest(method, "http://localhost" + path);
-		request.getHeaders().add(HttpHeaders.ORIGIN, origin);
-		request.getHeaders().add(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, accessControlRequestMethod);
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, response, sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest
+				.method(method, "http://localhost" + path)
+				.header("Origin", origin)
+				.header(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD, accessControlRequestMethod)
+				.build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 

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

@@ -15,6 +15,7 @@
  */
 package org.springframework.web.reactive.handler;
 
+import java.net.URI;
 import java.net.URISyntaxException;
 
 import org.junit.Test;
@@ -24,14 +25,12 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -103,9 +102,7 @@ public class SimpleUrlHandlerMappingTests {
 
 	}
 
-	private void testUrl(String url, Object bean, HandlerMapping handlerMapping, String pathWithinMapping)
-			throws URISyntaxException {
-
+	private void testUrl(String url, Object bean, HandlerMapping handlerMapping, String pathWithinMapping) {
 		ServerWebExchange exchange = createExchange(url);
 		Object actual = handlerMapping.getHandler(exchange).block();
 		if (bean != null) {
@@ -119,10 +116,9 @@ public class SimpleUrlHandlerMappingTests {
 		}
 	}
 
-	private ServerWebExchange createExchange(String path) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, path);
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+	private ServerWebExchange createExchange(String path) {
+		ServerHttpRequest request = MockServerHttpRequest.method(HttpMethod.GET, URI.create(path)).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/AppCacheManifestTransformerTests.java

@@ -29,14 +29,11 @@ import reactor.core.publisher.Mono;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
@@ -44,9 +41,7 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.mock;
 
 /**
- * Unit tests for
- * {@link AppCacheManifestTransformer}.
- *
+ * Unit tests for {@link AppCacheManifestTransformer}.
  * @author Rossen Stoyanchev
  * @author Brian Clozel
  */
@@ -56,8 +51,6 @@ public class AppCacheManifestTransformerTests {
 
 	private ResourceTransformerChain chain;
 
-	private ServerWebExchange exchange;
-
 
 	@Before
 	public void setup() {
@@ -75,7 +68,7 @@ public class AppCacheManifestTransformerTests {
 
 		CssLinkResourceTransformer cssLinkResourceTransformer = new CssLinkResourceTransformer();
 		cssLinkResourceTransformer.setResourceUrlProvider(resourceUrlProvider);
-		List<ResourceTransformer> transformers = Arrays.asList(cssLinkResourceTransformer);
+		List<ResourceTransformer> transformers = Collections.singletonList(cssLinkResourceTransformer);
 		this.chain = new DefaultResourceTransformerChain(resolverChain, transformers);
 		this.transformer = new AppCacheManifestTransformer();
 		this.transformer.setResourceUrlProvider(resourceUrlProvider);
@@ -88,30 +81,30 @@ public class AppCacheManifestTransformerTests {
 
 	@Test
 	public void noTransformIfExtensionNoMatch() throws Exception {
-		initExchange(HttpMethod.GET, "/static/foobar.file");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/foobar.file");
 		this.chain = mock(ResourceTransformerChain.class);
 		Resource resource = mock(Resource.class);
 		given(resource.getFilename()).willReturn("foobar.file");
-		given(this.chain.transform(this.exchange, resource)).willReturn(Mono.just(resource));
+		given(this.chain.transform(exchange, resource)).willReturn(Mono.just(resource));
 
-		Resource result = this.transformer.transform(this.exchange, resource, this.chain).blockMillis(5000);
+		Resource result = this.transformer.transform(exchange, resource, this.chain).blockMillis(5000);
 		assertEquals(resource, result);
 	}
 
 	@Test
 	public void syntaxErrorInManifest() throws Exception {
-		initExchange(HttpMethod.GET, "/static/error.appcache");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/error.appcache");
 		this.chain = mock(ResourceTransformerChain.class);
 		Resource resource = new ClassPathResource("test/error.appcache", getClass());
-		given(this.chain.transform(this.exchange, resource)).willReturn(Mono.just(resource));
+		given(this.chain.transform(exchange, resource)).willReturn(Mono.just(resource));
 
-		Resource result = this.transformer.transform(this.exchange, resource, this.chain).blockMillis(5000);
+		Resource result = this.transformer.transform(exchange, resource, this.chain).blockMillis(5000);
 		assertEquals(resource, result);
 	}
 
 	@Test
 	public void transformManifest() throws Exception {
-		initExchange(HttpMethod.GET, "/static/test.appcache");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/test.appcache");
 		VersionResourceResolver versionResolver = new VersionResourceResolver();
 		versionResolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy()));
 
@@ -126,7 +119,7 @@ public class AppCacheManifestTransformerTests {
 		this.chain = new DefaultResourceTransformerChain(resolverChain, transformers);
 
 		Resource resource = new ClassPathResource("test/test.appcache", getClass());
-		Resource result = this.transformer.transform(this.exchange, resource, this.chain).blockMillis(5000);
+		Resource result = this.transformer.transform(exchange, resource, this.chain).blockMillis(5000);
 		byte[] bytes = FileCopyUtils.copyToByteArray(result.getInputStream());
 		String content = new String(bytes, "UTF-8");
 
@@ -146,10 +139,8 @@ public class AppCacheManifestTransformerTests {
 				Matchers.containsString("# Hash: 4bf0338bcbeb0a5b3a4ec9ed8864107d"));
 	}
 
-	private void initExchange(HttpMethod method, String url) {
-		MockServerHttpRequest request = new MockServerHttpRequest(method, url);
-		ServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+	private ServerWebExchange createExchange(HttpMethod method, String url) {
+		MockServerHttpRequest request = MockServerHttpRequest.method(method, url).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/CachingResourceResolverTests.java

@@ -19,6 +19,7 @@ package org.springframework.web.reactive.resource;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -27,14 +28,9 @@ import org.springframework.cache.Cache;
 import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -52,8 +48,6 @@ public class CachingResourceResolverTests {
 
 	private List<Resource> locations;
 
-	private ServerWebExchange exchange;
-
 	private MockServerHttpRequest request;
 
 
@@ -70,10 +64,7 @@ public class CachingResourceResolverTests {
 		this.locations = new ArrayList<>();
 		this.locations.add(new ClassPathResource("test/", getClass()));
 
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "");
-		ServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		this.request = MockServerHttpRequest.get("").build();
 	}
 
 
@@ -81,7 +72,7 @@ public class CachingResourceResolverTests {
 	public void resolveResourceInternal() {
 		String file = "bar.css";
 		Resource expected = new ClassPathResource("test/" + file, getClass());
-		Resource actual = this.chain.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource actual = this.chain.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 
 		assertEquals(expected, actual);
 	}
@@ -93,14 +84,14 @@ public class CachingResourceResolverTests {
 		this.cache.put(CachingResourceResolver.RESOLVED_RESOURCE_CACHE_KEY_PREFIX + "bar.css", expected);
 
 		String file = "bar.css";
-		Resource actual = this.chain.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource actual = this.chain.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 
 		assertSame(expected, actual);
 	}
 
 	@Test
 	public void resolveResourceInternalNoMatch() {
-		assertNull(this.chain.resolveResource(this.exchange, "invalid.css", this.locations).blockMillis(5000));
+		assertNull(this.chain.resolveResource(createExchange(), "invalid.css", this.locations).blockMillis(5000));
 	}
 
 	@Test
@@ -128,9 +119,9 @@ public class CachingResourceResolverTests {
 	@Test
 	public void resolveResourceAcceptEncodingInCacheKey() {
 		String file = "bar.css";
-		this.request.setUri(file).setHeader("Accept-Encoding", "gzip");
+		this.request = MockServerHttpRequest.get(file).header("Accept-Encoding", "gzip").build();
 
-		Resource expected = this.chain.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource expected = this.chain.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 		String cacheKey = CachingResourceResolver.RESOLVED_RESOURCE_CACHE_KEY_PREFIX + file + "+encoding=gzip";
 
 		assertEquals(expected, this.cache.get(cacheKey).get());
@@ -139,9 +130,9 @@ public class CachingResourceResolverTests {
 	@Test
 	public void resolveResourceNoAcceptEncodingInCacheKey() {
 		String file = "bar.css";
-		this.request.setUri(file);
+		this.request = MockServerHttpRequest.get(file).build();
 
-		Resource expected = this.chain.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource expected = this.chain.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 		String cacheKey = CachingResourceResolver.RESOLVED_RESOURCE_CACHE_KEY_PREFIX + file;
 
 		assertEquals(expected, this.cache.get(cacheKey).get());
@@ -155,11 +146,16 @@ public class CachingResourceResolverTests {
 		this.cache.put(CachingResourceResolver.RESOLVED_RESOURCE_CACHE_KEY_PREFIX + "bar.css+encoding=gzip", gzResource);
 
 		String file = "bar.css";
-		this.request.setUri(file);
-		assertSame(resource, this.chain.resolveResource(this.exchange, file, this.locations).blockMillis(5000));
+		this.request = MockServerHttpRequest.get(file).build();
+		assertSame(resource, this.chain.resolveResource(createExchange(), file, this.locations).blockMillis(5000));
 
-		request.addHeader("Accept-Encoding", "gzip");
-		assertSame(gzResource, this.chain.resolveResource(this.exchange, file, this.locations).blockMillis(5000));
+		this.request = MockServerHttpRequest.get(file).header("Accept-Encoding", "gzip").build();
+		assertSame(gzResource, this.chain.resolveResource(createExchange(), file, this.locations).blockMillis(5000));
+	}
+
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/CssLinkResourceTransformerTests.java

@@ -39,8 +39,6 @@ import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse
 import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
@@ -53,8 +51,6 @@ public class CssLinkResourceTransformerTests {
 
 	private ResourceTransformerChain transformerChain;
 
-	private ServerWebExchange exchange;
-
 
 	@Before
 	public void setUp() {
@@ -84,7 +80,7 @@ public class CssLinkResourceTransformerTests {
 
 	@Test
 	public void transform() throws Exception {
-		initExchange(HttpMethod.GET, "/static/main.css");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/main.css");
 		Resource css = new ClassPathResource("test/main.css", getClass());
 
 		String expected = "\n" +
@@ -95,7 +91,7 @@ public class CssLinkResourceTransformerTests {
 				"@import '/static/foo-e36d2e05253c6c7085a91522ce43a0b4.css';\n\n" +
 				"body { background: url(\"/static/images/image-f448cd1d5dba82b774f3202c878230b3.png\") }\n";
 
-		StepVerifier.create(this.transformerChain.transform(this.exchange, css).cast(TransformedResource.class))
+		StepVerifier.create(this.transformerChain.transform(exchange, css).cast(TransformedResource.class))
 				.consumeNextWith(resource -> {
 					String result = new String(resource.getByteArray(), StandardCharsets.UTF_8);
 					result = StringUtils.deleteAny(result, "\r");
@@ -106,24 +102,22 @@ public class CssLinkResourceTransformerTests {
 
 	@Test
 	public void transformNoLinks() throws Exception {
-		initExchange(HttpMethod.GET, "/static/foo.css");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/foo.css");
 		Resource expected = new ClassPathResource("test/foo.css", getClass());
-		StepVerifier.create(this.transformerChain.transform(this.exchange, expected))
-				.consumeNextWith(resource -> {
-					assertSame(expected, resource);
-				})
+		StepVerifier.create(this.transformerChain.transform(exchange, expected))
+				.consumeNextWith(resource -> assertSame(expected, resource))
 				.expectComplete().verify();
 	}
 
 	@Test
 	public void transformExtLinksNotAllowed() throws Exception {
-		initExchange(HttpMethod.GET, "/static/external.css");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/external.css");
 		ResourceResolverChain resolverChain = Mockito.mock(DefaultResourceResolverChain.class);
 		ResourceTransformerChain transformerChain = new DefaultResourceTransformerChain(resolverChain,
 				Collections.singletonList(new CssLinkResourceTransformer()));
 
 		Resource externalCss = new ClassPathResource("test/external.css", getClass());
-		StepVerifier.create(transformerChain.transform(this.exchange, externalCss).cast(TransformedResource.class))
+		StepVerifier.create(transformerChain.transform(exchange, externalCss).cast(TransformedResource.class))
 				.consumeNextWith(resource -> {
 					String expected = "@import url(\"http://example.org/fonts/css\");\n" +
 							"body { background: url(\"file:///home/spring/image.png\") }\n" +
@@ -143,20 +137,20 @@ public class CssLinkResourceTransformerTests {
 
 	@Test
 	public void transformWithNonCssResource() throws Exception {
-		initExchange(HttpMethod.GET, "/static/images/image.png");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/images/image.png");
 		Resource expected = new ClassPathResource("test/images/image.png", getClass());
-		StepVerifier.create(this.transformerChain.transform(this.exchange, expected))
+		StepVerifier.create(this.transformerChain.transform(exchange, expected))
 				.expectNext(expected)
 				.expectComplete().verify();
 	}
 
 	@Test
 	public void transformWithGzippedResource() throws Exception {
-		initExchange(HttpMethod.GET, "/static/main.css");
+		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/static/main.css");
 		Resource original = new ClassPathResource("test/main.css", getClass());
 		createTempCopy("main.css", "main.css.gz");
 		GzipResourceResolver.GzippedResource expected = new GzipResourceResolver.GzippedResource(original);
-		StepVerifier.create(this.transformerChain.transform(this.exchange, expected))
+		StepVerifier.create(this.transformerChain.transform(exchange, expected))
 				.expectNext(expected)
 				.expectComplete().verify();
 	}
@@ -170,11 +164,10 @@ public class CssLinkResourceTransformerTests {
 		copy.toFile().deleteOnExit();
 	}
 
-	private void initExchange(HttpMethod method, String url) {
-		MockServerHttpRequest request = new MockServerHttpRequest(method, url);
+	private ServerWebExchange createExchange(HttpMethod method, String url) {
+		MockServerHttpRequest request = MockServerHttpRequest.method(method, url).build();
 		ServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		return new DefaultServerWebExchange(request, response);
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/GzipResourceResolverTests.java

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,15 +38,10 @@ import org.springframework.cache.concurrent.ConcurrentMapCache;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.util.FileCopyUtils;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -64,8 +60,6 @@ public class GzipResourceResolverTests {
 
 	private Cache cache;
 
-	private ServerWebExchange exchange;
-
 	private MockServerHttpRequest request;
 
 
@@ -106,18 +100,16 @@ public class GzipResourceResolverTests {
 		this.locations.add(new ClassPathResource("test/", getClass()));
 		this.locations.add(new ClassPathResource("testalternatepath/", getClass()));
 
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "");
-		ServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		this.request = MockServerHttpRequest.get("").build();
 	}
 
 
 	@Test
 	public void resolveGzippedFile() throws IOException {
-		this.request.addHeader("Accept-Encoding", "gzip");
+		this.request = MockServerHttpRequest.get("").header("Accept-Encoding", "gzip").build();
+
 		String file = "js/foo.js";
-		Resource resolved = this.resolver.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource resolved = this.resolver.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 
 		String gzFile = file+".gz";
 		Resource resource = new ClassPathResource("test/" + gzFile, getClass());
@@ -129,9 +121,10 @@ public class GzipResourceResolverTests {
 
 	@Test
 	public void resolveFingerprintedGzippedFile() throws IOException {
-		this.request.addHeader("Accept-Encoding", "gzip");
+		this.request = MockServerHttpRequest.get("").header("Accept-Encoding", "gzip").build();
+
 		String file = "foo-e36d2e05253c6c7085a91522ce43a0b4.css";
-		Resource resolved = this.resolver.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource resolved = this.resolver.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 
 		String gzFile = file + ".gz";
 		Resource resource = new ClassPathResource("test/" + gzFile, getClass());
@@ -143,9 +136,10 @@ public class GzipResourceResolverTests {
 
 	@Test
 	public void resolveFromCacheWithEncodingVariants() throws IOException {
-		this.request.addHeader("Accept-Encoding", "gzip");
+		this.request = MockServerHttpRequest.get("").header("Accept-Encoding", "gzip").build();
+
 		String file = "js/foo.js";
-		Resource resolved = this.resolver.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		Resource resolved = this.resolver.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 
 		String gzFile = file+".gz";
 		Resource gzResource = new ClassPathResource("test/"+gzFile, getClass());
@@ -156,11 +150,8 @@ public class GzipResourceResolverTests {
 
 		// resolved resource is now cached in CachingResourceResolver
 
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "/js/foo.js");
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, response, new DefaultWebSessionManager());
-
-		resolved = this.resolver.resolveResource(this.exchange, file, this.locations).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("/js/foo.js").build();
+		resolved = this.resolver.resolveResource(createExchange(), file, this.locations).blockMillis(5000);
 
 		Resource resource = new ClassPathResource("test/"+file, getClass());
 		assertEquals(resource.getDescription(), resolved.getDescription());
@@ -181,4 +172,9 @@ public class GzipResourceResolverTests {
 		assertTrue("Expected " + resolved + " to be of type " + HttpResource.class,
 				resolved instanceof HttpResource);
 	}
+
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceTransformerSupportTests.java

@@ -19,20 +19,17 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -48,8 +45,6 @@ public class ResourceTransformerSupportTests {
 
 	private TestResourceTransformerSupport transformer;
 
-	private ServerWebExchange exchange;
-
 	private MockServerHttpRequest request;
 
 
@@ -65,12 +60,10 @@ public class ResourceTransformerSupportTests {
 		this.transformer = new TestResourceTransformerSupport();
 		this.transformer.setResourceUrlProvider(createResourceUrlProvider(resolvers));
 
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "");
-		ServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(this.request, response, manager);
+		this.request = MockServerHttpRequest.get("").build();
 	}
 
+
 	private ResourceUrlProvider createResourceUrlProvider(List<ResourceResolver> resolvers) {
 		ResourceWebHandler handler = new ResourceWebHandler();
 		handler.setLocations(Collections.singletonList(new ClassPathResource("test/", getClass())));
@@ -83,11 +76,11 @@ public class ResourceTransformerSupportTests {
 
 	@Test
 	public void resolveUrlPath() throws Exception {
-		this.request.setUri("/resources/main.css");
+		this.request = MockServerHttpRequest.get("/resources/main.css").build();
 		String resourcePath = "/resources/bar.css";
 		Resource css = new ClassPathResource("test/main.css", getClass());
 		String actual = this.transformer.resolveUrlPath(
-				resourcePath, this.exchange, css, this.transformerChain).blockMillis(5000);
+				resourcePath, createExchange(), css, this.transformerChain).blockMillis(5000);
 
 		assertEquals("/resources/bar-11e16cf79faee7ac698c805cf28248d2.css", actual);
 		assertEquals("/resources/bar-11e16cf79faee7ac698c805cf28248d2.css", actual);
@@ -97,7 +90,7 @@ public class ResourceTransformerSupportTests {
 	public void resolveUrlPathWithRelativePath() throws Exception {
 		Resource css = new ClassPathResource("test/main.css", getClass());
 		String actual = this.transformer.resolveUrlPath(
-				"bar.css", this.exchange, css, this.transformerChain).blockMillis(5000);
+				"bar.css", createExchange(), css, this.transformerChain).blockMillis(5000);
 
 		assertEquals("bar-11e16cf79faee7ac698c805cf28248d2.css", actual);
 	}
@@ -106,11 +99,16 @@ public class ResourceTransformerSupportTests {
 	public void resolveUrlPathWithRelativePathInParentDirectory() throws Exception {
 		Resource imagePng = new ClassPathResource("test/images/image.png", getClass());
 		String actual = this.transformer.resolveUrlPath(
-				"../bar.css", this.exchange, imagePng, this.transformerChain).blockMillis(5000);
+				"../bar.css", createExchange(), imagePng, this.transformerChain).blockMillis(5000);
 
 		assertEquals("../bar-11e16cf79faee7ac698c805cf28248d2.css", actual);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 
 	private static class TestResourceTransformerSupport extends ResourceTransformerSupport {
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceUrlProviderTests.java

@@ -29,7 +29,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.mock.web.test.MockServletContext;
@@ -80,10 +79,9 @@ public class ResourceUrlProviderTests {
 
 	@Test // SPR-13374
 	public void getStaticResourceUrlRequestWithQueryOrHash() {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, manager);
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, response);
 
 		String url = "/resources/foo.css?foo=bar&url=http://example.org";
 		String resolvedUrl = this.urlProvider.getForRequestUrl(exchange, url).blockMillis(5000);

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/ResourceWebHandlerTests.java

@@ -24,6 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
@@ -51,8 +52,6 @@ import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuild
 import org.springframework.web.server.MethodNotAllowedException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -70,13 +69,9 @@ public class ResourceWebHandlerTests {
 
 	private ResourceWebHandler handler;
 
-	private ServerWebExchange exchange;
+	private MockServerHttpRequest request;
 
-	private MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "");
-
-	private MockServerHttpResponse response = new MockServerHttpResponse();
-
-	private WebSessionManager sessionManager = new DefaultWebSessionManager();
+	private MockServerHttpResponse response;
 
 	private DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
 
@@ -94,14 +89,15 @@ public class ResourceWebHandlerTests {
 		this.handler.afterPropertiesSet();
 		this.handler.afterSingletonsInstantiated();
 
-		this.exchange = new DefaultServerWebExchange(this.request, this.response, this.sessionManager);
+		this.request = MockServerHttpRequest.get("").build();
+		this.response = new MockServerHttpResponse();
 	}
 
 
 	@Test
 	public void getResource() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		HttpHeaders headers = this.response.getHeaders();
 		assertEquals(MediaType.parseMediaType("text/css"), headers.getContentType());
@@ -116,9 +112,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceHttpHeader() throws Exception {
-		this.request.setHttpMethod(HttpMethod.HEAD);
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.head("").build();
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertNull(this.response.getStatusCode());
 		HttpHeaders headers = this.response.getHeaders();
@@ -134,9 +130,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceHttpOptions() throws Exception {
-		this.request.setHttpMethod(HttpMethod.OPTIONS);
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.options("").build();
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertNull(this.response.getStatusCode());
 		assertEquals("GET,HEAD,OPTIONS", this.response.getHeaders().getFirst("Allow"));
@@ -144,9 +140,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceNoCache() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
+		ServerWebExchange exchange = createExchange("foo.css");
 		this.handler.setCacheControl(CacheControl.noStore());
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals("no-store", this.response.getHeaders().getCacheControl());
 		assertTrue(this.response.getHeaders().containsKey("Last-Modified"));
@@ -163,8 +159,8 @@ public class ResourceWebHandlerTests {
 		this.handler.afterPropertiesSet();
 		this.handler.afterSingletonsInstantiated();
 
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "versionString/foo.css");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("versionString/foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals("\"versionString\"", this.response.getHeaders().getETag());
 		assertEquals("bytes", this.response.getHeaders().getFirst("Accept-Ranges"));
@@ -173,8 +169,8 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceWithHtmlMediaType() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.html");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("foo.html");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		HttpHeaders headers = this.response.getHeaders();
 		assertEquals(MediaType.TEXT_HTML, headers.getContentType());
@@ -187,8 +183,8 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceFromAlternatePath() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "baz.css");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("baz.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		HttpHeaders headers = this.response.getHeaders();
 		assertEquals(MediaType.parseMediaType("text/css"), headers.getContentType());
@@ -203,8 +199,8 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceFromSubDirectory() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "js/foo.js");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("js/foo.js");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(MediaType.parseMediaType("text/javascript"), this.response.getHeaders().getContentType());
 		assertResponseBody("function foo() { console.log(\"hello world\"); }");
@@ -212,8 +208,8 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void getResourceFromSubDirectoryOfAlternatePath() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "js/baz.js");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("js/baz.js");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(MediaType.parseMediaType("text/javascript"), this.response.getHeaders().getContentType());
 		assertResponseBody("function foo() { console.log(\"hello world\"); }");
@@ -232,8 +228,8 @@ public class ResourceWebHandlerTests {
 		handler.afterPropertiesSet();
 		handler.afterSingletonsInstantiated();
 
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("foo.css");
+		handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(MediaType.parseMediaType("foo/bar"), this.response.getHeaders().getContentType());
 		assertResponseBody("h1 { color:red; }");
@@ -252,9 +248,9 @@ public class ResourceWebHandlerTests {
 		handler.afterPropertiesSet();
 		handler.afterSingletonsInstantiated();
 
-		this.request.addHeader("Accept", "application/json,text/plain,*/*");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.html");
-		handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("Accept", "application/json,text/plain,*/*").build();
+		ServerWebExchange exchange = createExchange("foo.html");
+		handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(MediaType.TEXT_HTML, this.response.getHeaders().getContentType());
 	}
@@ -262,47 +258,41 @@ public class ResourceWebHandlerTests {
 	@Test
 	public void invalidPath() throws Exception {
 		for (HttpMethod method : HttpMethod.values()) {
-			this.request = new MockServerHttpRequest(HttpMethod.GET, "");
-			this.response = new MockServerHttpResponse();
-			this.sessionManager = new DefaultWebSessionManager();
-			this.exchange = new DefaultServerWebExchange(this.request, this.response, this.sessionManager);
 			testInvalidPath(method);
 		}
 	}
 
 	private void testInvalidPath(HttpMethod httpMethod) throws Exception {
-		this.request.setHttpMethod(httpMethod);
-
 		Resource location = new ClassPathResource("test/", getClass());
 		this.handler.setLocations(Collections.singletonList(location));
 
-		testInvalidPath(location, "../testsecret/secret.txt");
-		testInvalidPath(location, "test/../../testsecret/secret.txt");
-		testInvalidPath(location, ":/../../testsecret/secret.txt");
+		testInvalidPath(httpMethod, "../testsecret/secret.txt", location);
+		testInvalidPath(httpMethod, "test/../../testsecret/secret.txt", location);
+		testInvalidPath(httpMethod, ":/../../testsecret/secret.txt", location);
 
 		location = new UrlResource(getClass().getResource("./test/"));
 		this.handler.setLocations(Collections.singletonList(location));
 		Resource secretResource = new UrlResource(getClass().getResource("testsecret/secret.txt"));
 		String secretPath = secretResource.getURL().getPath();
 
-		testInvalidPath(location, "file:" + secretPath);
-		testInvalidPath(location, "/file:" + secretPath);
-		testInvalidPath(location, "url:" + secretPath);
-		testInvalidPath(location, "/url:" + secretPath);
-		testInvalidPath(location, "////../.." + secretPath);
-		testInvalidPath(location, "/%2E%2E/testsecret/secret.txt");
-		testInvalidPath(location, "url:" + secretPath);
+		testInvalidPath(httpMethod, "file:" + secretPath, location);
+		testInvalidPath(httpMethod, "/file:" + secretPath, location);
+		testInvalidPath(httpMethod, "url:" + secretPath, location);
+		testInvalidPath(httpMethod, "/url:" + secretPath, location);
+		testInvalidPath(httpMethod, "////../.." + secretPath, location);
+		testInvalidPath(httpMethod, "/%2E%2E/testsecret/secret.txt", location);
+		testInvalidPath(httpMethod, "url:" + secretPath, location);
 
 		// The following tests fail with a MalformedURLException on Windows
 		// testInvalidPath(location, "/" + secretPath);
 		// testInvalidPath(location, "/  " + secretPath);
 	}
 
-	private void testInvalidPath(Resource location, String requestPath) throws Exception {
+	private void testInvalidPath(HttpMethod httpMethod, String requestPath, Resource location) throws Exception {
+		this.request = MockServerHttpRequest.method(httpMethod, "").build();
 		this.response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, this.response, this.sessionManager);
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, requestPath);
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange(requestPath);
+		this.handler.handle(exchange).blockMillis(5000);
 		if (!location.createRelative(requestPath).exists() && !requestPath.contains(":")) {
 			fail(requestPath + " doesn't actually exist as a relative path");
 		}
@@ -311,10 +301,8 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void ignoreInvalidEscapeSequence() throws Exception {
-		this.response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, this.response, this.sessionManager);
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "/%foo%/bar.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("/%foo%/bar.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 		assertEquals(HttpStatus.NOT_FOUND, this.response.getStatusCode());
 	}
 
@@ -379,17 +367,18 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void notModified() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		this.request.getHeaders().setIfModifiedSince(resourceLastModified("test/foo.css"));
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").ifModifiedSince(resourceLastModified("test/foo.css")).build();
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 		assertEquals(HttpStatus.NOT_MODIFIED, this.response.getStatusCode());
 	}
 
 	@Test
 	public void modified() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		this.request.getHeaders().setIfModifiedSince(resourceLastModified("test/foo.css") / 1000 * 1000 - 1);
-		this.handler.handle(this.exchange).blockMillis(5000);
+		long timestamp = resourceLastModified("test/foo.css") / 1000 * 1000 - 1;
+		this.request = MockServerHttpRequest.get("").ifModifiedSince(timestamp).build();
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertNull(this.response.getStatusCode());
 		assertResponseBody("h1 { color:red; }");
@@ -397,15 +386,15 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void directory() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "js/");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("js/");
+		this.handler.handle(exchange).blockMillis(5000);
 		assertEquals(HttpStatus.NOT_FOUND, this.response.getStatusCode());
 	}
 
 	@Test
 	public void directoryInJarFile() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "underscorejs/");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("underscorejs/");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertNull(this.response.getStatusCode());
 		assertEquals(0, this.response.getHeaders().getContentLength());
@@ -413,45 +402,44 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void missingResourcePath() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("");
+		this.handler.handle(exchange).blockMillis(5000);
 		assertEquals(HttpStatus.NOT_FOUND, this.response.getStatusCode());
 	}
 
 	@Test(expected = IllegalStateException.class)
 	public void noPathWithinHandlerMappingAttribute() throws Exception {
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = new DefaultServerWebExchange(this.request, this.response);
+		this.handler.handle(exchange).blockMillis(5000);
 	}
 
 	@Test(expected = MethodNotAllowedException.class)
 	public void unsupportedHttpMethod() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
-		this.request.setHttpMethod(HttpMethod.POST);
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.post("").build();
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 	}
 
 	@Test
 	public void resourceNotFound() throws Exception {
 		for (HttpMethod method : HttpMethod.values()) {
-			this.request = new MockServerHttpRequest(HttpMethod.GET, "");
-			this.response = new MockServerHttpResponse();
-			this.exchange = new DefaultServerWebExchange(this.request, this.response, this.sessionManager);
 			resourceNotFound(method);
 		}
 	}
 
 	private void resourceNotFound(HttpMethod httpMethod) throws Exception {
-		this.request.setHttpMethod(httpMethod);
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "not-there.css");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.method(httpMethod, "").build();
+		this.response = new MockServerHttpResponse();
+		ServerWebExchange exchange = createExchange("not-there.css");
+		this.handler.handle(exchange).blockMillis(5000);
 		assertEquals(HttpStatus.NOT_FOUND, this.response.getStatusCode());
 	}
 
 	@Test
 	public void partialContentByteRange() throws Exception {
-		this.request.addHeader("Range", "bytes=0-1");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("Range", "bytes=0-1").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(HttpStatus.PARTIAL_CONTENT, this.response.getStatusCode());
 		assertEquals(MediaType.TEXT_PLAIN, this.response.getHeaders().getContentType());
@@ -464,9 +452,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void partialContentByteRangeNoEnd() throws Exception {
-		this.request.addHeader("Range", "bytes=9-");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("range", "bytes=9-").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(HttpStatus.PARTIAL_CONTENT, this.response.getStatusCode());
 		assertEquals(MediaType.TEXT_PLAIN, this.response.getHeaders().getContentType());
@@ -479,9 +467,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void partialContentByteRangeLargeEnd() throws Exception {
-		this.request.addHeader("Range", "bytes=9-10000");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("range", "bytes=9-10000").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(HttpStatus.PARTIAL_CONTENT, this.response.getStatusCode());
 		assertEquals(MediaType.TEXT_PLAIN, this.response.getHeaders().getContentType());
@@ -494,9 +482,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void partialContentSuffixRange() throws Exception {
-		this.request.addHeader("Range", "bytes=-1");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("range", "bytes=-1").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(HttpStatus.PARTIAL_CONTENT, this.response.getStatusCode());
 		assertEquals(MediaType.TEXT_PLAIN, this.response.getHeaders().getContentType());
@@ -509,9 +497,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void partialContentSuffixRangeLargeSuffix() throws Exception {
-		this.request.addHeader("Range", "bytes=-11");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("range", "bytes=-11").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(HttpStatus.PARTIAL_CONTENT, this.response.getStatusCode());
 		assertEquals(MediaType.TEXT_PLAIN, this.response.getHeaders().getContentType());
@@ -524,10 +512,10 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void partialContentInvalidRangeHeader() throws Exception {
-		this.request.addHeader("Range", "bytes= foo bar");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
+		this.request = MockServerHttpRequest.get("").header("range", "bytes=foo bar").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
 
-		StepVerifier.create(this.handler.handle(this.exchange))
+		StepVerifier.create(this.handler.handle(exchange))
 				.expectNextCount(0)
 				.expectComplete()
 				.verify();
@@ -538,9 +526,9 @@ public class ResourceWebHandlerTests {
 
 	@Test
 	public void partialContentMultipleByteRanges() throws Exception {
-		this.request.addHeader("Range", "bytes=0-1, 4-5, 8-9");
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.txt");
-		this.handler.handle(this.exchange).blockMillis(5000);
+		this.request = MockServerHttpRequest.get("").header("Range", "bytes=0-1, 4-5, 8-9").build();
+		ServerWebExchange exchange = createExchange("foo.txt");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals(HttpStatus.PARTIAL_CONTENT, this.response.getStatusCode());
 		assertTrue(this.response.getHeaders().getContentType().toString()
@@ -581,13 +569,20 @@ public class ResourceWebHandlerTests {
 
 	@Test  // SPR-14005
 	public void doOverwriteExistingCacheControlHeaders() throws Exception {
-		this.exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, "foo.css");
 		this.response.getHeaders().setCacheControl(CacheControl.noStore().getHeaderValue());
-		this.handler.handle(this.exchange).blockMillis(5000);
+		ServerWebExchange exchange = createExchange("foo.css");
+		this.handler.handle(exchange).blockMillis(5000);
 
 		assertEquals("max-age=3600", this.response.getHeaders().getCacheControl());
 	}
 
+	@NotNull
+	private ServerWebExchange createExchange(String path) {
+		ServerWebExchange exchange = new DefaultServerWebExchange(this.request, this.response);
+		exchange.getAttributes().put(PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE, path);
+		return exchange;
+	}
+
 
 	private long resourceLastModified(String resourceName) throws IOException {
 		return new ClassPathResource(resourceName, getClass()).getFile().lastModified();

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/VersionResourceResolverTests.java

@@ -28,12 +28,10 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
@@ -165,10 +163,9 @@ public class VersionResourceResolverTests {
 		String version = "version";
 		String file = "bar.css";
 		Resource expected = new ClassPathResource("test/" + file, getClass());
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/resources/bar-version.css");
+		MockServerHttpRequest request = MockServerHttpRequest.get("/resources/bar-version.css").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
-		DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
-		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, sessionManager);
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, response);
 		given(this.chain.resolveResource(exchange, versionFile, this.locations)).willReturn(Mono.empty());
 		given(this.chain.resolveResource(exchange, file, this.locations)).willReturn(Mono.just(expected));
 		given(this.versionStrategy.extractVersion(versionFile)).willReturn(version);

spring-web-reactive/src/test/java/org/springframework/web/reactive/resource/WebJarsResourceResolverTests.java

@@ -24,14 +24,11 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
@@ -66,10 +63,9 @@ public class WebJarsResourceResolverTests {
 		this.resolver = new WebJarsResourceResolver();
 		this.chain = mock(ResourceResolverChain.class);
 
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "");
+		MockServerHttpRequest request = MockServerHttpRequest.get("").build();
 		ServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		this.exchange = new DefaultServerWebExchange(request, response);
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/HandlerResultHandlerTests.java

@@ -15,16 +15,14 @@
  */
 package org.springframework.web.reactive.result;
 
-import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -33,7 +31,6 @@ import org.springframework.web.reactive.accept.HeaderContentTypeResolver;
 import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
 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.assertEquals;
 import static org.springframework.http.MediaType.ALL;
@@ -55,15 +52,11 @@ public class HandlerResultHandlerTests {
 
 	private MockServerHttpRequest request;
 
-	private ServerWebExchange exchange;
-
 
 	@Before
 	public void setUp() throws Exception {
 		this.resultHandler = new TestResultHandler();
-		this.request = new MockServerHttpRequest(HttpMethod.GET, new URI("/path"));
-		this.exchange = new DefaultServerWebExchange(
-				this.request, new MockServerHttpResponse(), new MockWebSessionManager());
+		this.request = MockServerHttpRequest.get("/path").build();
 	}
 
 
@@ -71,28 +64,30 @@ public class HandlerResultHandlerTests {
 	public void usesContentTypeResolver() throws Exception {
 		TestResultHandler resultHandler = new TestResultHandler(new FixedContentTypeResolver(IMAGE_GIF));
 		List<MediaType> mediaTypes = Arrays.asList(IMAGE_JPEG, IMAGE_GIF, IMAGE_PNG);
-		MediaType actual = resultHandler.selectMediaType(this.exchange, () -> mediaTypes);
+		MediaType actual = resultHandler.selectMediaType(exchange(), () -> mediaTypes);
 
 		assertEquals(IMAGE_GIF, actual);
 	}
 
 	@Test
 	public void producibleMediaTypesRequestAttribute() throws Exception {
-		Set<MediaType> producible = Collections.singleton(IMAGE_GIF);
-		this.exchange.getAttributes().put(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, producible);
+		ServerWebExchange exchange = exchange();
+		exchange.getAttributes().put(PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE, Collections.singleton(IMAGE_GIF));
 
 		List<MediaType> mediaTypes = Arrays.asList(IMAGE_JPEG, IMAGE_GIF, IMAGE_PNG);
-		MediaType actual = resultHandler.selectMediaType(this.exchange, () -> mediaTypes);
+		MediaType actual = resultHandler.selectMediaType(exchange, () -> mediaTypes);
 
 		assertEquals(IMAGE_GIF, actual);
 	}
 
 	@Test  // SPR-9160
 	public void sortsByQuality() throws Exception {
-		this.request.setHeader("Accept", "text/plain; q=0.5, application/json");
+		this.request = MockServerHttpRequest.get("/path")
+				.header("Accept", "text/plain; q=0.5, application/json")
+				.build();
 
 		List<MediaType> mediaTypes = Arrays.asList(TEXT_PLAIN, APPLICATION_JSON_UTF8);
-		MediaType actual = this.resultHandler.selectMediaType(this.exchange, () -> mediaTypes);
+		MediaType actual = this.resultHandler.selectMediaType(exchange(), () -> mediaTypes);
 
 		assertEquals(APPLICATION_JSON_UTF8, actual);
 	}
@@ -101,9 +96,8 @@ public class HandlerResultHandlerTests {
 	public void charsetFromAcceptHeader() throws Exception {
 		MediaType text8859 = MediaType.parseMediaType("text/plain;charset=ISO-8859-1");
 		MediaType textUtf8 = MediaType.parseMediaType("text/plain;charset=UTF-8");
-		this.request.getHeaders().setAccept(Collections.singletonList(text8859));
-		MediaType actual = this.resultHandler.selectMediaType(this.exchange,
-				() -> Collections.singletonList(textUtf8));
+		this.request = MockServerHttpRequest.get("/path").accept(text8859).build();
+		MediaType actual = this.resultHandler.selectMediaType(exchange(), () -> Collections.singletonList(textUtf8));
 
 		assertEquals(text8859, actual);
 	}
@@ -111,11 +105,16 @@ public class HandlerResultHandlerTests {
 	@Test // SPR-12894
 	public void noConcreteMediaType() throws Exception {
 		List<MediaType> producible = Collections.singletonList(ALL);
-		MediaType actual = this.resultHandler.selectMediaType(this.exchange, () -> producible);
+		MediaType actual = this.resultHandler.selectMediaType(exchange(), () -> producible);
 
 		assertEquals(APPLICATION_OCTET_STREAM, actual);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange exchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 
 	@SuppressWarnings("WeakerAccess")
 	private static class TestResultHandler extends AbstractHandlerResultHandler {

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/CompositeRequestConditionTests.java

@@ -16,18 +16,16 @@
 
 package org.springframework.web.reactive.result.condition;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -40,8 +38,6 @@ import static org.junit.Assert.assertSame;
  */
 public class CompositeRequestConditionTests {
 
-	private ServerWebExchange exchange;
-
 	private ServerHttpRequest request;
 
 	private ParamsRequestCondition param1;
@@ -55,9 +51,7 @@ public class CompositeRequestConditionTests {
 
 	@Before
 	public void setup() throws Exception {
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		this.request = MockServerHttpRequest.get("/").build();
 
 		this.param1 = new ParamsRequestCondition("param1");
 		this.param2 = new ParamsRequestCondition("param2");
@@ -97,7 +91,7 @@ public class CompositeRequestConditionTests {
 
 	@Test
 	public void match() {
-		this.request.getQueryParams().add("param1", "paramValue1");
+		this.request = MockServerHttpRequest.get("/path?param1=paramValue1").build();
 
 		RequestCondition<?> condition1 = new RequestMethodsRequestCondition(RequestMethod.GET, RequestMethod.POST);
 		RequestCondition<?> condition2 = new RequestMethodsRequestCondition(RequestMethod.GET);
@@ -105,45 +99,52 @@ public class CompositeRequestConditionTests {
 		CompositeRequestCondition composite1 = new CompositeRequestCondition(this.param1, condition1);
 		CompositeRequestCondition composite2 = new CompositeRequestCondition(this.param1, condition2);
 
-		assertEquals(composite2, composite1.getMatchingCondition(this.exchange));
+		assertEquals(composite2, composite1.getMatchingCondition(createExchange()));
 	}
 
 	@Test
 	public void noMatch() {
 		CompositeRequestCondition cond = new CompositeRequestCondition(this.param1);
-		assertNull(cond.getMatchingCondition(this.exchange));
+		assertNull(cond.getMatchingCondition(createExchange()));
 	}
 
 	@Test
 	public void matchEmpty() {
 		CompositeRequestCondition empty = new CompositeRequestCondition();
-		assertSame(empty, empty.getMatchingCondition(this.exchange));
+		assertSame(empty, empty.getMatchingCondition(createExchange()));
 	}
 
 	@Test
 	public void compare() {
 		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
 		CompositeRequestCondition cond3 = new CompositeRequestCondition(this.param3);
+		ServerWebExchange exchange = createExchange();
 
-		assertEquals(1, cond1.compareTo(cond3, this.exchange));
-		assertEquals(-1, cond3.compareTo(cond1, this.exchange));
+		assertEquals(1, cond1.compareTo(cond3, exchange));
+		assertEquals(-1, cond3.compareTo(cond1, exchange));
 	}
 
 	@Test
 	public void compareEmpty() {
 		CompositeRequestCondition empty = new CompositeRequestCondition();
 		CompositeRequestCondition notEmpty = new CompositeRequestCondition(this.param1);
+		ServerWebExchange exchange = createExchange();
 
-		assertEquals(0, empty.compareTo(empty, this.exchange));
-		assertEquals(-1, notEmpty.compareTo(empty, this.exchange));
-		assertEquals(1, empty.compareTo(notEmpty, this.exchange));
+		assertEquals(0, empty.compareTo(empty, exchange));
+		assertEquals(-1, notEmpty.compareTo(empty, exchange));
+		assertEquals(1, empty.compareTo(notEmpty, exchange));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
 	public void compareDifferentLength() {
 		CompositeRequestCondition cond1 = new CompositeRequestCondition(this.param1);
 		CompositeRequestCondition cond2 = new CompositeRequestCondition(this.param1, this.header1);
-		cond1.compareTo(cond2, this.exchange);
+		cond1.compareTo(cond2, createExchange());
+	}
+
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ConsumesRequestConditionTests.java

@@ -22,15 +22,12 @@ import java.util.Collections;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpHeaders;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.reactive.result.condition.ConsumesRequestCondition.ConsumeMediaTypeExpression;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -197,13 +194,13 @@ public class ConsumesRequestConditionTests {
 		return createExchange(null);
 	}
 
-	private ServerWebExchange createExchange(String contentType) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		if (contentType != null) {
-			request.getHeaders().add("Content-Type", contentType);
-		}
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+	private ServerWebExchange createExchange(String contentType) {
+
+		MockServerHttpRequest request = (contentType != null ?
+				MockServerHttpRequest.post("/").header(HttpHeaders.CONTENT_TYPE, contentType).build() :
+				MockServerHttpRequest.get("/").build());
+
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/HeadersRequestConditionTests.java

@@ -21,14 +21,11 @@ import java.util.Collection;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -160,13 +157,13 @@ public class HeadersRequestConditionTests {
 		return createExchange(null, null);
 	}
 
-	private ServerWebExchange createExchange(String headerName, String headerValue) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		if (headerName != null) {
-			request.getHeaders().add(headerName, headerValue);
-		}
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+	private ServerWebExchange createExchange(String headerName, String headerValue) {
+
+		ServerHttpRequest request = headerName != null ?
+				MockServerHttpRequest.get("/").header(headerName, headerValue).build() :
+				MockServerHttpRequest.get("/").build();
+
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ParamsRequestConditionTests.java

@@ -21,23 +21,18 @@ import java.util.Collection;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.util.MultiValueMap;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.web.util.UriComponentsBuilder.fromPath;
 
 /**
  * Unit tests for {@link ParamsRequestCondition}.
@@ -94,7 +89,8 @@ public class ParamsRequestConditionTests {
 
 	@Test
 	public void compareTo() throws Exception {
-		ServerWebExchange exchange = exchange(new MockServerHttpRequest(HttpMethod.GET, "/"));
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		ParamsRequestCondition condition1 = new ParamsRequestCondition("foo", "bar", "baz");
 		ParamsRequestCondition condition2 = new ParamsRequestCondition("foo", "bar");
@@ -118,27 +114,20 @@ public class ParamsRequestConditionTests {
 
 
 	private ServerWebExchange exchangeWithQuery(String query) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		MultiValueMap<String, String> params = fromPath("/").query(query).build().getQueryParams();
-		request.getQueryParams().putAll(params);
-		return exchange(request);
+		ServerHttpRequest request = MockServerHttpRequest.get("/path?" + query).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private ServerWebExchange exchangeWithFormData(String formData) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		request.getHeaders().setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		request.setBody(formData);
-		return exchange(request);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.contentType(MediaType.APPLICATION_FORM_URLENCODED)
+				.body(formData);
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private ServerWebExchange exchange() {
-		return exchange(new MockServerHttpRequest(HttpMethod.GET, "/"));
-	}
-
-	private ServerWebExchange exchange(ServerHttpRequest request) {
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, response, manager);
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/PatternsRequestConditionTests.java

@@ -22,14 +22,11 @@ import java.util.Set;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -225,9 +222,8 @@ public class PatternsRequestConditionTests {
 
 
 	private ServerWebExchange createExchange(String path) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, path);
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.get(path).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/ProducesRequestConditionTests.java

@@ -22,14 +22,11 @@ import java.util.Collections;
 
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -313,14 +310,12 @@ public class ProducesRequestConditionTests {
 
 
 	private ServerWebExchange createExchange(String... accept) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		if (accept != null) {
-			for (String value : accept) {
-				request.getHeaders().add("Accept", value);
-			}
-		}
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+
+		ServerHttpRequest request = (accept != null ?
+				MockServerHttpRequest.get("/").header("Accept", accept).build() :
+				MockServerHttpRequest.get("/").build());
+
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestConditionHolderTests.java

@@ -16,20 +16,15 @@
 
 package org.springframework.web.reactive.result.condition;
 
-import java.net.URISyntaxException;
-
 import org.junit.Before;
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -48,13 +43,9 @@ public class RequestConditionHolderTests {
 
 	@Before
 	public void setUp() throws Exception {
-		this.exchange = createExchange();
-	}
-
-	private ServerWebExchange createExchange() throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		MockServerHttpResponse response = new MockServerHttpResponse();
+		this.exchange = new DefaultServerWebExchange(request, response);
 	}
 
 

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestMappingInfoTests.java

@@ -20,15 +20,16 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.reactive.result.method.RequestMappingInfo;
 import org.springframework.web.server.ServerWebExchange;
@@ -50,8 +51,6 @@ import static org.junit.Assert.assertNull;
  */
 public class RequestMappingInfoTests {
 
-	private ServerWebExchange exchange;
-
 	private ServerHttpRequest request;
 
 
@@ -59,12 +58,9 @@ public class RequestMappingInfoTests {
 
 	@Before
 	public void setUp() throws Exception {
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "/foo");
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		this.request = MockServerHttpRequest.get("/foo").build();
 	}
 
-
 	@Test
 	public void createEmpty() {
 		RequestMappingInfo info = new RequestMappingInfo(null, null, null, null, null, null, null);
@@ -85,105 +81,103 @@ public class RequestMappingInfoTests {
 		RequestMappingInfo expected = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo*"), null, null, null, null, null, null);
 
-		assertEquals(expected, info.getMatchingCondition(this.exchange));
+		assertEquals(expected, info.getMatchingCondition(createExchange()));
 
 		info = new RequestMappingInfo(
 				new PatternsRequestCondition("/**", "/foo*", "/foo"), null, null, null, null, null, null);
 		expected = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo", "/foo*", "/**"), null, null, null, null, null, null);
 
-		assertEquals(expected, info.getMatchingCondition(this.exchange));
+		assertEquals(expected, info.getMatchingCondition(createExchange()));
 	}
 
 	@Test
 	public void matchParamsCondition() {
-		this.request.getQueryParams().add("foo", "bar");
+		this.request = MockServerHttpRequest.get("/foo?foo=bar").build();
 
-		RequestMappingInfo info =
-				new RequestMappingInfo(
-						new PatternsRequestCondition("/foo"), null,
-						new ParamsRequestCondition("foo=bar"), null, null, null, null);
-		RequestMappingInfo match = info.getMatchingCondition(this.exchange);
+		RequestMappingInfo info = new RequestMappingInfo(
+				new PatternsRequestCondition("/foo"), null,
+				new ParamsRequestCondition("foo=bar"), null, null, null, null);
+		RequestMappingInfo match = info.getMatchingCondition(createExchange());
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"), null,
 				new ParamsRequestCondition("foo!=bar"), null, null, null, null);
-		match = info.getMatchingCondition(this.exchange);
+		match = info.getMatchingCondition(createExchange());
 
 		assertNull(match);
 	}
 
 	@Test
 	public void matchHeadersCondition() {
-		this.request.getHeaders().add("foo", "bar");
+		this.request = MockServerHttpRequest.get("/foo").header("foo", "bar").build();
 
 		RequestMappingInfo info =
 				new RequestMappingInfo(
 						new PatternsRequestCondition("/foo"), null, null,
 						new HeadersRequestCondition("foo=bar"), null, null, null);
-		RequestMappingInfo match = info.getMatchingCondition(this.exchange);
+		RequestMappingInfo match = info.getMatchingCondition(createExchange());
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"), null, null,
 				new HeadersRequestCondition("foo!=bar"), null, null, null);
-		match = info.getMatchingCondition(this.exchange);
+		match = info.getMatchingCondition(createExchange());
 
 		assertNull(match);
 	}
 
 	@Test
 	public void matchConsumesCondition() {
-		this.request.getHeaders().setContentType(MediaType.TEXT_PLAIN);
+		this.request = MockServerHttpRequest.post("/foo").contentType(MediaType.TEXT_PLAIN).build();
 
 		RequestMappingInfo info =
 			new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"), null, null, null,
 				new ConsumesRequestCondition("text/plain"), null, null);
-		RequestMappingInfo match = info.getMatchingCondition(this.exchange);
+		RequestMappingInfo match = info.getMatchingCondition(createExchange());
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"), null, null, null,
 				new ConsumesRequestCondition("application/xml"), null, null);
-		match = info.getMatchingCondition(this.exchange);
+		match = info.getMatchingCondition(createExchange());
 
 		assertNull(match);
 	}
 
 	@Test
 	public void matchProducesCondition() {
-		this.request.getHeaders().setAccept(Collections.singletonList(MediaType.TEXT_PLAIN));
+		this.request = MockServerHttpRequest.get("/foo").accept(MediaType.TEXT_PLAIN).build();
 
-		RequestMappingInfo info =
-			new RequestMappingInfo(
-					new PatternsRequestCondition("/foo"), null, null, null, null,
-					new ProducesRequestCondition("text/plain"), null);
-		RequestMappingInfo match = info.getMatchingCondition(this.exchange);
+		RequestMappingInfo info = new RequestMappingInfo(
+				new PatternsRequestCondition("/foo"), null, null, null, null,
+				new ProducesRequestCondition("text/plain"), null);
+		RequestMappingInfo match = info.getMatchingCondition(createExchange());
 
 		assertNotNull(match);
 
 		info = new RequestMappingInfo(
 				new PatternsRequestCondition("/foo"), null, null, null, null,
 				new ProducesRequestCondition("application/xml"), null);
-		match = info.getMatchingCondition(this.exchange);
+		match = info.getMatchingCondition(createExchange());
 
 		assertNull(match);
 	}
 
 	@Test
 	public void matchCustomCondition() {
-		this.request.getQueryParams().add("foo", "bar");
+		this.request = MockServerHttpRequest.get("/foo?foo=bar").build();
 
 		RequestMappingInfo info =
 				new RequestMappingInfo(
 						new PatternsRequestCondition("/foo"), null, null, null, null, null,
 						new ParamsRequestCondition("foo=bar"));
-		RequestMappingInfo match = info.getMatchingCondition(this.exchange);
+		RequestMappingInfo match = info.getMatchingCondition(createExchange());
 
 		assertNotNull(match);
 
@@ -191,7 +185,7 @@ public class RequestMappingInfoTests {
 				new PatternsRequestCondition("/foo"), null,
 				new ParamsRequestCondition("foo!=bar"), null, null, null,
 				new ParamsRequestCondition("foo!=bar"));
-		match = info.getMatchingCondition(this.exchange);
+		match = info.getMatchingCondition(createExchange());
 
 		assertNull(match);
 	}
@@ -207,7 +201,7 @@ public class RequestMappingInfoTests {
 						new RequestMethodsRequestCondition(RequestMethod.GET),
 						new ParamsRequestCondition("foo"), null, null, null, null);
 
-		Comparator<RequestMappingInfo> comparator = (info, otherInfo) -> info.compareTo(otherInfo, exchange);
+		Comparator<RequestMappingInfo> comparator = (info, otherInfo) -> info.compareTo(otherInfo, createExchange());
 
 		List<RequestMappingInfo> list = asList(none, oneMethod, oneMethodOneParam);
 		Collections.shuffle(list);
@@ -329,9 +323,10 @@ public class RequestMappingInfoTests {
 	@Test
 	@Ignore
 	public void preFlightRequest() throws Exception {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.OPTIONS, "/foo");
-		request.getHeaders().setOrigin("http://domain.com");
-		request.getHeaders().setAccessControlRequestMethod(HttpMethod.POST);
+		ServerHttpRequest request = MockServerHttpRequest.options("/foo")
+				.header("Origin", "http://domain.com")
+				.header(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS, "POST")
+				.build();
 
 		WebSessionManager manager = new MockWebSessionManager();
 		MockServerHttpResponse response = new MockServerHttpResponse();
@@ -350,4 +345,9 @@ public class RequestMappingInfoTests {
 		assertNull("Pre-flight should match the ACCESS_CONTROL_REQUEST_METHOD", match);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/condition/RequestMethodsRequestConditionTests.java

@@ -24,14 +24,12 @@ import org.junit.Test;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -105,7 +103,7 @@ public class RequestMethodsRequestConditionTests {
 		RequestMethodsRequestCondition c2 = new RequestMethodsRequestCondition(POST);
 		RequestMethodsRequestCondition c3 = new RequestMethodsRequestCondition();
 
-		ServerWebExchange exchange = createExchange();
+		ServerWebExchange exchange = createExchange("GET");
 
 		int result = c1.compareTo(c2, exchange);
 		assertTrue("Invalid comparison result: " + result, result < 0);
@@ -142,15 +140,9 @@ public class RequestMethodsRequestConditionTests {
 		assertNull(condition.getMatchingCondition(exchange));
 	}
 
-
-	private ServerWebExchange createExchange() throws URISyntaxException {
-		return createExchange(null);
-	}
-
 	private ServerWebExchange createExchange(String method) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.resolve(method), "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.method(HttpMethod.valueOf(method), "/").build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 }

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

@@ -150,7 +150,7 @@ public class HandlerMethodMappingTests {
 
 
 	private ServerWebExchange createExchange(HttpMethod httpMethod, String path) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(httpMethod, path);
+		ServerHttpRequest request = MockServerHttpRequest.method(httpMethod, path).build();
 		WebSessionManager sessionManager = new MockWebSessionManager();
 		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
 	}

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

@@ -24,7 +24,6 @@ import org.junit.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.reactive.BindingContext;
@@ -35,10 +34,14 @@ import org.springframework.web.server.UnsupportedMediaTypeStatusException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for {@link InvocableHandlerMethod}.
@@ -53,7 +56,7 @@ public class InvocableHandlerMethodTests {
 	@Before
 	public void setUp() throws Exception {
 		this.exchange = new DefaultServerWebExchange(
-				new MockServerHttpRequest(HttpMethod.GET, "http://localhost:8080/path"),
+				MockServerHttpRequest.get("http://localhost:8080/path").build(),
 				new MockServerHttpResponse(),
 				new MockWebSessionManager());
 	}

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

@@ -17,7 +17,7 @@
 package org.springframework.web.reactive.result.method;
 
 import java.lang.reflect.Method;
-import java.net.URISyntaxException;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
@@ -51,21 +51,25 @@ import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.reactive.HandlerResult;
 import org.springframework.web.reactive.result.ResolvableMethod;
-import org.springframework.web.reactive.result.method.RequestMappingInfo.*;
+import org.springframework.web.reactive.result.method.RequestMappingInfo.BuilderConfiguration;
 import org.springframework.web.server.MethodNotAllowedException;
 import org.springframework.web.server.NotAcceptableStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.UnsupportedMediaTypeStatusException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 import org.springframework.web.server.support.HttpRequestPathHelper;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.springframework.web.bind.annotation.RequestMethod.*;
-import static org.springframework.web.reactive.result.method.RequestMappingInfo.*;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+import static org.springframework.web.bind.annotation.RequestMethod.HEAD;
+import static org.springframework.web.bind.annotation.RequestMethod.OPTIONS;
+import static org.springframework.web.reactive.result.method.RequestMappingInfo.paths;
 
 /**
  * Unit tests for {@link RequestMappingInfoHandlerMapping}.
@@ -75,6 +79,8 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	private TestRequestMappingInfoHandlerMapping handlerMapping;
 
+	private ServerHttpRequest request;
+
 
 	@Before
 	public void setUp() throws Exception {
@@ -98,8 +104,8 @@ public class RequestMappingInfoHandlerMappingTests {
 		String[] params = new String[] {};
 		Method expected = resolveMethod(new TestController(), patterns, null, params);
 
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/foo");
-		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
+		this.request = MockServerHttpRequest.get("/foo").build();
+		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(createExchange()).block();
 
 		assertEquals(expected, hm.getMethod());
 	}
@@ -110,8 +116,8 @@ public class RequestMappingInfoHandlerMappingTests {
 		RequestMethod[] methods = new RequestMethod[] {GET, HEAD};
 		Method expected = resolveMethod(new TestController(), patterns, methods, null);
 
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/bar");
-		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
+		this.request = MockServerHttpRequest.get("/bar").build();
+		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(createExchange()).block();
 
 		assertEquals(expected, hm.getMethod());
 	}
@@ -121,12 +127,12 @@ public class RequestMappingInfoHandlerMappingTests {
 		String[] patterns = new String[] {""};
 		Method expected = resolveMethod(new TestController(), patterns, null, null);
 
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "");
-		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
+		this.request = MockServerHttpRequest.get("").build();
+		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(createExchange()).block();
 		assertEquals(expected, hm.getMethod());
 
-		exchange = createExchange(HttpMethod.GET, "/");
-		hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
+		this.request = MockServerHttpRequest.get("/").build();
+		hm = (HandlerMethod) this.handlerMapping.getHandler(createExchange()).block();
 		assertEquals(expected, hm.getMethod());
 	}
 
@@ -136,17 +142,16 @@ public class RequestMappingInfoHandlerMappingTests {
 		String[] params = new String[] {"p"};
 		Method expected = resolveMethod(new TestController(), patterns, null, params);
 
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/foo");
-		exchange.getRequest().getQueryParams().add("p", "anything");
-		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
+		this.request = MockServerHttpRequest.get("/foo?p=anything").build();
+		HandlerMethod hm = (HandlerMethod) this.handlerMapping.getHandler(createExchange()).block();
 
 		assertEquals(expected, hm.getMethod());
 	}
 
 	@Test
 	public void getHandlerRequestMethodNotAllowed() throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.POST, "/bar");
-		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
+		this.request = MockServerHttpRequest.post("/bar").build();
+		Mono<Object> mono = this.handlerMapping.getHandler(createExchange());
 
 		assertError(mono, MethodNotAllowedException.class,
 				ex -> assertEquals(new HashSet<>(Arrays.asList("GET", "HEAD")), ex.getSupportedMethods()));
@@ -154,10 +159,9 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	@Test // SPR-9603
 	public void getHandlerRequestMethodMatchFalsePositive() throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/users");
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.APPLICATION_XML));
+		this.request = MockServerHttpRequest.get("/users").accept(MediaType.APPLICATION_XML).build();
 		this.handlerMapping.registerHandler(new UserController());
-		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
+		Mono<Object> mono = this.handlerMapping.getHandler(createExchange());
 
 		StepVerifier.create(mono)
 				.expectError(NotAcceptableStatusException.class)
@@ -173,9 +177,8 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	@Test
 	public void getHandlerTestInvalidContentType() throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.PUT, "/person/1");
-		exchange.getRequest().getHeaders().add("Content-Type", "bogus");
-		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
+		this.request = MockServerHttpRequest.put("/person/1").header("content-type", "bogus").build();
+		Mono<Object> mono = this.handlerMapping.getHandler(createExchange());
 
 		assertError(mono, UnsupportedMediaTypeStatusException.class,
 				ex -> assertEquals("Request failure [status: 415, " +
@@ -192,8 +195,8 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	@Test // SPR-12854
 	public void getHandlerTestRequestParamMismatch() throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/params");
-		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
+		this.request = MockServerHttpRequest.get("/params").build();
+		Mono<Object> mono = this.handlerMapping.getHandler(createExchange());
 		assertError(mono, ServerWebInputException.class, ex -> {
 			assertThat(ex.getReason(), containsString("[foo=bar]"));
 			assertThat(ex.getReason(), containsString("[bar=baz]"));
@@ -210,15 +213,15 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	@Test
 	public void getHandlerProducibleMediaTypesAttribute() throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/content");
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.APPLICATION_XML));
+		this.request = MockServerHttpRequest.get("/content").accept(MediaType.APPLICATION_XML).build();
+		ServerWebExchange exchange = createExchange();
 		this.handlerMapping.getHandler(exchange).block();
 
 		String name = HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE;
 		assertEquals(Collections.singleton(MediaType.APPLICATION_XML), exchange.getAttributes().get(name));
 
-		exchange = createExchange(HttpMethod.GET, "/content");
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+		this.request = MockServerHttpRequest.get("/content").accept(MediaType.APPLICATION_JSON).build();
+		exchange = createExchange();
 		this.handlerMapping.getHandler(exchange).block();
 
 		assertNull("Negated expression shouldn't be listed as producible type",
@@ -227,9 +230,11 @@ public class RequestMappingInfoHandlerMappingTests {
 
 	@Test @SuppressWarnings("unchecked")
 	public void handleMatchUriTemplateVariables() throws Exception {
+		String lookupPath = "/1/2";
+		this.request = MockServerHttpRequest.get(lookupPath).build();
+		ServerWebExchange exchange = createExchange();
+
 		RequestMappingInfo key = paths("/{path1}/{path2}").build();
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/1/2");
-		String lookupPath = exchange.getRequest().getURI().getPath();
 		this.handlerMapping.handleMatch(key, lookupPath, exchange);
 
 		String name = HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE;
@@ -243,7 +248,8 @@ public class RequestMappingInfoHandlerMappingTests {
 	@Test // SPR-9098
 	public void handleMatchUriTemplateVariablesDecode() throws Exception {
 		RequestMappingInfo key = paths("/{group}/{identifier}").build();
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/group/a%2Fb");
+		this.request = MockServerHttpRequest.method(HttpMethod.GET, URI.create("/group/a%2Fb")).build();
+		ServerWebExchange exchange = createExchange();
 
 		HttpRequestPathHelper pathHelper = new HttpRequestPathHelper();
 		pathHelper.setUrlDecode(false);
@@ -264,7 +270,8 @@ public class RequestMappingInfoHandlerMappingTests {
 	@Test
 	public void handleMatchBestMatchingPatternAttribute() throws Exception {
 		RequestMappingInfo key = paths("/{path1}/2", "/**").build();
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/1/2");
+		this.request = MockServerHttpRequest.get("/1/2").build();
+		ServerWebExchange exchange = createExchange();
 		this.handlerMapping.handleMatch(key, "/1/2", exchange);
 
 		assertEquals("/{path1}/2", exchange.getAttributes().get(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE));
@@ -273,7 +280,8 @@ public class RequestMappingInfoHandlerMappingTests {
 	@Test
 	public void handleMatchBestMatchingPatternAttributeNoPatternsDefined() throws Exception {
 		RequestMappingInfo key = paths().build();
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/1/2");
+		this.request = MockServerHttpRequest.get("/1/2").build();
+		ServerWebExchange exchange = createExchange();
 
 		this.handlerMapping.handleMatch(key, "/1/2", exchange);
 
@@ -286,7 +294,8 @@ public class RequestMappingInfoHandlerMappingTests {
 		MultiValueMap<String, String> matrixVariables;
 		Map<String, String> uriVariables;
 
-		exchange = createExchange(HttpMethod.GET, "/");
+		this.request = MockServerHttpRequest.get("/").build();
+		exchange = createExchange();
 		handleMatch(exchange, "/{cars}", "/cars;colors=red,blue,green;year=2012");
 
 		matrixVariables = getMatrixVariables(exchange, "cars");
@@ -297,7 +306,8 @@ public class RequestMappingInfoHandlerMappingTests {
 		assertEquals("2012", matrixVariables.getFirst("year"));
 		assertEquals("cars", uriVariables.get("cars"));
 
-		exchange = createExchange(HttpMethod.GET, "/");
+		this.request = MockServerHttpRequest.get("/").build();
+		exchange = createExchange();
 		handleMatch(exchange, "/{cars:[^;]+}{params}", "/cars;colors=red,blue,green;year=2012");
 
 		matrixVariables = getMatrixVariables(exchange, "params");
@@ -309,7 +319,8 @@ public class RequestMappingInfoHandlerMappingTests {
 		assertEquals("cars", uriVariables.get("cars"));
 		assertEquals(";colors=red,blue,green;year=2012", uriVariables.get("params"));
 
-		exchange = createExchange(HttpMethod.GET, "/");
+		this.request = MockServerHttpRequest.get("/").build();
+		exchange = createExchange();
 		handleMatch(exchange, "/{cars:[^;]+}{params}", "/cars");
 
 		matrixVariables = getMatrixVariables(exchange, "params");
@@ -326,7 +337,8 @@ public class RequestMappingInfoHandlerMappingTests {
 		urlPathHelper.setUrlDecode(false);
 		this.handlerMapping.setPathHelper(urlPathHelper);
 
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, "/");
+		this.request = MockServerHttpRequest.get("/").build();
+		ServerWebExchange exchange = createExchange();
 		handleMatch(exchange, "/path{filter}", "/path;mvar=a%2fb");
 
 		MultiValueMap<String, String> matrixVariables = getMatrixVariables(exchange, "filter");
@@ -338,10 +350,8 @@ public class RequestMappingInfoHandlerMappingTests {
 	}
 
 
-	private ServerWebExchange createExchange(HttpMethod method, String url) throws URISyntaxException {
-		ServerHttpRequest request = new MockServerHttpRequest(method, url);
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+	private ServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
 
 	}
 
@@ -359,9 +369,8 @@ public class RequestMappingInfoHandlerMappingTests {
 
 
 	private void testHttpMediaTypeNotSupportedException(String url) throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.PUT, url);
-		exchange.getRequest().getHeaders().setContentType(MediaType.APPLICATION_JSON);
-		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
+		this.request = MockServerHttpRequest.put(url).contentType(MediaType.APPLICATION_JSON).build();
+		Mono<Object> mono = this.handlerMapping.getHandler(createExchange());
 
 		assertError(mono, UnsupportedMediaTypeStatusException.class, ex ->
 				assertEquals("Invalid supported consumable media types",
@@ -370,8 +379,9 @@ public class RequestMappingInfoHandlerMappingTests {
 	}
 
 	private void testHttpOptions(String requestURI, String allowHeader) throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.OPTIONS, requestURI);
-		HandlerMethod handlerMethod = (HandlerMethod) this.handlerMapping.getHandler(exchange).block();
+		this.request = MockServerHttpRequest.options(requestURI).build();
+		ServerWebExchange exchange = createExchange();
+		HandlerMethod handlerMethod = (HandlerMethod) this.handlerMapping.getHandler(createExchange()).block();
 
 		BindingContext bindingContext = new BindingContext();
 		InvocableHandlerMethod invocable = new InvocableHandlerMethod(handlerMethod);
@@ -387,9 +397,8 @@ public class RequestMappingInfoHandlerMappingTests {
 	}
 
 	private void testMediaTypeNotAcceptable(String url) throws Exception {
-		ServerWebExchange exchange = createExchange(HttpMethod.GET, url);
-		exchange.getRequest().getHeaders().setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-		Mono<Object> mono = this.handlerMapping.getHandler(exchange);
+		this.request = MockServerHttpRequest.get(url).accept(MediaType.APPLICATION_JSON).build();
+		Mono<Object> mono = this.handlerMapping.getHandler(createExchange());
 
 		assertError(mono, NotAcceptableStatusException.class, ex ->
 				assertEquals("Invalid supported producible media types",

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

@@ -25,7 +25,6 @@ import reactor.core.publisher.Mono;
 import rx.Single;
 
 import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.ui.Model;
@@ -42,11 +41,9 @@ import org.springframework.web.reactive.config.WebReactiveConfigurationSupport;
 import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
 
 /**
  * Unit tests for {@link BindingContextFactory}.
@@ -67,10 +64,9 @@ public class BindingContextFactoryTests {
 		adapter.afterPropertiesSet();
 		this.contextFactory = new BindingContextFactory(adapter);
 
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
+		MockServerHttpRequest request = MockServerHttpRequest.get("/path").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		this.exchange = new DefaultServerWebExchange(request, response);
 	}
 
 

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

@@ -18,6 +18,7 @@ package org.springframework.web.reactive.result.method.annotation;
 
 import java.lang.reflect.Method;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
@@ -27,19 +28,17 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.http.HttpCookie;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.reactive.BindingContext;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test fixture with {@link CookieValueMethodArgumentResolver}.
@@ -50,7 +49,7 @@ public class CookieValueMethodArgumentResolverTests {
 
 	private CookieValueMethodArgumentResolver resolver;
 
-	private ServerWebExchange exchange;
+	private ServerHttpRequest request;
 
 	private MethodParameter cookieParameter;
 	private MethodParameter cookieStringParameter;
@@ -65,9 +64,7 @@ public class CookieValueMethodArgumentResolverTests {
 		context.refresh();
 		this.resolver = new CookieValueMethodArgumentResolver(context.getBeanFactory());
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		this.request = MockServerHttpRequest.get("/").build();
 
 		Method method = getClass().getMethod("params", HttpCookie.class, String.class, String.class);
 		this.cookieParameter = new SynthesizingMethodParameter(method, 0);
@@ -86,10 +83,10 @@ public class CookieValueMethodArgumentResolverTests {
 	@Test
 	public void resolveCookieArgument() {
 		HttpCookie expected = new HttpCookie("name", "foo");
-		this.exchange.getRequest().getCookies().add(expected.getName(), expected);
+		this.request = MockServerHttpRequest.get("/").cookie(expected.getName(), expected).build();
 
 		Mono<Object> mono = this.resolver.resolveArgument(
-				this.cookieParameter, this.bindingContext, this.exchange);
+				this.cookieParameter, this.bindingContext, createExchange());
 
 		assertEquals(expected, mono.block());
 	}
@@ -97,10 +94,10 @@ public class CookieValueMethodArgumentResolverTests {
 	@Test
 	public void resolveCookieStringArgument() {
 		HttpCookie cookie = new HttpCookie("name", "foo");
-		this.exchange.getRequest().getCookies().add(cookie.getName(), cookie);
+		this.request = MockServerHttpRequest.get("/").cookie(cookie.getName(), cookie).build();
 
 		Mono<Object> mono = this.resolver.resolveArgument(
-				this.cookieStringParameter, this.bindingContext, this.exchange);
+				this.cookieStringParameter, this.bindingContext, createExchange());
 
 		assertEquals("Invalid result", cookie.getValue(), mono.block());
 	}
@@ -108,7 +105,7 @@ public class CookieValueMethodArgumentResolverTests {
 	@Test
 	public void resolveCookieDefaultValue() {
 		Object result = this.resolver.resolveArgument(
-				this.cookieStringParameter, this.bindingContext, this.exchange).block();
+				this.cookieStringParameter, this.bindingContext, createExchange()).block();
 
 		assertTrue(result instanceof String);
 		assertEquals("bar", result);
@@ -116,13 +113,18 @@ public class CookieValueMethodArgumentResolverTests {
 
 	@Test
 	public void notFound() {
-		Mono<Object> mono = resolver.resolveArgument(this.cookieParameter, this.bindingContext, this.exchange);
+		Mono<Object> mono = resolver.resolveArgument(this.cookieParameter, this.bindingContext, createExchange());
 		StepVerifier.create(mono)
 				.expectNextCount(0)
 				.expectError(ServerWebInputException.class)
 				.verify();
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 
 	@SuppressWarnings("unused")
 	public void params(

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

@@ -24,7 +24,6 @@ import reactor.core.publisher.MonoProcessor;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ReactiveAdapterRegistry;
 import org.springframework.core.ResolvableType;
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.validation.BindingResult;
@@ -35,13 +34,12 @@ import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.core.ResolvableType.*;
+import static org.springframework.core.ResolvableType.forClass;
+import static org.springframework.core.ResolvableType.forClassWithGenerics;
 
 /**
  * Unit tests for {@link ErrorsMethodArgumentResolver}.
@@ -65,10 +63,9 @@ public class ErrorsArgumentResolverTests {
 	public void setUp() throws Exception {
 		this.resolver = new ErrorsMethodArgumentResolver(new ReactiveAdapterRegistry());
 
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.POST, "/path");
+		MockServerHttpRequest request = MockServerHttpRequest.post("/path").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		this.exchange = new DefaultServerWebExchange(request, response);
 
 		Foo foo = new Foo();
 		WebExchangeDataBinder binder = this.bindingContext.createDataBinder(this.exchange, foo, "foo");

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

@@ -25,17 +25,16 @@ import reactor.core.publisher.Mono;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link ExpressionValueMethodArgumentResolver}.
@@ -58,9 +57,8 @@ public class ExpressionValueMethodArgumentResolverTests {
 		context.refresh();
 		this.resolver = new ExpressionValueMethodArgumentResolver(context.getBeanFactory());
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		Method method = getClass().getMethod("params", int.class, String.class);
 		this.paramSystemProperty = new MethodParameter(method, 0);

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

@@ -41,7 +41,7 @@ import org.springframework.core.codec.StringDecoder;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.codec.DecoderHttpMessageReader;
 import org.springframework.http.codec.HttpMessageReader;
@@ -52,10 +52,13 @@ import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.springframework.core.ResolvableType.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.core.ResolvableType.forClassWithGenerics;
 
 /**
  * Unit tests for {@link HttpEntityArgumentResolver}.When adding a test also
@@ -69,8 +72,6 @@ public class HttpEntityArgumentResolverTests {
 
 	private HttpEntityArgumentResolver resolver = createResolver();
 
-	private ServerWebExchange exchange;
-
 	private MockServerHttpRequest request;
 
 	private ResolvableMethod testMethod = ResolvableMethod.onClass(getClass()).name("handle");
@@ -78,9 +79,7 @@ public class HttpEntityArgumentResolverTests {
 
 	@Before
 	public void setUp() throws Exception {
-		this.request = new MockServerHttpRequest(HttpMethod.POST, "/path");
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, response, new MockWebSessionManager());
+		this.request = MockServerHttpRequest.post("/path").build();
 	}
 
 	private HttpEntityArgumentResolver createResolver() {
@@ -318,11 +317,13 @@ public class HttpEntityArgumentResolverTests {
 
 	@SuppressWarnings("unchecked")
 	private <T> T resolveValue(ResolvableType type, String body) {
-		this.request.setHeader("foo", "bar").setHeader("Content-Type", "text/plain");
-		this.request.setBody(body);
+		this.request = MockServerHttpRequest.post("/path").header("foo", "bar")
+				.contentType(MediaType.TEXT_PLAIN)
+				.body(body);
+		ServerWebExchange exchange = new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
 
 		MethodParameter param = this.testMethod.resolveParam(type);
-		Mono<Object> result = this.resolver.resolveArgument(param, new BindingContext(), this.exchange);
+		Mono<Object> result = this.resolver.resolveArgument(param, new BindingContext(), exchange);
 		Object value = result.block(Duration.ofSeconds(5));
 
 		assertNotNull(value);
@@ -334,8 +335,9 @@ public class HttpEntityArgumentResolverTests {
 
 	@SuppressWarnings("unchecked")
 	private <T> HttpEntity<T> resolveValueWithEmptyBody(ResolvableType type) {
+		ServerWebExchange exchange = new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
 		MethodParameter param = this.testMethod.resolveParam(type);
-		Mono<Object> result = this.resolver.resolveArgument(param, new BindingContext(), this.exchange);
+		Mono<Object> result = this.resolver.resolveArgument(param, new BindingContext(), exchange);
 		HttpEntity<String> httpEntity = (HttpEntity<String>) result.block(Duration.ofSeconds(5));
 
 		assertEquals(this.request.getHeaders(), httpEntity.getHeaders());

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

@@ -21,6 +21,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.jetbrains.annotations.NotNull;
+import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
@@ -35,11 +37,12 @@ import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.result.method.SyncHandlerMethodArgumentResolver;
 import org.springframework.web.reactive.result.method.SyncInvocableHandlerMethod;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 /**
  * Unit tests for {@link InitBinderBindingContext}.
@@ -51,14 +54,18 @@ public class InitBinderBindingContextTests {
 
 	private final List<SyncHandlerMethodArgumentResolver> argumentResolvers = new ArrayList<>();
 
-	private final ServerWebExchange exchange = new DefaultServerWebExchange(
-			new MockServerHttpRequest(), new MockServerHttpResponse(), new DefaultWebSessionManager());
+	private MockServerHttpRequest request;
 
 
+	@Before
+	public void setUp() throws Exception {
+		this.request = MockServerHttpRequest.get("/").build();
+	}
+
 	@Test
 	public void createBinder() throws Exception {
 		BindingContext context = createBindingContext("initBinder", WebDataBinder.class);
-		WebDataBinder dataBinder = context.createDataBinder(this.exchange, null, null);
+		WebDataBinder dataBinder = context.createDataBinder(createExchange(), null, null);
 
 		assertNotNull(dataBinder.getDisallowedFields());
 		assertEquals("id", dataBinder.getDisallowedFields()[0]);
@@ -70,7 +77,7 @@ public class InitBinderBindingContextTests {
 		bindingInitializer.setConversionService(conversionService);
 
 		BindingContext context = createBindingContext("initBinder", WebDataBinder.class);
-		WebDataBinder dataBinder = context.createDataBinder(this.exchange, null, null);
+		WebDataBinder dataBinder = context.createDataBinder(createExchange(), null, null);
 
 		assertSame(conversionService, dataBinder.getConversionService());
 	}
@@ -78,7 +85,7 @@ public class InitBinderBindingContextTests {
 	@Test
 	public void createBinderWithAttrName() throws Exception {
 		BindingContext context = createBindingContext("initBinderWithAttributeName", WebDataBinder.class);
-		WebDataBinder dataBinder = context.createDataBinder(this.exchange, null, "foo");
+		WebDataBinder dataBinder = context.createDataBinder(createExchange(), null, "foo");
 
 		assertNotNull(dataBinder.getDisallowedFields());
 		assertEquals("id", dataBinder.getDisallowedFields()[0]);
@@ -87,7 +94,7 @@ public class InitBinderBindingContextTests {
 	@Test
 	public void createBinderWithAttrNameNoMatch() throws Exception {
 		BindingContext context = createBindingContext("initBinderWithAttributeName", WebDataBinder.class);
-		WebDataBinder dataBinder = context.createDataBinder(this.exchange, null, "invalidName");
+		WebDataBinder dataBinder = context.createDataBinder(createExchange(), null, "invalidName");
 
 		assertNull(dataBinder.getDisallowedFields());
 	}
@@ -95,7 +102,7 @@ public class InitBinderBindingContextTests {
 	@Test
 	public void createBinderNullAttrName() throws Exception {
 		BindingContext context = createBindingContext("initBinderWithAttributeName", WebDataBinder.class);
-		WebDataBinder dataBinder = context.createDataBinder(this.exchange, null, null);
+		WebDataBinder dataBinder = context.createDataBinder(createExchange(), null, null);
 
 		assertNull(dataBinder.getDisallowedFields());
 	}
@@ -103,21 +110,25 @@ public class InitBinderBindingContextTests {
 	@Test(expected = IllegalStateException.class)
 	public void returnValueNotExpected() throws Exception {
 		BindingContext context = createBindingContext("initBinderReturnValue", WebDataBinder.class);
-		context.createDataBinder(this.exchange, null, "invalidName");
+		context.createDataBinder(createExchange(), null, "invalidName");
 	}
 
 	@Test
 	public void createBinderTypeConversion() throws Exception {
-		this.exchange.getRequest().getQueryParams().add("requestParam", "22");
+		this.request = MockServerHttpRequest.get("/path?requestParam=22").build();
 		this.argumentResolvers.add(new RequestParamMethodArgumentResolver(null, false));
 
 		BindingContext context = createBindingContext("initBinderTypeConversion", WebDataBinder.class, int.class);
-		WebDataBinder dataBinder = context.createDataBinder(this.exchange, null, "foo");
+		WebDataBinder dataBinder = context.createDataBinder(createExchange(), null, "foo");
 
 		assertNotNull(dataBinder.getDisallowedFields());
 		assertEquals("requestParam-22", dataBinder.getDisallowedFields()[0]);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
 
 	private BindingContext createBindingContext(String methodName, Class<?>... parameterTypes)
 			throws Exception {

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

@@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Flux;
@@ -41,7 +42,7 @@ import rx.Single;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.Decoder;
-import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
 import org.springframework.http.codec.DecoderHttpMessageReader;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.http.codec.json.Jackson2JsonDecoder;
@@ -54,14 +55,16 @@ import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.result.ResolvableMethod;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.UnsupportedMediaTypeStatusException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.springframework.core.ResolvableType.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.core.ResolvableType.forClass;
+import static org.springframework.core.ResolvableType.forClassWithGenerics;
 
 /**
  * Unit tests for {@link AbstractMessageReaderArgumentResolver}.
@@ -72,8 +75,6 @@ public class MessageReaderArgumentResolverTests {
 
 	private AbstractMessageReaderArgumentResolver resolver = resolver(new Jackson2JsonDecoder());
 
-	private ServerWebExchange exchange;
-
 	private MockServerHttpRequest request;
 
 	private BindingContext bindingContext;
@@ -83,10 +84,7 @@ public class MessageReaderArgumentResolverTests {
 
 	@Before
 	public void setUp() throws Exception {
-		this.request = new MockServerHttpRequest(HttpMethod.POST, "/path");
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, response, new MockWebSessionManager());
-
+		this.request = request().build();
 		ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer();
 		initializer.setValidator(new TestBeanValidator());
 		this.bindingContext = new BindingContext(initializer);
@@ -95,10 +93,10 @@ public class MessageReaderArgumentResolverTests {
 
 	@Test
 	public void missingContentType() throws Exception {
-		this.request.setBody("{\"bar\":\"BARBAR\",\"foo\":\"FOOFOO\"}");
+		this.request = request().body("{\"bar\":\"BARBAR\",\"foo\":\"FOOFOO\"}");
 		ResolvableType type = forClassWithGenerics(Mono.class, TestBean.class);
 		MethodParameter param = this.testMethod.resolveParam(type);
-		Mono<Object> result = this.resolver.readBody(param, true, this.bindingContext, this.exchange);
+		Mono<Object> result = this.resolver.readBody(param, true, this.bindingContext, exchange());
 
 		StepVerifier.create(result).expectError(UnsupportedMediaTypeStatusException.class).verify();
 	}
@@ -107,11 +105,11 @@ public class MessageReaderArgumentResolverTests {
 
 	@Test @SuppressWarnings("unchecked") // SPR-9942
 	public void emptyBody() throws Exception {
-		this.request.setHeader("Content-Type", "application/json");
+		this.request = request().header("Content-Type", "application/json").build();
 		ResolvableType type = forClassWithGenerics(Mono.class, TestBean.class);
 		MethodParameter param = this.testMethod.resolveParam(type);
 		Mono<TestBean> result = (Mono<TestBean>) this.resolver.readBody(
-				param, true, this.bindingContext, this.exchange).block();
+				param, true, this.bindingContext, exchange()).block();
 
 		StepVerifier.create(result).expectError(ServerWebInputException.class).verify();
 	}
@@ -301,8 +299,8 @@ public class MessageReaderArgumentResolverTests {
 
 	@SuppressWarnings("unchecked")
 	private <T> T resolveValue(MethodParameter param, String body) {
-		this.request.setHeader("Content-Type", "application/json").setBody(body);
-		Mono<Object> result = this.resolver.readBody(param, true, this.bindingContext, this.exchange);
+		this.request = request().contentType(MediaType.APPLICATION_JSON).body(body);
+		Mono<Object> result = this.resolver.readBody(param, true, this.bindingContext, exchange());
 		Object value = result.block(Duration.ofSeconds(5));
 
 		assertNotNull(value);
@@ -312,6 +310,15 @@ public class MessageReaderArgumentResolverTests {
 		return (T) value;
 	}
 
+	private MockServerHttpRequest.BodyBuilder request() {
+		return MockServerHttpRequest.post("/path");
+	}
+
+	@NotNull
+	private DefaultServerWebExchange exchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 	@SuppressWarnings("Convert2MethodRef")
 	private AbstractMessageReaderArgumentResolver resolver(Decoder<?>... decoders) {
 		List<HttpMessageReader<?>> readers = new ArrayList<>();

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

@@ -44,7 +44,6 @@ import org.springframework.core.codec.CharSequenceEncoder;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.buffer.support.DataBufferTestUtils;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
 import org.springframework.http.codec.HttpMessageWriter;
 import org.springframework.http.codec.ResourceHttpMessageWriter;
@@ -59,7 +58,6 @@ import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuild
 import org.springframework.web.reactive.result.ResolvableMethod;
 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.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -83,8 +81,8 @@ public class MessageWriterResultHandlerTests {
 	@Before
 	public void setUp() throws Exception {
 		this.resultHandler = createResultHandler();
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
-		this.exchange = new DefaultServerWebExchange(request, this.response, new MockWebSessionManager());
+		ServerHttpRequest request = MockServerHttpRequest.get("/path").build();
+		this.exchange = new DefaultServerWebExchange(request, this.response);
 	}
 
 

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

@@ -29,7 +29,6 @@ import rx.Single;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ReactiveAdapterRegistry;
 import org.springframework.core.ResolvableType;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -43,8 +42,6 @@ import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static junit.framework.TestCase.assertNotNull;
 import static org.junit.Assert.assertEquals;
@@ -282,12 +279,9 @@ public class ModelAttributeMethodArgumentResolverTests {
 	}
 
 	private ServerWebExchange exchange(String formData) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		request.getHeaders().setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		request.setBody(formData);
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, response, manager);
+		MediaType mediaType = MediaType.APPLICATION_FORM_URLENCODED;
+		MockServerHttpRequest request = MockServerHttpRequest.post("/").contentType(mediaType).body(formData);
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 

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

@@ -26,7 +26,6 @@ import org.junit.Test;
 import reactor.core.publisher.Mono;
 
 import org.springframework.core.MethodParameter;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -35,10 +34,10 @@ import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link PathVariableMapMethodArgumentResolver}.
@@ -60,9 +59,8 @@ public class PathVariableMapMethodArgumentResolverTests {
 	public void setUp() throws Exception {
 		this.resolver = new PathVariableMapMethodArgumentResolver();
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		Method method = getClass().getMethod("handle", Map.class, Map.class, Map.class);
 		this.paramMap = new MethodParameter(method, 0);

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

@@ -29,7 +29,6 @@ import reactor.test.StepVerifier;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -41,10 +40,10 @@ import org.springframework.web.reactive.HandlerMapping;
 import org.springframework.web.server.ServerErrorException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link PathVariableMethodArgumentResolver}.
@@ -71,9 +70,8 @@ public class PathVariableMethodArgumentResolverTests {
 	public void setUp() throws Exception {
 		this.resolver = new PathVariableMethodArgumentResolver(null);
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		Method method = ReflectionUtils.findMethod(getClass(), "handle", (Class<?>[]) null);
 		paramNamedString = new SynthesizingMethodParameter(method, 0);

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

@@ -30,7 +30,6 @@ import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -41,10 +40,13 @@ import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link RequestAttributeMethodArgumentResolver}.
@@ -67,9 +69,8 @@ public class RequestAttributeMethodArgumentResolverTests {
 		context.refresh();
 		this.resolver = new RequestAttributeMethodArgumentResolver(context.getBeanFactory());
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 
 		this.handleMethod = ReflectionUtils.findMethod(getClass(), "handleWithRequestAttribute", (Class<?>[]) null);
 	}

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

@@ -35,7 +35,6 @@ import rx.Single;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.codec.StringDecoder;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.codec.DecoderHttpMessageReader;
 import org.springframework.http.codec.HttpMessageReader;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
@@ -46,10 +45,14 @@ import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.springframework.core.ResolvableType.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.springframework.core.ResolvableType.forClass;
+import static org.springframework.core.ResolvableType.forClassWithGenerics;
 
 /**
  * Unit tests for {@link RequestBodyArgumentResolver}. When adding a test also
@@ -62,18 +65,11 @@ public class RequestBodyArgumentResolverTests {
 
 	private RequestBodyArgumentResolver resolver = resolver();
 
-	private ServerWebExchange exchange;
-
-	private MockServerHttpRequest request;
-
 	private ResolvableMethod testMethod = ResolvableMethod.onClass(this.getClass()).name("handle");
 
 
 	@Before
 	public void setUp() throws Exception {
-		this.request = new MockServerHttpRequest(HttpMethod.POST, "/path");
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		this.exchange = new DefaultServerWebExchange(this.request, response, new MockWebSessionManager());
 	}
 
 	private RequestBodyArgumentResolver resolver() {
@@ -219,8 +215,9 @@ public class RequestBodyArgumentResolverTests {
 
 	@SuppressWarnings("unchecked")
 	private <T> T resolveValue(MethodParameter param, String body) {
-		this.request.setBody(body);
-		Mono<Object> result = this.resolver.readBody(param, true, new BindingContext(), this.exchange);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/path").body(body);
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
+		Mono<Object> result = this.resolver.readBody(param, true, new BindingContext(), exchange);
 		Object value = result.block(Duration.ofSeconds(5));
 
 		assertNotNull(value);
@@ -233,8 +230,10 @@ public class RequestBodyArgumentResolverTests {
 
 	@SuppressWarnings("unchecked")
 	private <T> T resolveValueWithEmptyBody(ResolvableType bodyType, boolean isRequired) {
+		MockServerHttpRequest request = MockServerHttpRequest.post("/path").build();
+		ServerWebExchange exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse());
 		MethodParameter param = this.testMethod.resolveParam(bodyType, requestBody(isRequired));
-		Mono<Object> result = this.resolver.resolveArgument(param, new BindingContext(), this.exchange);
+		Mono<Object> result = this.resolver.resolveArgument(param, new BindingContext(), exchange);
 		Object value = result.block(Duration.ofSeconds(5));
 
 		if (value != null) {
@@ -254,6 +253,7 @@ public class RequestBodyArgumentResolverTests {
 	}
 
 
+	@SuppressWarnings("unused")
 	void handle(
 			@RequestBody String string,
 			@RequestBody Mono<String> mono,

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

@@ -20,6 +20,7 @@ import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Map;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
@@ -27,17 +28,14 @@ import reactor.core.publisher.Mono;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
+import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -57,7 +55,7 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 	private MethodParameter paramHttpHeaders;
 	private MethodParameter paramUnsupported;
 
-	private ServerWebExchange exchange;
+	private ServerHttpRequest request;
 
 
 	@Before
@@ -70,9 +68,7 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 		paramHttpHeaders = new SynthesizingMethodParameter(method, 2);
 		paramUnsupported = new SynthesizingMethodParameter(method, 3);
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		this.request = MockServerHttpRequest.get("/").build();
 	}
 
 
@@ -89,9 +85,9 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 		String name = "foo";
 		String value = "bar";
 		Map<String, String> expected = Collections.singletonMap(name, value);
-		this.exchange.getRequest().getHeaders().add(name, value);
+		this.request = MockServerHttpRequest.get("/").header(name, value).build();
 
-		Mono<Object> mono = this.resolver.resolveArgument(paramMap, null, this.exchange);
+		Mono<Object> mono = this.resolver.resolveArgument(paramMap, null, createExchange());
 		Object result = mono.block();
 
 		assertTrue(result instanceof Map);
@@ -103,15 +99,13 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 		String name = "foo";
 		String value1 = "bar";
 		String value2 = "baz";
-
-		this.exchange.getRequest().getHeaders().add(name, value1);
-		this.exchange.getRequest().getHeaders().add(name, value2);
+		this.request = MockServerHttpRequest.get("/").header(name, value1, value2).build();
 
 		MultiValueMap<String, String> expected = new LinkedMultiValueMap<>(1);
 		expected.add(name, value1);
 		expected.add(name, value2);
 
-		Mono<Object> mono = this.resolver.resolveArgument(paramMultiValueMap, null, this.exchange);
+		Mono<Object> mono = this.resolver.resolveArgument(paramMultiValueMap, null, createExchange());
 		Object result = mono.block();
 
 		assertTrue(result instanceof MultiValueMap);
@@ -123,21 +117,24 @@ public class RequestHeaderMapMethodArgumentResolverTests {
 		String name = "foo";
 		String value1 = "bar";
 		String value2 = "baz";
-
-		this.exchange.getRequest().getHeaders().add(name, value1);
-		this.exchange.getRequest().getHeaders().add(name, value2);
+		this.request = MockServerHttpRequest.get("/").header(name, value1, value2).build();
 
 		HttpHeaders expected = new HttpHeaders();
 		expected.add(name, value1);
 		expected.add(name, value2);
 
-		Mono<Object> mono = this.resolver.resolveArgument(paramHttpHeaders, null, this.exchange);
+		Mono<Object> mono = this.resolver.resolveArgument(paramHttpHeaders, null, createExchange());
 		Object result = mono.block();
 
 		assertTrue(result instanceof HttpHeaders);
 		assertEquals("Invalid result", expected, result);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
+
 
 	@SuppressWarnings("unused")
 	public void params(@RequestHeader Map<?, ?> param1,

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

@@ -19,10 +19,10 @@ package org.springframework.web.reactive.result.method.annotation;
 import java.lang.reflect.Method;
 import java.time.Instant;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
@@ -32,7 +32,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -40,13 +39,13 @@ import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 import org.springframework.web.reactive.BindingContext;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Unit tests for {@link RequestHeaderMethodArgumentResolver}.
@@ -66,7 +65,7 @@ public class RequestHeaderMethodArgumentResolverTests {
 	private MethodParameter paramDate;
 	private MethodParameter paramInstant;
 
-	private ServerWebExchange exchange;
+	private ServerHttpRequest request;
 
 	private BindingContext bindingContext;
 
@@ -88,9 +87,7 @@ public class RequestHeaderMethodArgumentResolverTests {
 		this.paramDate = new SynthesizingMethodParameter(method, 6);
 		this.paramInstant = new SynthesizingMethodParameter(method, 7);
 
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		WebSessionManager sessionManager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
+		this.request = MockServerHttpRequest.get("/").build();
 
 		ConfigurableWebBindingInitializer initializer = new ConfigurableWebBindingInitializer();
 		initializer.setConversionService(new DefaultFormattingConversionService());
@@ -108,10 +105,10 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@Test
 	public void resolveStringArgument() throws Exception {
 		String expected = "foo";
-		this.exchange.getRequest().getHeaders().add("name", expected);
+		this.request = MockServerHttpRequest.get("/").header("name", expected).build();
 
 		Mono<Object> mono = this.resolver.resolveArgument(
-				this.paramNamedDefaultValueStringHeader, this.bindingContext, this.exchange);
+				this.paramNamedDefaultValueStringHeader, this.bindingContext, createExchange());
 
 		Object result = mono.block();
 		assertTrue(result instanceof String);
@@ -120,21 +117,20 @@ public class RequestHeaderMethodArgumentResolverTests {
 
 	@Test
 	public void resolveStringArrayArgument() throws Exception {
-		String[] expected = new String[] {"foo", "bar"};
-		this.exchange.getRequest().getHeaders().put("name", Arrays.asList(expected));
+		this.request = MockServerHttpRequest.get("/").header("name", "foo", "bar").build();
 
 		Mono<Object> mono = this.resolver.resolveArgument(
-				this.paramNamedValueStringArray, this.bindingContext, this.exchange);
+				this.paramNamedValueStringArray, this.bindingContext, createExchange());
 
 		Object result = mono.block();
 		assertTrue(result instanceof String[]);
-		assertArrayEquals(expected, (String[]) result);
+		assertArrayEquals(new String[] {"foo", "bar"}, (String[]) result);
 	}
 
 	@Test
 	public void resolveDefaultValue() throws Exception {
 		Mono<Object> mono = this.resolver.resolveArgument(
-				this.paramNamedDefaultValueStringHeader, this.bindingContext, this.exchange);
+				this.paramNamedDefaultValueStringHeader, this.bindingContext, createExchange());
 
 		Object result = mono.block();
 		assertTrue(result instanceof String);
@@ -146,7 +142,7 @@ public class RequestHeaderMethodArgumentResolverTests {
 		System.setProperty("systemProperty", "bar");
 		try {
 			Mono<Object> mono = this.resolver.resolveArgument(
-					this.paramSystemProperty, this.bindingContext, this.exchange);
+					this.paramSystemProperty, this.bindingContext, createExchange());
 
 			Object result = mono.block();
 			assertTrue(result instanceof String);
@@ -160,12 +156,12 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@Test
 	public void resolveNameFromSystemPropertyThroughExpression() throws Exception {
 		String expected = "foo";
-		this.exchange.getRequest().getHeaders().add("bar", expected);
+		this.request = MockServerHttpRequest.get("/").header("bar", expected).build();
 
 		System.setProperty("systemProperty", "bar");
 		try {
 			Mono<Object> mono = this.resolver.resolveArgument(
-					this.paramResolvedNameWithExpression, this.bindingContext, this.exchange);
+					this.paramResolvedNameWithExpression, this.bindingContext, createExchange());
 
 			Object result = mono.block();
 			assertTrue(result instanceof String);
@@ -179,12 +175,12 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@Test
 	public void resolveNameFromSystemPropertyThroughPlaceholder() throws Exception {
 		String expected = "foo";
-		this.exchange.getRequest().getHeaders().add("bar", expected);
+		this.request = MockServerHttpRequest.get("/").header("bar", expected).build();
 
 		System.setProperty("systemProperty", "bar");
 		try {
 			Mono<Object> mono = this.resolver.resolveArgument(
-					this.paramResolvedNameWithPlaceholder, this.bindingContext, this.exchange);
+					this.paramResolvedNameWithPlaceholder, this.bindingContext, createExchange());
 
 			Object result = mono.block();
 			assertTrue(result instanceof String);
@@ -198,7 +194,7 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@Test
 	public void notFound() throws Exception {
 		Mono<Object> mono = resolver.resolveArgument(
-				this.paramNamedValueStringArray, this.bindingContext, this.exchange);
+				this.paramNamedValueStringArray, this.bindingContext, createExchange());
 
 		StepVerifier.create(mono)
 				.expectNextCount(0)
@@ -210,9 +206,9 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@SuppressWarnings("deprecation")
 	public void dateConversion() throws Exception {
 		String rfc1123val = "Thu, 21 Apr 2016 17:11:08 +0100";
-		this.exchange.getRequest().getHeaders().add("name", rfc1123val);
+		this.request = MockServerHttpRequest.get("/").header("name", rfc1123val).build();
 
-		Mono<Object> mono = this.resolver.resolveArgument(this.paramDate, this.bindingContext, this.exchange);
+		Mono<Object> mono = this.resolver.resolveArgument(this.paramDate, this.bindingContext, createExchange());
 		Object result = mono.block();
 
 		assertTrue(result instanceof Date);
@@ -222,15 +218,20 @@ public class RequestHeaderMethodArgumentResolverTests {
 	@Test
 	public void instantConversion() throws Exception {
 		String rfc1123val = "Thu, 21 Apr 2016 17:11:08 +0100";
-		this.exchange.getRequest().getHeaders().add("name", rfc1123val);
+		this.request = MockServerHttpRequest.get("/").header("name", rfc1123val).build();
 
-		Mono<Object> mono = this.resolver.resolveArgument(this.paramInstant, this.bindingContext, this.exchange);
+		Mono<Object> mono = this.resolver.resolveArgument(this.paramInstant, this.bindingContext, createExchange());
 		Object result = mono.block();
 
 		assertTrue(result instanceof Instant);
 		assertEquals(Instant.from(DateTimeFormatter.RFC_1123_DATE_TIME.parse(rfc1123val)), result);
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
+	}
+
 
 	@SuppressWarnings("unused")
 	public void params(

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

@@ -27,22 +27,17 @@ import org.junit.Test;
 
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.web.util.UriComponentsBuilder.fromPath;
 
 /**
  * Unit tests for {@link RequestParamMapMethodArgumentResolver}.
@@ -104,23 +99,15 @@ public class RequestParamMapMethodArgumentResolverTests {
 
 
 	private ServerWebExchange exchangeWithQuery(String query) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		MultiValueMap<String, String> params = fromPath("/").query(query).build().getQueryParams();
-		request.getQueryParams().putAll(params);
-		return exchange(request);
+		MockServerHttpRequest request = MockServerHttpRequest.get("/path?" + query).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private ServerWebExchange exchangeWithFormData(String formData) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		request.getHeaders().setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		request.setBody(formData);
-		return exchange(request);
-	}
-
-	private ServerWebExchange exchange(ServerHttpRequest request) {
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, response, manager);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/")
+				.contentType(MediaType.APPLICATION_FORM_URLENCODED)
+				.body(formData);
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private Object resolve(MethodParameter parameter, ServerWebExchange exchange) {

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

@@ -31,12 +31,9 @@ import org.springframework.core.MethodParameter;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
-import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
-import org.springframework.util.MultiValueMap;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
@@ -44,15 +41,12 @@ import org.springframework.web.reactive.BindingContext;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebInputException;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.web.util.UriComponentsBuilder.fromPath;
 
 /**
  * Unit tests for {@link RequestParamMethodArgumentResolver}.
@@ -196,27 +190,20 @@ public class RequestParamMethodArgumentResolverTests {
 
 
 	private ServerWebExchange exchangeWithQuery(String query) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		MultiValueMap<String, String> params = fromPath("/").query(query).build().getQueryParams();
-		request.getQueryParams().putAll(params);
-		return exchange(request);
+		MockServerHttpRequest request = MockServerHttpRequest.get("/path?" + query).build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private ServerWebExchange exchangeWithFormData(String formData) throws URISyntaxException {
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
-		request.getHeaders().setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		request.setBody(formData);
-		return exchange(request);
+		MockServerHttpRequest request = MockServerHttpRequest.post("/path")
+				.contentType(MediaType.APPLICATION_FORM_URLENCODED)
+				.body(formData);
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private ServerWebExchange exchange() {
-		return exchange(new MockServerHttpRequest(HttpMethod.GET, "/"));
-	}
-
-	private ServerWebExchange exchange(ServerHttpRequest request) {
-		MockServerHttpResponse response = new MockServerHttpResponse();
-		WebSessionManager manager = new MockWebSessionManager();
-		return new DefaultServerWebExchange(request, response, manager);
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		return new DefaultServerWebExchange(request, new MockServerHttpResponse());
 	}
 
 	private Object resolve(MethodParameter parameter, ServerWebExchange exchange) {

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

@@ -29,7 +29,6 @@ import rx.Single;
 
 import org.springframework.core.codec.ByteBufferEncoder;
 import org.springframework.core.codec.CharSequenceEncoder;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.codec.EncoderHttpMessageWriter;
@@ -51,7 +50,6 @@ import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
 import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuilder;
 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.assertEquals;
 
@@ -71,7 +69,7 @@ public class ResponseBodyResultHandlerTests {
 
 	private ResponseBodyResultHandler resultHandler;
 
-	private MockServerHttpResponse response = new MockServerHttpResponse();
+	private MockServerHttpResponse response;
 
 	private ServerWebExchange exchange;
 
@@ -79,8 +77,13 @@ public class ResponseBodyResultHandlerTests {
 	@Before
 	public void setUp() throws Exception {
 		this.resultHandler = createHandler();
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
-		this.exchange = new DefaultServerWebExchange(request, this.response, new MockWebSessionManager());
+		initExchange();
+	}
+
+	private void initExchange() {
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
+		this.response = new MockServerHttpResponse();
+		this.exchange = new DefaultServerWebExchange(request, this.response);
 	}
 
 
@@ -122,12 +125,14 @@ public class ResponseBodyResultHandlerTests {
 		HandlerMethod hm = handlerMethod(controller, "handleToString");
 		HandlerResult handlerResult = new HandlerResult(hm, null, hm.getReturnType());
 
+		initExchange();
 		StepVerifier.create(this.resultHandler.handleResult(this.exchange, handlerResult)).expectComplete().verify();
 		assertEquals(HttpStatus.NO_CONTENT, this.response.getStatusCode());
 
 		hm = handlerMethod(controller, "handleToMonoVoid");
 		handlerResult = new HandlerResult(hm, null, hm.getReturnType());
 
+		initExchange();
 		StepVerifier.create(this.resultHandler.handleResult(this.exchange, handlerResult)).expectComplete().verify();
 		assertEquals(HttpStatus.CREATED, this.response.getStatusCode());
 	}

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

@@ -27,6 +27,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
@@ -40,7 +41,6 @@ import org.springframework.core.codec.ByteBufferEncoder;
 import org.springframework.core.codec.CharSequenceEncoder;
 import org.springframework.core.io.buffer.support.DataBufferTestUtils;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -59,8 +59,6 @@ import org.springframework.web.reactive.accept.RequestedContentTypeResolverBuild
 import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.MockWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -85,19 +83,21 @@ public class ResponseEntityResultHandlerTests {
 
 	private MockServerHttpRequest request;
 
-	private MockServerHttpResponse response = new MockServerHttpResponse();
-
-	private ServerWebExchange exchange;
+	private MockServerHttpResponse response;
 
 
 	@Before
 	public void setUp() throws Exception {
 		this.resultHandler = createHandler();
-		this.request = new MockServerHttpRequest(HttpMethod.GET, "/path");
-		WebSessionManager manager = new MockWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(this.request, this.response, manager);
+		initExchange();
 	}
 
+	private void initExchange() {
+		this.request = MockServerHttpRequest.get("/path").build();
+		this.response = new MockServerHttpResponse();
+	}
+
+
 	private ResponseEntityResultHandler createHandler(HttpMessageWriter<?>... writers) {
 		List<HttpMessageWriter<?>> writerList;
 		if (ObjectUtils.isEmpty(writers)) {
@@ -152,7 +152,7 @@ public class ResponseEntityResultHandlerTests {
 		ResponseEntity<Void> value = ResponseEntity.noContent().build();
 		ResolvableType type = responseEntity(Void.class);
 		HandlerResult result = handlerResult(value, type);
-		this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertEquals(HttpStatus.NO_CONTENT, this.response.getStatusCode());
 		assertEquals(0, this.response.getHeaders().size());
@@ -165,7 +165,7 @@ public class ResponseEntityResultHandlerTests {
 		ResolvableType type = responseEntity(Void.class);
 		ResponseEntity<Void> value = ResponseEntity.created(location).build();
 		HandlerResult result = handlerResult(value, type);
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertEquals(HttpStatus.CREATED, this.response.getStatusCode());
 		assertEquals(1, this.response.getHeaders().size());
@@ -178,7 +178,7 @@ public class ResponseEntityResultHandlerTests {
 		Object returnValue = Mono.just(notFound().build());
 		ResolvableType returnType = forClassWithGenerics(Mono.class, responseEntity(String.class));
 		HandlerResult result = handlerResult(returnValue, returnType);
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 		assertEquals(HttpStatus.NOT_FOUND, this.response.getStatusCode());
 		assertNull(this.response.getBody());
 	}
@@ -206,11 +206,11 @@ public class ResponseEntityResultHandlerTests {
 	public void handleReturnValueLastModified() throws Exception {
 		Instant currentTime = Instant.now().truncatedTo(ChronoUnit.SECONDS);
 		Instant oneMinAgo = currentTime.minusSeconds(60);
-		this.request.getHeaders().setIfModifiedSince(currentTime.toEpochMilli());
+		this.request = MockServerHttpRequest.get("/path").ifModifiedSince(currentTime.toEpochMilli()).build();
 
 		ResponseEntity<String> entity = ok().lastModified(oneMinAgo.toEpochMilli()).body("body");
 		HandlerResult result = handlerResult(entity, responseEntity(String.class));
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertConditionalResponse(HttpStatus.NOT_MODIFIED, null, null, oneMinAgo);
 	}
@@ -218,22 +218,22 @@ public class ResponseEntityResultHandlerTests {
 	@Test
 	public void handleReturnValueEtag() throws Exception {
 		String etagValue = "\"deadb33f8badf00d\"";
-		this.request.getHeaders().setIfNoneMatch(etagValue);
+		this.request = MockServerHttpRequest.get("/path").ifNoneMatch(etagValue).build();
 
 		ResponseEntity<String> entity = ok().eTag(etagValue).body("body");
 		HandlerResult result = handlerResult(entity, responseEntity(String.class));
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertConditionalResponse(HttpStatus.NOT_MODIFIED, null, etagValue, Instant.MIN);
 	}
 
 	@Test // SPR-14559
 	public void handleReturnValueEtagInvalidIfNoneMatch() throws Exception {
-		this.request.getHeaders().setIfNoneMatch("unquoted");
+		this.request = MockServerHttpRequest.get("/path").ifNoneMatch("unquoted").build();
 
 		ResponseEntity<String> entity = ok().eTag("\"deadb33f8badf00d\"").body("body");
 		HandlerResult result = handlerResult(entity, responseEntity(String.class));
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertEquals(HttpStatus.OK, this.response.getStatusCode());
 		assertResponseBody("body");
@@ -242,15 +242,18 @@ public class ResponseEntityResultHandlerTests {
 	@Test
 	public void handleReturnValueETagAndLastModified() throws Exception {
 		String eTag = "\"deadb33f8badf00d\"";
-		this.request.getHeaders().setIfNoneMatch(eTag);
 
 		Instant currentTime = Instant.now().truncatedTo(ChronoUnit.SECONDS);
 		Instant oneMinAgo = currentTime.minusSeconds(60);
-		this.request.getHeaders().setIfModifiedSince(currentTime.toEpochMilli());
+
+		this.request = MockServerHttpRequest.get("/path")
+				.ifNoneMatch(eTag)
+				.ifModifiedSince(currentTime.toEpochMilli())
+				.build();
 
 		ResponseEntity<String> entity = ok().eTag(eTag).lastModified(oneMinAgo.toEpochMilli()).body("body");
 		HandlerResult result = handlerResult(entity, responseEntity(String.class));
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertConditionalResponse(HttpStatus.NOT_MODIFIED, null, eTag, oneMinAgo);
 	}
@@ -259,15 +262,18 @@ public class ResponseEntityResultHandlerTests {
 	public void handleReturnValueChangedETagAndLastModified() throws Exception {
 		String etag = "\"deadb33f8badf00d\"";
 		String newEtag = "\"changed-etag-value\"";
-		this.request.getHeaders().setIfNoneMatch(etag);
 
 		Instant currentTime = Instant.now().truncatedTo(ChronoUnit.SECONDS);
 		Instant oneMinAgo = currentTime.minusSeconds(60);
-		this.request.getHeaders().setIfModifiedSince(currentTime.toEpochMilli());
+
+		this.request = MockServerHttpRequest.get("/path")
+				.ifNoneMatch(etag)
+				.ifModifiedSince(currentTime.toEpochMilli())
+				.build();
 
 		ResponseEntity<String> entity = ok().eTag(newEtag).lastModified(oneMinAgo.toEpochMilli()).body("body");
 		HandlerResult result = handlerResult(entity, responseEntity(String.class));
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertConditionalResponse(HttpStatus.OK, "body", newEtag, oneMinAgo);
 	}
@@ -275,7 +281,8 @@ public class ResponseEntityResultHandlerTests {
 	@Test // SPR-14877
 	public void handleMonoWithWildcardBodyType() throws Exception {
 
-		this.exchange.getAttributes().put(HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE,
+		ServerWebExchange exchange = createExchange();
+		exchange.getAttributes().put(HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE,
 				Collections.singleton(MediaType.APPLICATION_JSON));
 
 		HandlerResult result = new HandlerResult(new TestController(), Mono.just(ok().body("body")),
@@ -283,7 +290,7 @@ public class ResponseEntityResultHandlerTests {
 						.name("monoResponseEntityWildcard")
 						.resolveReturnType());
 
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5));
 
 		assertEquals(HttpStatus.OK, this.response.getStatusCode());
 		assertResponseBody("\"body\"");
@@ -292,7 +299,8 @@ public class ResponseEntityResultHandlerTests {
 	@Test // SPR-14877
 	public void handleMonoWithWildcardBodyTypeAndNullBody() throws Exception {
 
-		this.exchange.getAttributes().put(HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE,
+		ServerWebExchange exchange = createExchange();
+		exchange.getAttributes().put(HandlerMapping.PRODUCIBLE_MEDIA_TYPES_ATTRIBUTE,
 				Collections.singleton(MediaType.APPLICATION_JSON));
 
 		HandlerResult result = new HandlerResult(new TestController(), Mono.just(notFound().build()),
@@ -300,7 +308,7 @@ public class ResponseEntityResultHandlerTests {
 						.name("monoResponseEntityWildcard")
 						.resolveReturnType());
 
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(exchange, result).block(Duration.ofSeconds(5));
 
 		assertEquals(HttpStatus.NOT_FOUND, this.response.getStatusCode());
 		assertNull(this.response.getBody());
@@ -308,14 +316,20 @@ public class ResponseEntityResultHandlerTests {
 
 
 	private void testHandle(Object returnValue, ResolvableType type) {
+		initExchange();
+
 		HandlerResult result = handlerResult(returnValue, type);
-		this.resultHandler.handleResult(this.exchange, result).block(Duration.ofSeconds(5));
+		this.resultHandler.handleResult(createExchange(), result).block(Duration.ofSeconds(5));
 
 		assertEquals(HttpStatus.OK, this.response.getStatusCode());
 		assertEquals("text/plain;charset=UTF-8", this.response.getHeaders().getFirst("Content-Type"));
 		assertResponseBody("abc");
 	}
 
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, this.response);
+	}
 
 	private ResolvableType responseEntity(Class<?> bodyType) {
 		return forClassWithGenerics(ResponseEntity.class, ResolvableType.forClass(bodyType));

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

@@ -31,10 +31,13 @@ import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebSession;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
+import org.springframework.web.server.session.MockWebSessionManager;
 import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 
 /**
  * Unit tests for {@link ServerWebExchangeArgumentResolver}.
@@ -51,13 +54,10 @@ public class ServerWebExchangeArgumentResolverTests {
 
 	@Before
 	public void setUp() throws Exception {
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
+		ServerHttpRequest request = MockServerHttpRequest.get("/path").build();
 		ServerHttpResponse response = new MockServerHttpResponse();
 
-		WebSession session = mock(WebSession.class);
-		WebSessionManager sessionManager = mock(WebSessionManager.class);
-		when(sessionManager.getSession(any())).thenReturn(Mono.just(session));
-
+		WebSessionManager sessionManager = new MockWebSessionManager(mock(WebSession.class));
 		this.exchange = new DefaultServerWebExchange(request, response, sessionManager);
 	}
 

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

@@ -30,7 +30,6 @@ import org.springframework.core.GenericTypeResolver;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.annotation.SynthesizingMethodParameter;
 import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -45,8 +44,14 @@ import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.session.MockWebSessionManager;
 import org.springframework.web.server.session.WebSessionManager;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * Unit tests for {@link SessionAttributeMethodArgumentResolver}.
@@ -71,10 +76,9 @@ public class SessionAttributeMethodArgumentResolverTests {
 		this.resolver = new SessionAttributeMethodArgumentResolver(context.getBeanFactory());
 
 		this.session = mock(WebSession.class);
-		when(this.session.getAttribute(any())).thenReturn(Optional.empty());
-
-		ServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/");
 		WebSessionManager sessionManager = new MockWebSessionManager(this.session);
+
+		ServerHttpRequest request = MockServerHttpRequest.get("/").build();
 		this.exchange = new DefaultServerWebExchange(request, new MockServerHttpResponse(), sessionManager);
 
 		this.handleMethod = ReflectionUtils.findMethod(getClass(), "handleWithSessionAttribute", (Class<?>[]) null);

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/HttpMessageWriterViewTests.java

@@ -30,7 +30,6 @@ import reactor.test.StepVerifier;
 
 import org.springframework.core.codec.CharSequenceEncoder;
 import org.springframework.core.io.buffer.support.DataBufferTestUtils;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.codec.json.Jackson2JsonEncoder;
 import org.springframework.http.codec.xml.Jaxb2XmlEncoder;
@@ -147,12 +146,12 @@ public class HttpMessageWriterViewTests {
 		this.model.addAttribute("pojoData", pojoData);
 		this.view.setModelKeys(Collections.singleton("pojoData"));
 
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
+		MockServerHttpRequest request = MockServerHttpRequest.get("/path").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
 		WebSessionManager manager = new DefaultWebSessionManager();
 		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, manager);
 
-		this.view.render(this.model, MediaType.APPLICATION_JSON, exchange);
+		this.view.render(this.model, MediaType.APPLICATION_JSON, exchange).blockMillis(5000);
 
 		StepVerifier.create(response.getBody())
 				.consumeNextWith( buf -> assertEquals("{\"foo\":\"f\",\"bar\":\"b\"}",

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/RedirectViewTests.java

@@ -21,7 +21,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -30,10 +30,11 @@ import org.springframework.http.MediaType;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.reactive.HandlerMapping;
-import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests for redirect view, and query string construction.
@@ -47,18 +48,14 @@ public class RedirectViewTests {
 
 	private MockServerHttpResponse response;
 
-	private ServerWebExchange exchange;
-
 
 	@Before
 	public void setUp() {
-		request = new MockServerHttpRequest();
-		request.setContextPath("/context");
-		response = new MockServerHttpResponse();
-		WebSessionManager sessionManager = new DefaultWebSessionManager();
-		exchange = new DefaultServerWebExchange(request, response, sessionManager);
+		this.request = MockServerHttpRequest.get("/").contextPath("/context").build();
+		this.response = new MockServerHttpResponse();
 	}
 
+
 	@Test(expected = IllegalArgumentException.class)
 	public void noUrlSet() throws Exception {
 		RedirectView rv = new RedirectView(null);
@@ -69,34 +66,34 @@ public class RedirectViewTests {
 	public void defaultStatusCode() {
 		String url = "http://url.somewhere.com";
 		RedirectView view = new RedirectView(url);
-		view.render(new HashMap<>(), MediaType.TEXT_HTML, exchange);
-		assertEquals(HttpStatus.SEE_OTHER, response.getStatusCode());
-		assertEquals(URI.create(url), response.getHeaders().getLocation());
+		view.render(new HashMap<>(), MediaType.TEXT_HTML, createExchange());
+		assertEquals(HttpStatus.SEE_OTHER, this.response.getStatusCode());
+		assertEquals(URI.create(url), this.response.getHeaders().getLocation());
 	}
 
 	@Test
 	public void customStatusCode() {
 		String url = "http://url.somewhere.com";
 		RedirectView view = new RedirectView(url, HttpStatus.FOUND);
-		view.render(new HashMap<>(), MediaType.TEXT_HTML, exchange);
-		assertEquals(HttpStatus.FOUND, response.getStatusCode());
-		assertEquals(URI.create(url), response.getHeaders().getLocation());
+		view.render(new HashMap<>(), MediaType.TEXT_HTML, createExchange());
+		assertEquals(HttpStatus.FOUND, this.response.getStatusCode());
+		assertEquals(URI.create(url), this.response.getHeaders().getLocation());
 	}
 
 	@Test
 	public void contextRelative() {
 		String url = "/test.html";
 		RedirectView view = new RedirectView(url);
-		view.render(new HashMap<>(), MediaType.TEXT_HTML, exchange);
-		assertEquals(URI.create("/context/test.html"), response.getHeaders().getLocation());
+		view.render(new HashMap<>(), MediaType.TEXT_HTML, createExchange());
+		assertEquals(URI.create("/context/test.html"), this.response.getHeaders().getLocation());
 	}
 
 	@Test
 	public void contextRelativeQueryParam() {
 		String url = "/test.html?id=1";
 		RedirectView view = new RedirectView(url);
-		view.render(new HashMap<>(), MediaType.TEXT_HTML, exchange);
-		assertEquals(URI.create("/context/test.html?id=1"), response.getHeaders().getLocation());
+		view.render(new HashMap<>(), MediaType.TEXT_HTML, createExchange());
+		assertEquals(URI.create("/context/test.html?id=1"), this.response.getHeaders().getLocation());
 	}
 
 	@Test
@@ -119,28 +116,35 @@ public class RedirectViewTests {
 		String url = "http://url.somewhere.com?foo={foo}";
 		Map<String, String> model = Collections.singletonMap("foo", "bar");
 		RedirectView view = new RedirectView(url);
-		view.render(model, MediaType.TEXT_HTML, exchange);
-		assertEquals(URI.create("http://url.somewhere.com?foo=bar"), response.getHeaders().getLocation());
+		view.render(model, MediaType.TEXT_HTML, createExchange());
+		assertEquals(URI.create("http://url.somewhere.com?foo=bar"), this.response.getHeaders().getLocation());
 	}
 
 	@Test
 	public void expandUriTemplateVariablesFromExchangeAttribute() {
 		String url = "http://url.somewhere.com?foo={foo}";
 		Map<String, String> attributes = Collections.singletonMap("foo", "bar");
+		DefaultServerWebExchange exchange = createExchange();
 		exchange.getAttributes().put(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE, attributes);
 		RedirectView view = new RedirectView(url);
 		view.render(new HashMap<>(), MediaType.TEXT_HTML, exchange);
-		assertEquals(URI.create("http://url.somewhere.com?foo=bar"), response.getHeaders().getLocation());
+		assertEquals(URI.create("http://url.somewhere.com?foo=bar"), this.response.getHeaders().getLocation());
 	}
 
 	@Test
 	public void propagateQueryParams() throws Exception {
 		RedirectView view = new RedirectView("http://url.somewhere.com?foo=bar#bazz");
 		view.setPropagateQuery(true);
-		request.setUri(URI.create("http://url.somewhere.com?a=b&c=d"));
-		view.render(new HashMap<>(), MediaType.TEXT_HTML, exchange);
-		assertEquals(HttpStatus.SEE_OTHER, response.getStatusCode());
-		assertEquals(URI.create("http://url.somewhere.com?foo=bar&a=b&c=d#bazz"), response.getHeaders().getLocation());
+		this.request = MockServerHttpRequest.get("http://url.somewhere.com?a=b&c=d").build();
+		view.render(new HashMap<>(), MediaType.TEXT_HTML, createExchange());
+		assertEquals(HttpStatus.SEE_OTHER, this.response.getStatusCode());
+		assertEquals(URI.create("http://url.somewhere.com?foo=bar&a=b&c=d#bazz"),
+				this.response.getHeaders().getLocation());
+	}
+
+	@NotNull
+	private DefaultServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, this.response);
 	}
 
 }

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/RequestContextTests.java

@@ -27,7 +27,6 @@ import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 
@@ -39,8 +38,6 @@ public class RequestContextTests {
 
 	private ServerWebExchange exchange;
 
-	private MockServerHttpRequest request;
-
 	private GenericApplicationContext applicationContext;
 
 	private Map<String, Object> model = new HashMap<>();
@@ -48,24 +45,21 @@ public class RequestContextTests {
 
 	@Before
 	public void init() {
-		this.request = new MockServerHttpRequest();
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").contextPath("foo/").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
-		DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(this.request, response, sessionManager);
+		this.exchange = new DefaultServerWebExchange(request, response);
 		this.applicationContext = new GenericApplicationContext();
 		this.applicationContext.refresh();
 	}
 
 	@Test
 	public void testGetContextUrl() throws Exception {
-		this.request.setContextPath("foo/");
 		RequestContext context = new RequestContext(this.exchange, this.model, this.applicationContext);
 		assertEquals("foo/bar", context.getContextUrl("bar"));
 	}
 
 	@Test
 	public void testGetContextUrlWithMap() throws Exception {
-		this.request.setContextPath("foo/");
 		RequestContext context = new RequestContext(this.exchange, this.model, this.applicationContext);
 		Map<String, Object> map = new HashMap<>();
 		map.put("foo", "bar");
@@ -75,7 +69,6 @@ public class RequestContextTests {
 
 	@Test
 	public void testGetContextUrlWithMapEscaping() throws Exception {
-		this.request.setContextPath("foo/");
 		RequestContext context = new RequestContext(this.exchange, this.model, this.applicationContext);
 		Map<String, Object> map = new HashMap<>();
 		map.put("foo", "bar baz");

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/ViewResolutionResultHandlerTests.java

@@ -41,7 +41,6 @@ import org.springframework.core.Ordered;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.reactive.ServerHttpResponse;
@@ -59,15 +58,14 @@ import org.springframework.web.reactive.result.ResolvableMethod;
 import org.springframework.web.server.NotAcceptableStatusException;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
-import static java.nio.charset.StandardCharsets.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-import static org.springframework.core.ResolvableType.*;
-import static org.springframework.core.io.buffer.support.DataBufferTestUtils.*;
-import static org.springframework.http.MediaType.*;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.springframework.core.ResolvableType.forClass;
+import static org.springframework.core.ResolvableType.forClassWithGenerics;
+import static org.springframework.core.io.buffer.support.DataBufferTestUtils.dumpString;
+import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 /**
  * Unit tests for {@link ViewResolutionResultHandler}.
@@ -75,19 +73,14 @@ import static org.springframework.http.MediaType.*;
  */
 public class ViewResolutionResultHandlerTests {
 
-	private final MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
-
-	private final MockServerHttpResponse response = new MockServerHttpResponse();
-
-	private ServerWebExchange exchange;
+	private MockServerHttpRequest request;
 
 	private final BindingContext bindingContext = new BindingContext();
 
 
 	@Before
 	public void setUp() throws Exception {
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(this.request, this.response, manager);
+		this.request = MockServerHttpRequest.get("/path").build();
 	}
 
 
@@ -138,23 +131,23 @@ public class ViewResolutionResultHandlerTests {
 
 		returnType = forClass(View.class);
 		returnValue = new TestView("account");
-		testHandle("/path", returnType, returnValue, "account: {id=123}");
-		assertEquals(HttpStatus.NO_CONTENT, this.exchange.getResponse().getStatusCode());
+		ServerWebExchange exchange = testHandle("/path", returnType, returnValue, "account: {id=123}");
+		assertEquals(HttpStatus.NO_CONTENT, exchange.getResponse().getStatusCode());
 
 		returnType = forClassWithGenerics(Mono.class, View.class);
 		returnValue = Mono.just(new TestView("account"));
-		testHandle("/path", returnType, returnValue, "account: {id=123}");
-		assertEquals(HttpStatus.SEE_OTHER, this.exchange.getResponse().getStatusCode());
+		exchange = testHandle("/path", returnType, returnValue, "account: {id=123}");
+		assertEquals(HttpStatus.SEE_OTHER, exchange.getResponse().getStatusCode());
 
 		returnType = forClass(String.class);
 		returnValue = "account";
-		testHandle("/path", returnType, returnValue, "account: {id=123}", resolver);
-		assertEquals(HttpStatus.CREATED, this.exchange.getResponse().getStatusCode());
+		exchange = testHandle("/path", returnType, returnValue, "account: {id=123}", resolver);
+		assertEquals(HttpStatus.CREATED, exchange.getResponse().getStatusCode());
 
 		returnType = forClassWithGenerics(Mono.class, String.class);
 		returnValue = Mono.just("account");
-		testHandle("/path", returnType, returnValue, "account: {id=123}", resolver);
-		assertEquals(HttpStatus.PARTIAL_CONTENT, this.exchange.getResponse().getStatusCode());
+		exchange = testHandle("/path", returnType, returnValue, "account: {id=123}", resolver);
+		assertEquals(HttpStatus.PARTIAL_CONTENT, exchange.getResponse().getStatusCode());
 
 		returnType = forClass(Model.class);
 		returnValue = new ConcurrentModel().addAttribute("name", "Joe");
@@ -200,17 +193,20 @@ public class ViewResolutionResultHandlerTests {
 		HandlerResult result = new HandlerResult(new Object(), returnValue, returnType(type), this.bindingContext);
 		ViewResolutionResultHandler handler = resultHandler(new TestViewResolver("account"));
 
-		this.request.setUri("/account");
-		handler.handleResult(this.exchange, result).blockMillis(5000);
-		assertResponseBody("account: {id=123}");
+		this.request = MockServerHttpRequest.get("/account").build();
+		ServerWebExchange exchange = createExchange();
+		handler.handleResult(exchange, result).blockMillis(5000);
+		assertResponseBody(exchange, "account: {id=123}");
 
-		this.request.setUri("/account/");
-		handler.handleResult(this.exchange, result).blockMillis(5000);
-		assertResponseBody("account: {id=123}");
+		this.request = MockServerHttpRequest.get("/account/").build();
+		exchange = createExchange();
+		handler.handleResult(exchange, result).blockMillis(5000);
+		assertResponseBody(exchange, "account: {id=123}");
 
-		this.request.setUri("/account.123");
-		handler.handleResult(this.exchange, result).blockMillis(5000);
-		assertResponseBody("account: {id=123}");
+		this.request = MockServerHttpRequest.get("/account.123").build();
+		exchange = createExchange();
+		handler.handleResult(exchange, result).blockMillis(5000);
+		assertResponseBody(exchange, "account: {id=123}");
 	}
 
 	@Test
@@ -219,8 +215,9 @@ public class ViewResolutionResultHandlerTests {
 		MethodParameter returnType = returnType(forClass(String.class));
 		HandlerResult result = new HandlerResult(new Object(), returnValue, returnType, this.bindingContext);
 
-		this.request.setUri("/path");
-		Mono<Void> mono = resultHandler().handleResult(this.exchange, result);
+		this.request = MockServerHttpRequest.get("/path").build();
+		ServerWebExchange exchange = createExchange();
+		Mono<Void> mono = resultHandler().handleResult(exchange, result);
 
 		StepVerifier.create(mono)
 				.expectNextCount(0)
@@ -234,17 +231,17 @@ public class ViewResolutionResultHandlerTests {
 		MethodParameter returnType = returnType(forClass(TestBean.class));
 		HandlerResult handlerResult = new HandlerResult(new Object(), value, returnType, this.bindingContext);
 
-		this.request.setHeader("Accept", "application/json");
-		this.request.setUri("/account");
+		this.request = MockServerHttpRequest.get("/account").accept(APPLICATION_JSON).build();
+		ServerWebExchange exchange = createExchange();
 
 		TestView defaultView = new TestView("jsonView", APPLICATION_JSON);
 
 		resultHandler(Collections.singletonList(defaultView), new TestViewResolver("account"))
-				.handleResult(this.exchange, handlerResult)
+				.handleResult(exchange, handlerResult)
 				.block(Duration.ofSeconds(5));
 
-		assertEquals(APPLICATION_JSON, this.response.getHeaders().getContentType());
-		assertResponseBody("jsonView: {" +
+		assertEquals(APPLICATION_JSON, exchange.getResponse().getHeaders().getContentType());
+		assertResponseBody(exchange, "jsonView: {" +
 				"org.springframework.validation.BindingResult.testBean=" +
 				"org.springframework.validation.BeanPropertyBindingResult: 0 errors, " +
 				"testBean=TestBean[name=Joe]" +
@@ -257,11 +254,11 @@ public class ViewResolutionResultHandlerTests {
 		MethodParameter returnType = returnType(forClass(TestBean.class));
 		HandlerResult handlerResult = new HandlerResult(new Object(), value, returnType, this.bindingContext);
 
-		this.request.setHeader("Accept", "application/json");
-		this.request.setUri("/account");
+		this.request = MockServerHttpRequest.get("/account").accept(APPLICATION_JSON).build();
+		ServerWebExchange exchange = createExchange();
 
 		ViewResolutionResultHandler resultHandler = resultHandler(new TestViewResolver("account"));
-		Mono<Void> mono = resultHandler.handleResult(this.exchange, handlerResult);
+		Mono<Void> mono = resultHandler.handleResult(exchange, handlerResult);
 		StepVerifier.create(mono)
 				.expectNextCount(0)
 				.expectError(NotAcceptableStatusException.class)
@@ -281,9 +278,11 @@ public class ViewResolutionResultHandlerTests {
 		HandlerResult result = new HandlerResult(new Object(), null, returnType(type), this.bindingContext);
 		ViewResolutionResultHandler handler = resultHandler(new TestViewResolver("account"));
 
-		this.request.setUri("/account");
-		handler.handleResult(this.exchange, result).blockMillis(5000);
-		assertResponseBody("account: {" +
+		this.request = MockServerHttpRequest.get("/account").build();
+		ServerWebExchange exchange = createExchange();
+
+		handler.handleResult(exchange, result).blockMillis(5000);
+		assertResponseBody(exchange, "account: {" +
 				"attr1=TestBean[name=Bean1], " +
 				"attr2=[TestBean[name=Bean1], TestBean[name=Bean2]], " +
 				"attr3=TestBean[name=Bean2], " +
@@ -295,6 +294,9 @@ public class ViewResolutionResultHandlerTests {
 				"}");
 	}
 
+	private ServerWebExchange createExchange() {
+		return new DefaultServerWebExchange(this.request, new MockServerHttpResponse());
+	}
 
 	private MethodParameter returnType(ResolvableType type) {
 		return resolvableMethod().returning(type).resolveReturnType();
@@ -316,13 +318,13 @@ public class ViewResolutionResultHandlerTests {
 		return ResolvableMethod.onClass(TestController.class);
 	}
 
-	private void testHandle(String path, ResolvableType returnType, Object returnValue,
+	private ServerWebExchange testHandle(String path, ResolvableType returnType, Object returnValue,
 			String responseBody, ViewResolver... resolvers) throws URISyntaxException {
 
-		testHandle(path, resolvableMethod().returning(returnType), returnValue, responseBody, resolvers);
+		return testHandle(path, resolvableMethod().returning(returnType), returnValue, responseBody, resolvers);
 	}
 
-	private void testHandle(String path, ResolvableMethod resolvableMethod, Object returnValue,
+	private ServerWebExchange testHandle(String path, ResolvableMethod resolvableMethod, Object returnValue,
 			String responseBody, ViewResolver... resolvers) throws URISyntaxException {
 
 		Model model = this.bindingContext.getModel();
@@ -330,13 +332,16 @@ public class ViewResolutionResultHandlerTests {
 		model.addAttribute("id", "123");
 		MethodParameter returnType = resolvableMethod.resolveReturnType();
 		HandlerResult result = new HandlerResult(new Object(), returnValue, returnType, this.bindingContext);
-		this.request.setUri(path);
-		resultHandler(resolvers).handleResult(this.exchange, result).block(Duration.ofSeconds(5));
-		assertResponseBody(responseBody);
+		this.request = MockServerHttpRequest.get(path).build();
+		ServerWebExchange exchange = createExchange();
+		resultHandler(resolvers).handleResult(exchange, result).block(Duration.ofSeconds(5));
+		assertResponseBody(exchange, responseBody);
+		return exchange;
 	}
 
-	private void assertResponseBody(String responseBody) {
-		StepVerifier.create(this.response.getBody())
+	private void assertResponseBody(ServerWebExchange exchange, String responseBody) {
+		MockServerHttpResponse response = (MockServerHttpResponse) exchange.getResponse();
+		StepVerifier.create(response.getBody())
 				.consumeNextWith(buf -> assertEquals(responseBody, dumpString(buf, UTF_8)))
 				.expectComplete()
 				.verify();

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/freemarker/FreeMarkerViewTests.java

@@ -30,15 +30,12 @@ import reactor.test.StepVerifier;
 import org.springframework.context.ApplicationContextException;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
 import org.springframework.ui.ExtendedModelMap;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
-import org.springframework.web.server.session.DefaultWebSessionManager;
-import org.springframework.web.server.session.WebSessionManager;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -48,7 +45,7 @@ import static org.junit.Assert.assertTrue;
  */
 public class FreeMarkerViewTests {
 
-	public static final String TEMPLATE_PATH = "classpath*:org/springframework/web/reactive/view/freemarker/";
+	private static final String TEMPLATE_PATH = "classpath*:org/springframework/web/reactive/view/freemarker/";
 
 
 	private ServerWebExchange exchange;
@@ -77,10 +74,9 @@ public class FreeMarkerViewTests {
 		FreeMarkerView fv = new FreeMarkerView();
 		fv.setApplicationContext(this.context);
 
-		MockServerHttpRequest request = new MockServerHttpRequest(HttpMethod.GET, "/path");
+		MockServerHttpRequest request = MockServerHttpRequest.get("/path").build();
 		this.response = new MockServerHttpResponse();
-		WebSessionManager manager = new DefaultWebSessionManager();
-		this.exchange = new DefaultServerWebExchange(request, response, manager);
+		this.exchange = new DefaultServerWebExchange(request, this.response);
 	}
 
 
@@ -121,12 +117,10 @@ public class FreeMarkerViewTests {
 
 		ModelMap model = new ExtendedModelMap();
 		model.addAttribute("hello", "hi FreeMarker");
-		view.render(model, null, this.exchange);
+		view.render(model, null, this.exchange).blockMillis(5000);
 
 		StepVerifier.create(this.response.getBody())
-				.consumeNextWith(buf -> {
-					assertEquals("<html><body>hi FreeMarker</body></html>", asString(buf));
-				})
+				.consumeNextWith(buf -> assertEquals("<html><body>hi FreeMarker</body></html>", asString(buf)))
 				.expectComplete()
 				.verify();
 	}

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/JRubyScriptTemplateTests.java

@@ -19,7 +19,6 @@ package org.springframework.web.reactive.result.view.script;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -36,6 +35,8 @@ import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.session.DefaultWebSessionManager;
 import org.springframework.web.server.session.WebSessionManager;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Unit tests for ERB templates running on JRuby.
  *
@@ -63,7 +64,7 @@ public class JRubyScriptTemplateTests {
 
 	private MockServerHttpResponse renderViewWithModel(String viewUrl, Map<String, Object> model) throws Exception {
 		ScriptTemplateView view = createViewWithUrl(viewUrl);
-		MockServerHttpRequest request = new MockServerHttpRequest();
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
 		WebSessionManager manager = new DefaultWebSessionManager();
 		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, manager);

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/JythonScriptTemplateTests.java

@@ -62,7 +62,7 @@ public class JythonScriptTemplateTests {
 
 	private MockServerHttpResponse renderViewWithModel(String viewUrl, Map<String, Object> model) throws Exception {
 		ScriptTemplateView view = createViewWithUrl(viewUrl);
-		MockServerHttpRequest request = new MockServerHttpRequest();
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
 		WebSessionManager manager = new DefaultWebSessionManager();
 		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, manager);

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/KotlinScriptTemplateTests.java

@@ -64,7 +64,7 @@ public class KotlinScriptTemplateTests {
 
 	private MockServerHttpResponse renderViewWithModel(String viewUrl, Map<String, Object> model, Class<?> configuration) throws Exception {
 		ScriptTemplateView view = createViewWithUrl(viewUrl, configuration);
-		MockServerHttpRequest request = new MockServerHttpRequest();
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
 		WebSessionManager manager = new DefaultWebSessionManager();
 		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, manager);

spring-web-reactive/src/test/java/org/springframework/web/reactive/result/view/script/NashornScriptTemplateTests.java

@@ -70,7 +70,7 @@ public class NashornScriptTemplateTests {
 
 	private MockServerHttpResponse renderViewWithModel(String viewUrl, Map<String, Object> model, Class<?> configuration) throws Exception {
 		ScriptTemplateView view = createViewWithUrl(viewUrl, configuration);
-		MockServerHttpRequest request = new MockServerHttpRequest();
+		MockServerHttpRequest request = MockServerHttpRequest.get("/").build();
 		MockServerHttpResponse response = new MockServerHttpResponse();
 		WebSessionManager manager = new DefaultWebSessionManager();
 		ServerWebExchange exchange = new DefaultServerWebExchange(request, response, manager);

spring-web-reactive/src/test/kotlin/org/springframework/web/reactive/result/method/annotation/RequestParamMethodArgumentResolverKotlinTests.kt

@@ -5,17 +5,14 @@ import org.junit.Test
 import org.springframework.core.MethodParameter
 import org.springframework.core.annotation.SynthesizingMethodParameter
 import org.springframework.format.support.DefaultFormattingConversionService
-import org.springframework.http.HttpMethod
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse
 import org.springframework.util.ReflectionUtils
 import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.support.ConfigurableWebBindingInitializer
 import org.springframework.web.reactive.BindingContext
-import org.springframework.web.server.ServerWebExchange
 import org.springframework.web.server.ServerWebInputException
 import org.springframework.web.server.adapter.DefaultServerWebExchange
-import org.springframework.web.server.session.MockWebSessionManager
 import reactor.test.StepVerifier
 
 /**
@@ -26,7 +23,7 @@ import reactor.test.StepVerifier
 class RequestParamMethodArgumentResolverKotlinTests {
 
     lateinit var resolver: RequestParamMethodArgumentResolver
-    lateinit var exchange: ServerWebExchange
+    lateinit var request: MockServerHttpRequest
     lateinit var bindingContext: BindingContext
 
     lateinit var nullableParamRequired: MethodParameter
@@ -37,10 +34,8 @@ class RequestParamMethodArgumentResolverKotlinTests {
 
     @Before
     fun setup() {
-        resolver = RequestParamMethodArgumentResolver(null, true)
-        val request = MockServerHttpRequest(HttpMethod.GET, "/")
-        val sessionManager = MockWebSessionManager()
-        exchange = DefaultServerWebExchange(request, MockServerHttpResponse(), sessionManager)
+        this.resolver = RequestParamMethodArgumentResolver(null, true)
+        this.request = MockServerHttpRequest.get("/").build()
         val initializer = ConfigurableWebBindingInitializer()
         initializer.conversionService = DefaultFormattingConversionService()
         bindingContext = BindingContext(initializer)
@@ -56,56 +51,58 @@ class RequestParamMethodArgumentResolverKotlinTests {
 
     @Test
     fun resolveNullableRequiredWithParameter() {
-        exchange.request.queryParams.set("name", "123")
-        var result = resolver.resolveArgument(nullableParamRequired, bindingContext, exchange)
+        this.request = MockServerHttpRequest.get("/path?name=123").build()
+        var result = resolver.resolveArgument(nullableParamRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectNext("123").expectComplete().verify()
     }
 
     @Test
     fun resolveNullableRequiredWithoutParameter() {
-        var result = resolver.resolveArgument(nullableParamRequired, bindingContext, exchange)
+        var result = resolver.resolveArgument(nullableParamRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectComplete().verify()
     }
 
     @Test
     fun resolveNullableNotRequiredWithParameter() {
-        exchange.request.queryParams.set("name", "123")
-        var result = resolver.resolveArgument(nullableParamNotRequired, bindingContext, exchange)
+        this.request = MockServerHttpRequest.get("/path?name=123").build()
+        var result = resolver.resolveArgument(nullableParamNotRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectNext("123").expectComplete().verify()
     }
 
     @Test
     fun resolveNullableNotRequiredWithoutParameter() {
-        var result = resolver.resolveArgument(nullableParamNotRequired, bindingContext, exchange)
+        var result = resolver.resolveArgument(nullableParamNotRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectComplete().verify()
     }
 
     @Test
     fun resolveNonNullableRequiredWithParameter() {
-        exchange.request.queryParams.set("name", "123")
-        var result = resolver.resolveArgument(nonNullableParamRequired, bindingContext, exchange)
+        this.request = MockServerHttpRequest.get("/path?name=123").build()
+        var result = resolver.resolveArgument(nonNullableParamRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectNext("123").expectComplete().verify()
     }
 
     @Test
     fun resolveNonNullableRequiredWithoutParameter() {
-        var result = resolver.resolveArgument(nonNullableParamRequired, bindingContext, exchange)
+        var result = resolver.resolveArgument(nonNullableParamRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectError(ServerWebInputException::class.java).verify()
     }
 
     @Test
     fun resolveNonNullableNotRequiredWithParameter() {
-        exchange.request.queryParams.set("name", "123")
-        var result = resolver.resolveArgument(nonNullableParamNotRequired, bindingContext, exchange)
+        this.request = MockServerHttpRequest.get("/path?name=123").build()
+        var result = resolver.resolveArgument(nonNullableParamNotRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectNext("123").expectComplete().verify()
     }
 
     @Test
     fun resolveNonNullableNotRequiredWithoutParameter() {
-        var result = resolver.resolveArgument(nonNullableParamNotRequired, bindingContext, exchange)
+        var result = resolver.resolveArgument(nonNullableParamNotRequired, bindingContext, createExchange())
         StepVerifier.create(result).expectComplete().verify()
     }
 
+    private fun createExchange() = DefaultServerWebExchange(this.request, MockServerHttpResponse())
+
 
     @Suppress("unused_parameter")
     fun handle(