From 3e3f046dc9ec8f12706b8af3229d2e4389a3e8ca Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 15 Feb 2023 12:57:44 +0100 Subject: [PATCH] Polishing --- .../client/match/MockRestRequestMatchers.java | 16 ++++++++-------- .../resource/EncodedResourceResolver.java | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java index 170116054410..012336edf274 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/match/MockRestRequestMatchers.java @@ -115,7 +115,7 @@ public static RequestMatcher requestTo(URI uri) { /** * Assert request query parameter values with the given Hamcrest matcher(s). - *

Note that if the queryParam value list is larger than the number of provided + *

Note that if the queryParam value list is larger than the number of provided * {@code matchers}, extra values are considered acceptable. * See {@link #queryParam(String, Matcher)} for a variant that takes a * {@code Matcher} over the whole list of values. @@ -134,7 +134,7 @@ public static RequestMatcher queryParam(String name, Matcher... /** * Assert request query parameter values. - *

Note that if the queryParam value list is larger than {@code expectedValues}, + *

Note that if the queryParam value list is larger than {@code expectedValues}, * extra values are considered acceptable. * See {@link #queryParam(String, Matcher)} for a variant that takes a * {@code Matcher} over the whole list of values. @@ -152,12 +152,12 @@ public static RequestMatcher queryParam(String name, String... expectedValues) { /** * Assert request query parameter, matching on the whole {@code List} of values. - *

This can be used to check that the list has at least one value matching a + *

This can be used to check that the list has at least one value matching a * criteria ({@link Matchers#hasItem(Matcher)}), or that every value in the list * matches a common criteria ({@link Matchers#everyItem(Matcher)}), or that each * value in the list matches its corresponding dedicated criteria * ({@link Matchers#contains(Matcher[])}, and more. - * @param name the name of the queryParam to consider + * @param name the name of the query parameter to consider * @param matcher the matcher to apply to the whole list of values for that header * @since 6.0.5 */ @@ -192,7 +192,7 @@ private static void assertValueCount( /** * Assert request header values with the given Hamcrest matcher(s). - *

Note that if the header's value list is larger than the number of provided + *

Note that if the header's value list is larger than the number of provided * {@code matchers}, extra values are considered acceptable. * See {@link #header(String, Matcher)} for a variant that takes a {@code Matcher} * over the whole list of values. @@ -212,7 +212,7 @@ public static RequestMatcher header(String name, Matcher... matc /** * Assert request header values. - *

Note that if the header's value list is larger than {@code expectedValues}, + *

Note that if the header's value list is larger than {@code expectedValues}, * extra values are considered acceptable. * See {@link #header(String, Matcher)} for a variant that takes a {@code Matcher} * over the whole list of values. @@ -231,12 +231,12 @@ public static RequestMatcher header(String name, String... expectedValues) { /** * Assert request header, matching on the whole {@code List} of values. - *

This can be used to check that the list has at least one value matching a + *

This can be used to check that the list has at least one value matching a * criteria ({@link Matchers#hasItem(Matcher)}), or that every value in the list * matches a common criteria ({@link Matchers#everyItem(Matcher)}), or that each * value in the list matches its corresponding dedicated criteria * ({@link Matchers#contains(Matcher[])}, and more. - * @param name the name of the header to consider + * @param name the name of the request header to consider * @param matcher the matcher to apply to the whole list of values for that header * @since 6.0.5 */ diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java index 25558e9905b8..22350eebd6d9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/EncodedResourceResolver.java @@ -201,7 +201,6 @@ static final class EncodedResource extends AbstractResource implements HttpResou this.encoded = original.createRelative(original.getFilename() + extension); } - @Override public boolean exists() { return this.encoded.exists();