Polishing

(cherry picked from commit 77ab88b)

Author: jhoeller

spring-web/src/test/java/org/springframework/http/server/reactive/AbstractHttpHandlerIntegrationTests.java

@@ -88,7 +88,7 @@ public void tearDown() throws Exception {
 	 * set the number of buffered to an arbitrary number greater than N.
 	 * </ul>
 	 */
-	public static Flux<Long> interval(Duration period, int count) {
+	public static Flux<Long> testInterval(Duration period, int count) {
 		return Flux.interval(period).take(count).onBackpressureBuffer(count);
 	}
 

spring-web/src/test/java/org/springframework/http/server/reactive/CookieIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.http.server.reactive;
 
 import java.net.URI;
@@ -27,27 +28,25 @@
 
 import org.springframework.http.HttpCookie;
 import org.springframework.http.RequestEntity;
-import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseCookie;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.equalToIgnoringCase;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 /**
  * @author Rossen Stoyanchev
  */
 @RunWith(Parameterized.class)
 public class CookieIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
-	private CookieHandler cookieHandler;
+	private final CookieHandler cookieHandler = new CookieHandler();
+
 
 	@Override
 	protected HttpHandler createHttpHandler() {
-		this.cookieHandler = new CookieHandler();
 		return this.cookieHandler;
 	}
 

spring-web/src/test/java/org/springframework/http/server/reactive/EchoHandlerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,14 +26,16 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
-import static org.junit.Assert.assertArrayEquals;
-
+import static org.junit.Assert.*;
 
+/**
+ * @author Arjen Poutsma
+ */
 public class EchoHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
 	private static final int REQUEST_SIZE = 4096 * 3;
 
-	private Random rnd = new Random();
+	private final Random rnd = new Random();
 
 
 	@Override

spring-web/src/test/java/org/springframework/http/server/reactive/ErrorHandlerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,21 +28,23 @@
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeFalse;
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 
 /**
  * @author Arjen Poutsma
  */
 public class ErrorHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
-	private ErrorHandler handler = new ErrorHandler();
+	private final ErrorHandler handler = new ErrorHandler();
+
 
 	@Override
 	protected HttpHandler createHttpHandler() {
 		return handler;
 	}
 
+
 	@Test
 	public void responseBodyError() throws Exception {
 		// TODO: fix Reactor
@@ -83,6 +85,7 @@ public void emptyPathSegments() throws Exception {
 		assertEquals(HttpStatus.OK, response.getStatusCode());
 	}
 
+
 	private static class ErrorHandler implements HttpHandler {
 
 		@Override
@@ -101,6 +104,7 @@ else if (path.endsWith("handling-error")) {
 		}
 	}
 
+
 	private static final ResponseErrorHandler NO_OP_ERROR_HANDLER = new ResponseErrorHandler() {
 
 		@Override

spring-web/src/test/java/org/springframework/http/server/reactive/RandomHandlerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,9 @@
 
 import static org.junit.Assert.*;
 
+/**
+ * @author Arjen Poutsma
+ */
 public class RandomHandlerIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
 	public static final int REQUEST_SIZE = 4096 * 3;

spring-web/src/test/java/org/springframework/http/server/reactive/ServerHttpRequestIntegrationTests.java

@@ -28,6 +28,9 @@
 
 import static org.junit.Assert.*;
 
+/**
+ * @author Sebastien Deleuze
+ */
 public class ServerHttpRequestIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
 	@Override
@@ -58,4 +61,5 @@ public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response)
 			return Mono.empty();
 		}
 	}
+
 }

spring-web/src/test/java/org/springframework/http/server/reactive/WriteOnlyHandlerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,19 +21,16 @@
 import java.util.Random;
 
 import org.junit.Test;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
-import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.client.RestTemplate;
 
 import static org.junit.Assert.*;
 
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
 /**
  * @author Violeta Georgieva
  * @since 5.0
@@ -52,7 +49,6 @@ protected WriteOnlyHandler createHttpHandler() {
 		return new WriteOnlyHandler();
 	}
 
-
 	@Test
 	public void writeOnly() throws Exception {
 		RestTemplate restTemplate = new RestTemplate();
@@ -66,7 +62,6 @@ public void writeOnly() throws Exception {
 		assertArrayEquals(body, response.getBody());
 	}
 
-
 	private byte[] randomBytes() {
 		byte[] buffer = new byte[REQUEST_SIZE];
 		rnd.nextBytes(buffer);
@@ -83,4 +78,5 @@ public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response)
 			return response.writeAndFlushWith(Flux.just(Flux.just(buffer)));
 		}
 	}
+
 }

spring-web/src/test/java/org/springframework/http/server/reactive/ZeroCopyIntegrationTests.java

@@ -32,9 +32,8 @@
 import org.springframework.http.server.reactive.bootstrap.UndertowHttpServer;
 import org.springframework.web.client.RestTemplate;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.*;
+import static org.junit.Assume.*;
 
 /**
  * @author Arjen Poutsma
@@ -43,14 +42,15 @@ public class ZeroCopyIntegrationTests extends AbstractHttpHandlerIntegrationTest
 
 	private final ZeroCopyHandler handler = new ZeroCopyHandler();
 
+
 	@Override
 	protected HttpHandler createHttpHandler() {
-		return handler;
+		return this.handler;
 	}
 
+
 	@Test
 	public void zeroCopy() throws Exception {
-
 		// Zero-copy only does not support servlet
 		assumeTrue(server instanceof ReactorHttpServer || server instanceof UndertowHttpServer);
 
@@ -64,9 +64,9 @@ public void zeroCopy() throws Exception {
 		assertEquals(logo.contentLength(), response.getHeaders().getContentLength());
 		assertEquals(logo.contentLength(), response.getBody().length);
 		assertEquals(MediaType.IMAGE_PNG, response.getHeaders().getContentType());
-
 	}
 
+
 	private static class ZeroCopyHandler implements HttpHandler {
 
 		@Override
@@ -85,4 +85,4 @@ public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response)
 		}
 	}
 
-}
+}

spring-web/src/test/java/org/springframework/web/server/session/WebSessionIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,31 +38,22 @@
 import org.springframework.web.server.WebSession;
 import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 /**
  * Integration tests for with a server-side session.
+ *
  * @author Rossen Stoyanchev
  */
 public class WebSessionIntegrationTests extends AbstractHttpHandlerIntegrationTests {
 
-	private RestTemplate restTemplate;
+	private final RestTemplate restTemplate = new RestTemplate();
 
 	private DefaultWebSessionManager sessionManager;
 
 	private TestWebHandler handler;
 
 
-	@Override
-	public void setup() throws Exception {
-		super.setup();
-		this.restTemplate = new RestTemplate();
-	}
-
 	@Override
 	protected HttpHandler createHttpHandler() {
 		this.sessionManager = new DefaultWebSessionManager();

spring-webflux/src/test/java/org/springframework/web/reactive/FlushingIntegrationTests.java

@@ -123,7 +123,7 @@ private static class FlushingHandler implements HttpHandler {
 		public Mono<Void> handle(ServerHttpRequest request, ServerHttpResponse response) {
 			String path = request.getURI().getPath();
 			if (path.endsWith("write-and-flush")) {
-				Flux<Publisher<DataBuffer>> responseBody = interval(Duration.ofMillis(50), 2)
+				Flux<Publisher<DataBuffer>> responseBody = testInterval(Duration.ofMillis(50), 2)
 						.map(l -> toDataBuffer("data" + l + "\n", response.bufferFactory()))
 						.map(Flux::just);
 				return response.writeAndFlushWith(responseBody.concatWith(Flux.never()));