Polish contribution

See gh-35603

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

@@ -188,14 +188,13 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 	}
 
 	/**
-	 * Configure a predicate for selecting which query params should be logged if
+	 * Configure a predicate for selecting which query parameters should be logged
-	 * {@link #setIncludeQueryString(boolean)} is set to {@code true}.
+	 * if {@link #setIncludeQueryString(boolean)} is set to {@code true}.
-	 * <p>By default this is not set in which case all query params are logged
+	 * <p>By default this is not set, in which case all query parameters are logged.
-	 *
+	 * <p>The predicate will be applied once per query parameter name. Thus, if
-	 * <p>If there are multiple values for the same query param,
+	 * there are multiple values for the same query parameter name, the logged query
-	 * the predicate will be applied once per query param name.
+	 * string will contain fewer {@code name=value} mappings than the one returned by
-	 * As a result, the use of this predicate may result in a different query string
+	 * {@link HttpServletRequest#getQueryString()}.
-	 * than the one returned by {@link HttpServletRequest#getQueryString()}.
 	 * @param queryParamPredicate the predicate to use
 	 * @since 7.0
 	 */
@@ -214,7 +213,7 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 	/**
 	 * Configure a predicate for selecting which headers should be logged if
 	 * {@link #setIncludeHeaders(boolean)} is set to {@code true}.
-	 * <p>By default this is not set in which case all headers are logged.
+	 * <p>By default this is not set, in which case all headers are logged.
 	 * @param headerPredicate the predicate to use
 	 * @since 5.2
 	 */
@@ -364,7 +363,6 @@ public abstract class AbstractRequestLoggingFilter extends OncePerRequestFilter
 					for (String name : queryParams.keySet()) {
 						if (!getQueryParamPredicate().test(name)) {
 							updatedQueryParams.set(name, "masked");
-							break;
 						}
 					}
 

spring-web/src/test/java/org/springframework/web/filter/RequestLoggingFilterTests.java

@@ -108,14 +108,14 @@ class RequestLoggingFilterTests {
 
 	@Test
 	void queryStringIncluded() throws Exception {
-		request.setQueryString("booking=42&code=73&category=hotel&code=37&category=resort");
+		request.setQueryString("booking=42&code=73&category=hotel&code=37&category=resort&ignore=enigma&code=99");
 		filter.setIncludeQueryString(true);
 		filter.setQueryParamPredicate(name -> !name.equals("code") && !name.equals("ignore"));
 
 		applyFilter();
 
-		assertThat(filter.beforeRequestMessage).contains("/hotels?booking=42&code=masked&category=hotel&category=resort");
+		assertThat(filter.beforeRequestMessage).contains("/hotels?booking=42&code=masked&category=hotel&category=resort&ignore=masked");
-		assertThat(filter.afterRequestMessage).contains("/hotels?booking=42&code=masked&category=hotel&category=resort");
+		assertThat(filter.afterRequestMessage).contains("/hotels?booking=42&code=masked&category=hotel&category=resort&ignore=masked");
 	}
 
 	@Test