From 79d30d8c8a5a2a5725d22a0e63bdefef522df8ca Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@pivotal.io>
Date: Tue, 19 Jul 2016 23:42:32 +0200
Subject: [PATCH] Polishing

---
 .../src/main/java/org/springframework/http/HttpStatus.java  | 1 +
 .../http/converter/reactive/package-info.java               | 3 ++-
 .../http/converter/xml/SourceHttpMessageConverter.java      | 5 ++---
 .../main/java/org/springframework/web/util/HtmlUtils.java   | 6 +++---
 .../java/org/springframework/web/util/UrlPathHelper.java    | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/HttpStatus.java b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
index 015a2969cb..34a051d92a 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -24,6 +24,7 @@ package org.springframework.http;
  * @author Arjen Poutsma
  * @author Sebastien Deleuze
  * @author Brian Clozel
+ * @since 3.0
  * @see HttpStatus.Series
  * @see <a href="http://www.iana.org/assignments/http-status-codes">HTTP Status Code Registry</a>
  * @see <a href="http://en.wikipedia.org/wiki/List_of_HTTP_status_codes">List of HTTP status codes - Wikipedia</a>
diff --git a/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java b/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java
index 66912cd518..b9b674a3a9 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java
@@ -1,5 +1,6 @@
 /**
- * {@link org.springframework.http.converter.reactive.HttpMessageConverter}
+ * {@link org.springframework.http.converter.reactive.HttpMessageReader},
+ * {@link org.springframework.http.converter.reactive.HttpMessageWriter}
  * and implementations for use with reactive
  * {@link org.springframework.core.codec.Encoder} and
  * {@link org.springframework.core.codec.Decoder} implementations.
diff --git a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
index 1f4898e966..6f6a46f47b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
@@ -174,9 +174,8 @@ public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMe
 		}
 		catch (NullPointerException ex) {
 			if (!isSupportDtd()) {
-				throw new HttpMessageNotReadableException("NPE while unmarshalling. " +
-						"This can happen on JDK 1.6 due to the presence of DTD " +
-						"declarations, which are disabled.", ex);
+				throw new HttpMessageNotReadableException("NPE while unmarshalling: " +
+						"This can happen due to the presence of DTD declarations which are disabled.", ex);
 			}
 			throw ex;
 		}
diff --git a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
index 6210945626..3546efd130 100644
--- a/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
+++ b/spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
@@ -74,7 +74,7 @@ public abstract class HtmlUtils {
 	 * http://www.w3.org/TR/html4/sgml/entities.html
 	 * </a>
 	 * @param input the (unescaped) input string
-	 * @param encoding The name of a supported {@link java.nio.charset.Charset charset}
+	 * @param encoding the name of a supported {@link java.nio.charset.Charset charset}
 	 * @return the escaped string
 	 * @since 4.1.2
 	 */
@@ -125,7 +125,7 @@ public abstract class HtmlUtils {
 	 * http://www.w3.org/TR/html4/sgml/entities.html
 	 * </a>
 	 * @param input the (unescaped) input string
-	 * @param encoding The name of a supported {@link java.nio.charset.Charset charset}
+	 * @param encoding the name of a supported {@link java.nio.charset.Charset charset}
 	 * @return the escaped string
 	 * @since 4.1.2
 	 */
@@ -177,7 +177,7 @@ public abstract class HtmlUtils {
 	 * http://www.w3.org/TR/html4/sgml/entities.html
 	 * </a>
 	 * @param input the (unescaped) input string
-	 * @param encoding The name of a supported {@link java.nio.charset.Charset charset}
+	 * @param encoding the name of a supported {@link java.nio.charset.Charset charset}
 	 * @return the escaped string
 	 * @since 4.1.2
 	 */
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 4305d8476b..42d3662d57 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
@@ -484,8 +484,8 @@ public class UrlPathHelper {
 	 * @return the updated URI string
 	 */
 	public String removeSemicolonContent(String requestUri) {
-		return this.removeSemicolonContent ?
-				removeSemicolonContentInternal(requestUri) : removeJsessionid(requestUri);
+		return (this.removeSemicolonContent ?
+				removeSemicolonContentInternal(requestUri) : removeJsessionid(requestUri));
 	}
 
 	private String removeSemicolonContentInternal(String requestUri) {