Polishing

Author: sbrannen

spring-web/src/main/java/org/springframework/http/codec/multipart/DefaultPartHttpMessageReader.java

@@ -75,7 +75,6 @@ public class DefaultPartHttpMessageReader extends LoggingCodecSupport implements
 
 	/**
 	 * Configure the maximum amount of memory that is allowed per headers section of each part.
-	 * When the limit
 	 * @param byteCount the maximum amount of memory for headers
 	 */
 	public void setMaxHeadersSize(int byteCount) {
@@ -93,8 +92,8 @@ public int getMaxInMemorySize() {
 	 * Configure the maximum amount of memory allowed per part.
 	 * When the limit is exceeded:
 	 * <ul>
-	 * <li>file parts are written to a temporary file.
-	 * <li>non-file parts are rejected with {@link DataBufferLimitException}.
+	 * <li>File parts are written to a temporary file.
+	 * <li>Non-file parts are rejected with {@link DataBufferLimitException}.
 	 * </ul>
 	 * <p>By default this is set to 256K.
 	 * @param maxInMemorySize the in-memory limit in bytes; if set to -1 the entire
@@ -158,7 +157,7 @@ private Scheduler getBlockingOperationScheduler() {
 
 	/**
 	 * Set the character set used to decode headers.
-	 * Defaults to UTF-8 as per RFC 7578.
+	 * <p>Defaults to UTF-8 as per RFC 7578.
 	 * @param headersCharset the charset to use for decoding headers
 	 * @since 5.3.6
 	 * @see <a href="https://tools.ietf.org/html/rfc7578#section-5.1">RFC-7578 Section 5.1</a>
@@ -218,5 +217,4 @@ private boolean tooManyParts(AtomicInteger partCount) {
 		return this.maxParts > 0 && count > this.maxParts;
 	}
 
-
 }

spring-web/src/main/java/org/springframework/http/codec/multipart/PartGenerator.java

@@ -52,7 +52,8 @@
 
 /**
  * Subscribes to a token stream (i.e. the result of
- * {@link MultipartParser#parse(Flux, byte[], int, Charset)}), and produces a flux of {@link Part} objects.
+ * {@link MultipartParser#parse(Flux, byte[], int, Charset)}), and produces a flux
+ * of {@link Part} objects.
  *
  * @author Arjen Poutsma
  * @since 5.3
@@ -330,7 +331,6 @@ public void onComplete() {
 		public String toString() {
 			return "FORM-FIELD";
 		}
-
 	}
 
 
@@ -422,7 +422,6 @@ public void dispose() {
 		public String toString() {
 			return "IN-MEMORY";
 		}
-
 	}
 
 
@@ -487,7 +486,6 @@ private void fileCreated(WritingFileState newState) {
 			this.releaseOnDispose = false;
 
 			if (changeState(this, newState)) {
-
 				newState.writeBuffers(this.content);
 
 				if (this.completed) {
@@ -512,10 +510,9 @@ public void dispose() {
 		public String toString() {
 			return "CREATE-FILE";
 		}
-
-
 	}
 
+
 	private final class IdleFileState implements State {
 
 		private final HttpHeaders headers;
@@ -542,7 +539,6 @@ public IdleFileState(WritingFileState state) {
 		public void body(DataBuffer dataBuffer) {
 			long count = this.byteCount.addAndGet(dataBuffer.readableByteCount());
 			if (PartGenerator.this.maxDiskUsagePerPart == -1 || count <= PartGenerator.this.maxDiskUsagePerPart) {
-
 				this.closeOnDispose = false;
 				this.deleteOnDispose = false;
 				WritingFileState newState = new WritingFileState(this);
@@ -582,16 +578,14 @@ public void dispose() {
 			}
 		}
 
-
 		@Override
 		public String toString() {
 			return "IDLE-FILE";
 		}
-
 	}
 
-	private final class WritingFileState implements State {
 
+	private final class WritingFileState implements State {
 
 		private final HttpHeaders headers;
 
@@ -643,19 +637,15 @@ public void writeBuffer(DataBuffer dataBuffer) {
 			Mono.just(dataBuffer)
 					.flatMap(this::writeInternal)
 					.subscribeOn(PartGenerator.this.blockingOperationScheduler)
-					.subscribe(null,
-					PartGenerator.this::emitError,
-					this::writeComplete);
+					.subscribe(null, PartGenerator.this::emitError, this::writeComplete);
 		}
 
 		public void writeBuffers(Iterable<DataBuffer> dataBuffers) {
 			Flux.fromIterable(dataBuffers)
 					.concatMap(this::writeInternal)
 					.then()
 					.subscribeOn(PartGenerator.this.blockingOperationScheduler)
-					.subscribe(null,
-							PartGenerator.this::emitError,
-							this::writeComplete);
+					.subscribe(null, PartGenerator.this::emitError, this::writeComplete);
 		}
 
 		private void writeComplete() {
@@ -710,7 +700,6 @@ public void dispose() {
 			this.disposed = true;
 		}
 
-
 		@Override
 		public String toString() {
 			return "WRITE-FILE";
@@ -738,7 +727,6 @@ public void onComplete() {
 		public String toString() {
 			return "DISPOSED";
 		}
-
 	}
 
 }

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

@@ -441,7 +441,7 @@ void retrieveJsonArrayAsResponseEntityFluxWithBodyExtractor(ClientHttpConnector
 	}
 
 	@Test // gh-24788
-	void retrieveJsonArrayAsBodilessEntityShouldReleasesConnection() throws IOException {
+	void retrieveJsonArrayAsBodilessEntityShouldReleaseConnection() throws IOException {
 
 		// Constrain connection pool and make consecutive requests.
 		// 2nd request should hang if response was not drained.

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

@@ -94,7 +94,7 @@ void handlerMappingXmlConfig() {
 		testUrl("outofpattern*ye", null, handlerMapping, null);
 	}
 
-	void testUrl(String url, Object bean, HandlerMapping handlerMapping, String pathWithinMapping) {
+	private static void testUrl(String url, Object bean, HandlerMapping handlerMapping, String pathWithinMapping) {
 		MockServerHttpRequest request = MockServerHttpRequest.method(HttpMethod.GET, URI.create(url)).build();
 		ServerWebExchange exchange = MockServerWebExchange.from(request);
 		Object actual = handlerMapping.getHandler(exchange).block();
@@ -127,7 +127,8 @@ void uriTemplateVariables() {
 	@Configuration
 	static class WebConfig {
 
-		@Bean @SuppressWarnings("unused")
+		@Bean
+		@SuppressWarnings("unused")
 		public SimpleUrlHandlerMapping handlerMapping() {
 			SimpleUrlHandlerMapping hm = new SimpleUrlHandlerMapping();
 			hm.registerHandler("/welcome*", otherController());

spring-webmvc/src/test/java/org/springframework/web/servlet/function/DefaultServerRequestTests.java

@@ -409,7 +409,6 @@ void bindError() {
 		);
 	}
 
-
 	@ParameterizedHttpMethodTest
 	void checkNotModifiedTimestamp(String method) {
 		MockHttpServletRequest servletRequest = PathPatternsTestUtils.initRequest(method, "/", true);