From 255015fc6b0547cfc2fbf3feec3d7e85333d1d40 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Sat, 29 Sep 2018 17:08:57 +0200 Subject: [PATCH] Prepared for backport to 4.3.20 and 5.0.10 Issue: SPR-17295 --- .../springframework/mock/web/MockHttpServletRequest.java | 8 ++++---- .../mock/web/test/MockHttpServletRequest.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java index dc161f0daae..056c398ac1b 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java @@ -581,7 +581,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } /** - * Adds all provided parameters without replacing any + * Add all provided parameters without replacing any * existing values. To replace existing values, use * {@link #setParameters(java.util.Map)}. */ @@ -610,7 +610,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } /** - * Removes all existing parameters. + * Remove all existing parameters. */ public void removeAllParameters() { this.parameters.clear(); @@ -1042,8 +1042,8 @@ public class MockHttpServletRequest implements HttpServletRequest { } /** - * Remove already registered values for the specified HTTP header, if any. - * @since 5.1.1 + * Remove already registered entries for the specified HTTP header, if any. + * @since 4.3.20 */ public void removeHeader(String name) { Assert.notNull(name, "Header name must not be null"); diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java index d09c869745c..3ded9158641 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java @@ -581,7 +581,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } /** - * Adds all provided parameters without replacing any + * Add all provided parameters without replacing any * existing values. To replace existing values, use * {@link #setParameters(java.util.Map)}. */ @@ -610,7 +610,7 @@ public class MockHttpServletRequest implements HttpServletRequest { } /** - * Removes all existing parameters. + * Remove all existing parameters. */ public void removeAllParameters() { this.parameters.clear(); @@ -1042,8 +1042,8 @@ public class MockHttpServletRequest implements HttpServletRequest { } /** - * Remove already registered values for the specified HTTP header, if any. - * @since 5.1.1 + * Remove already registered entries for the specified HTTP header, if any. + * @since 4.3.20 */ public void removeHeader(String name) { Assert.notNull(name, "Header name must not be null");