Polishing

Author: jhoeller

spring-test/src/main/java/org/springframework/mock/http/server/reactive/MockServerHttpRequest.java

@@ -78,16 +78,16 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
 
 	private MockServerHttpRequest(@Nullable HttpMethod httpMethod, @Nullable String customHttpMethod,
 			URI uri, @Nullable String contextPath, HttpHeaders headers, MultiValueMap<String, HttpCookie> cookies,
-			@Nullable InetSocketAddress remoteAddress, @Nullable InetSocketAddress localAddress,
+			@Nullable InetSocketAddress localAddress, @Nullable InetSocketAddress remoteAddress,
 			@Nullable SslInfo sslInfo, Publisher<? extends DataBuffer> body) {
 
 		super(uri, contextPath, headers);
 		Assert.isTrue(httpMethod != null || customHttpMethod != null, "HTTP method must not be null");
 		this.httpMethod = httpMethod;
 		this.customHttpMethod = customHttpMethod;
 		this.cookies = cookies;
-		this.remoteAddress = remoteAddress;
 		this.localAddress = localAddress;
+		this.remoteAddress = remoteAddress;
 		this.sslInfo = sslInfo;
 		this.body = Flux.from(body);
 	}
@@ -382,9 +382,9 @@ public interface BaseBuilder<B extends BaseBuilder<B>> {
 		 * @see BodyBuilder#body(String)
 		 */
 		MockServerHttpRequest build();
-
 	}
 
+
 	/**
 	 * A builder that adds a body to the request.
 	 */
@@ -423,15 +423,13 @@ public interface BodyBuilder extends BaseBuilder<BodyBuilder> {
 		 * @return the built request entity
 		 */
 		MockServerHttpRequest body(String body);
-
 	}
 
 
 	private static class DefaultBodyBuilder implements BodyBuilder {
 
 		private static final DataBufferFactory BUFFER_FACTORY = new DefaultDataBufferFactory();
 
-
 		@Nullable
 		private final HttpMethod method;
 
@@ -612,7 +610,7 @@ private Charset getCharset() {
 		public MockServerHttpRequest body(Publisher<? extends DataBuffer> body) {
 			applyCookiesIfNecessary();
 			return new MockServerHttpRequest(this.method, this.customMethod, getUrlToUse(), this.contextPath,
-					this.headers, this.cookies, this.remoteAddress, this.localAddress, this.sslInfo, body);
+					this.headers, this.cookies, this.localAddress, this.remoteAddress, this.sslInfo, body);
 		}
 
 		private void applyCookiesIfNecessary() {
@@ -625,11 +623,9 @@ private void applyCookiesIfNecessary() {
 		private URI getUrlToUse() {
 			MultiValueMap<String, String> params =
 					this.queryParamsBuilder.buildAndExpand().encode().getQueryParams();
-
 			if (!params.isEmpty()) {
 				return UriComponentsBuilder.fromUri(this.url).queryParams(params).build(true).toUri();
 			}
-
 			return this.url;
 		}
 	}

spring-web/src/testFixtures/java/org/springframework/web/testfixture/http/server/reactive/MockServerHttpRequest.java

@@ -78,16 +78,16 @@ public final class MockServerHttpRequest extends AbstractServerHttpRequest {
 
 	private MockServerHttpRequest(@Nullable HttpMethod httpMethod, @Nullable String customHttpMethod,
 			URI uri, @Nullable String contextPath, HttpHeaders headers, MultiValueMap<String, HttpCookie> cookies,
-			@Nullable InetSocketAddress remoteAddress, @Nullable InetSocketAddress localAddress,
+			@Nullable InetSocketAddress localAddress, @Nullable InetSocketAddress remoteAddress,
 			@Nullable SslInfo sslInfo, Publisher<? extends DataBuffer> body) {
 
 		super(uri, contextPath, headers);
 		Assert.isTrue(httpMethod != null || customHttpMethod != null, "HTTP method must not be null");
 		this.httpMethod = httpMethod;
 		this.customHttpMethod = customHttpMethod;
 		this.cookies = cookies;
-		this.remoteAddress = remoteAddress;
 		this.localAddress = localAddress;
+		this.remoteAddress = remoteAddress;
 		this.sslInfo = sslInfo;
 		this.body = Flux.from(body);
 	}
@@ -382,9 +382,9 @@ public interface BaseBuilder<B extends BaseBuilder<B>> {
 		 * @see BodyBuilder#body(String)
 		 */
 		MockServerHttpRequest build();
-
 	}
 
+
 	/**
 	 * A builder that adds a body to the request.
 	 */
@@ -423,15 +423,13 @@ public interface BodyBuilder extends BaseBuilder<BodyBuilder> {
 		 * @return the built request entity
 		 */
 		MockServerHttpRequest body(String body);
-
 	}
 
 
 	private static class DefaultBodyBuilder implements BodyBuilder {
 
 		private static final DataBufferFactory BUFFER_FACTORY = new DefaultDataBufferFactory();
 
-
 		@Nullable
 		private final HttpMethod method;
 
@@ -612,7 +610,7 @@ private Charset getCharset() {
 		public MockServerHttpRequest body(Publisher<? extends DataBuffer> body) {
 			applyCookiesIfNecessary();
 			return new MockServerHttpRequest(this.method, this.customMethod, getUrlToUse(), this.contextPath,
-					this.headers, this.cookies, this.remoteAddress, this.localAddress, this.sslInfo, body);
+					this.headers, this.cookies, this.localAddress, this.remoteAddress, this.sslInfo, body);
 		}
 
 		private void applyCookiesIfNecessary() {
@@ -625,11 +623,9 @@ private void applyCookiesIfNecessary() {
 		private URI getUrlToUse() {
 			MultiValueMap<String, String> params =
 					this.queryParamsBuilder.buildAndExpand().encode().getQueryParams();
-
 			if (!params.isEmpty()) {
 				return UriComponentsBuilder.fromUri(this.url).queryParams(params).build(true).toUri();
 			}
-
 			return this.url;
 		}
 	}

spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java

@@ -273,6 +273,7 @@ public RequestMappingHandlerAdapter requestMappingHandlerAdapter(
 			ServerCodecConfigurer serverCodecConfigurer,
 			@Qualifier("webFluxConversionService") FormattingConversionService conversionService,
 			@Qualifier("webFluxValidator") Validator validator) {
+
 		RequestMappingHandlerAdapter adapter = createRequestMappingHandlerAdapter();
 		adapter.setMessageReaders(serverCodecConfigurer.getReaders());
 		adapter.setWebBindingInitializer(getConfigurableWebBindingInitializer(conversionService, validator));