diff --git a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
index a78f6fbd86e..dcf373e6684 100644
--- a/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
+++ b/spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
@@ -290,7 +290,7 @@ public class UrlPathHelper {
}
/**
- * Sanitize the given path with the following rules:
+ * Sanitize the given path. Uses the following rules:
*
* - replace all "//" by "/"
*
@@ -497,7 +497,7 @@ public class UrlPathHelper {
/**
* Remove ";" (semicolon) content from the given request URI if the
* {@linkplain #setRemoveSemicolonContent removeSemicolonContent}
- * property is set to "true". Note that "jssessionid" is always removed.
+ * property is set to "true". Note that "jsessionid" is always removed.
* @param requestUri the request URI string to remove ";" content from
* @return the updated URI string
*/
@@ -533,7 +533,7 @@ public class UrlPathHelper {
* the URL path from which the variables were extracted is already decoded
* through a call to {@link #getLookupPathForRequest(HttpServletRequest)}.
* @param request current HTTP request
- * @param vars URI variables extracted from the URL path
+ * @param vars the URI variables extracted from the URL path
* @return the same Map or a new Map instance
*/
public Map decodePathVariables(HttpServletRequest request, Map vars) {
@@ -553,7 +553,7 @@ public class UrlPathHelper {
* the URL path from which the variables were extracted is already decoded
* through a call to {@link #getLookupPathForRequest(HttpServletRequest)}.
* @param request current HTTP request
- * @param vars URI variables extracted from the URL path
+ * @param vars the URI variables extracted from the URL path
* @return the same Map or a new Map instance
*/
public MultiValueMap decodeMatrixVariables(
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
index 1639842363f..badb061f468 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
@@ -80,15 +80,8 @@ import org.junit.Test;
import org.springframework.beans.FatalBeanException;
import org.springframework.util.StringUtils;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
/**
* Test class for {@link Jackson2ObjectMapperBuilder}.