Polishing

spring-web/src/main/java/org/springframework/web/filter/HttpPutFormContentFilter.java

@@ -61,6 +61,7 @@ public class HttpPutFormContentFilter extends OncePerRequestFilter {
 
 	private final FormHttpMessageConverter formConverter = new AllEncompassingFormHttpMessageConverter();
 
+
 	/**
 	 * The default character set to use for reading form data.
 	 */
@@ -68,6 +69,7 @@ public class HttpPutFormContentFilter extends OncePerRequestFilter {
 		this.formConverter.setCharset(charset);
 	}
 
+
 	@Override
 	protected void doFilterInternal(final HttpServletRequest request, HttpServletResponse response,
 			FilterChain filterChain) throws ServletException, IOException {
@@ -104,29 +106,30 @@ public class HttpPutFormContentFilter extends OncePerRequestFilter {
 		}
 	}
 
+
 	private static class HttpPutFormContentRequestWrapper extends HttpServletRequestWrapper {
 
 		private MultiValueMap<String, String> formParameters;
 
 		public HttpPutFormContentRequestWrapper(HttpServletRequest request, MultiValueMap<String, String> parameters) {
 			super(request);
-			this.formParameters = (parameters != null) ? parameters : new LinkedMultiValueMap<>();
+			this.formParameters = (parameters != null ? parameters : new LinkedMultiValueMap<>());
 		}
 
 		@Override
 		public String getParameter(String name) {
 			String queryStringValue = super.getParameter(name);
 			String formValue = this.formParameters.getFirst(name);
-			return (queryStringValue != null) ?  queryStringValue : formValue;
+			return (queryStringValue != null ? queryStringValue : formValue);
 		}
 
 		@Override
 		public Map<String, String[]> getParameterMap() {
 			Map<String, String[]> result = new LinkedHashMap<>();
-			Enumeration<String> names = this.getParameterNames();
+			Enumeration<String> names = getParameterNames();
 			while (names.hasMoreElements()) {
 				String name = names.nextElement();
-				result.put(name, this.getParameterValues(name));
+				result.put(name, getParameterValues(name));
 			}
 			return result;
 		}
@@ -150,7 +153,7 @@ public class HttpPutFormContentFilter extends OncePerRequestFilter {
 				return formValues.toArray(new String[formValues.size()]);
 			}
 			else {
-				List<String> result = new ArrayList<>();
+				List<String> result = new ArrayList<>(queryStringValues.length + formValues.size());
 				result.addAll(Arrays.asList(queryStringValues));
 				result.addAll(formValues);
 				return result.toArray(new String[result.size()]);

spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java

@@ -108,6 +108,7 @@ public class RequestPartServletServerHttpRequestTests {
 				return headers;
 			}
 		};
+
 		byte[] bytes = {(byte) 0xC4};
 		mockRequest.setParameter("part", new String(bytes, StandardCharsets.ISO_8859_1));
 		ServerHttpRequest request = new RequestPartServletServerHttpRequest(mockRequest, "part");
@@ -125,6 +126,7 @@ public class RequestPartServletServerHttpRequestTests {
 				return headers;
 			}
 		};
+
 		byte[] bytes = {(byte) 0xC4};
 		mockRequest.setParameter("part", new String(bytes, StandardCharsets.ISO_8859_1));
 		mockRequest.setCharacterEncoding("iso-8859-1");