Use entrySet iterator in getBodyFromServletRequestParameters

Closes gh-27081

Author: jhoeller

spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 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.
@@ -244,9 +244,10 @@ private static InputStream getBodyFromServletRequestParameters(HttpServletReques
 		Writer writer = new OutputStreamWriter(bos, FORM_CHARSET);
 
 		Map<String, String[]> form = request.getParameterMap();
-		for (Iterator<String> nameIterator = form.keySet().iterator(); nameIterator.hasNext();) {
-			String name = nameIterator.next();
-			List<String> values = Arrays.asList(form.get(name));
+		for (Iterator<Map.Entry<String, String[]>> entryIterator = form.entrySet().iterator(); entryIterator.hasNext();) {
+			Map.Entry<String, String[]> entry = entryIterator.next();
+			String name = entry.getKey();
+			List<String> values = Arrays.asList(entry.getValue());
 			for (Iterator<String> valueIterator = values.iterator(); valueIterator.hasNext();) {
 				String value = valueIterator.next();
 				writer.write(URLEncoder.encode(name, FORM_CHARSET.name()));
@@ -258,7 +259,7 @@ private static InputStream getBodyFromServletRequestParameters(HttpServletReques
 					}
 				}
 			}
-			if (nameIterator.hasNext()) {
+			if (entryIterator.hasNext()) {
 				writer.append('&');
 			}
 		}

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

@@ -175,4 +175,14 @@ void getFormBody() throws IOException {
 		assertThat(result).as("Invalid content returned").isEqualTo(content);
 	}
 
+	@Test
+	void getEmptyFormBody() throws IOException {
+		mockRequest.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
+		mockRequest.setMethod("POST");
+
+		byte[] result = FileCopyUtils.copyToByteArray(request.getBody());
+		byte[] content = "".getBytes(StandardCharsets.UTF_8);
+		assertThat(result).as("Invalid content returned").isEqualTo(content);
+	}
+
 }