root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2016-07-19 23:42:32 +02:00
parent adc595b5f1
commit 79d30d8c8a
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-web/src/main/java/org/springframework/http/HttpStatus.java
View File

@ -24,6 +24,7 @@ package org.springframework.http;
* @author Arjen Poutsma * @author Arjen Poutsma
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @author Brian Clozel * @author Brian Clozel
* @since 3.0
* @see HttpStatus.Series * @see HttpStatus.Series
* @see <a href="http://www.iana.org/assignments/http-status-codes">HTTP Status Code Registry</a> * @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> * @see <a href="http://en.wikipedia.org/wiki/List_of_HTTP_status_codes">List of HTTP status codes - Wikipedia</a>

3
spring-web/src/main/java/org/springframework/http/converter/reactive/package-info.java
View File

@ -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 * and implementations for use with reactive
* {@link org.springframework.core.codec.Encoder} and * {@link org.springframework.core.codec.Encoder} and
* {@link org.springframework.core.codec.Decoder} implementations. * {@link org.springframework.core.codec.Decoder} implementations.

5
spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java
View File

@ -174,9 +174,8 @@ public class SourceHttpMessageConverter<T extends Source> extends AbstractHttpMe
} }
catch (NullPointerException ex) { catch (NullPointerException ex) {
if (!isSupportDtd()) { if (!isSupportDtd()) {
throw new HttpMessageNotReadableException("NPE while unmarshalling. " + throw new HttpMessageNotReadableException("NPE while unmarshalling: " +
"This can happen on JDK 1.6 due to the presence of DTD " + "This can happen due to the presence of DTD declarations which are disabled.", ex);
"declarations, which are disabled.", ex);
} }
throw ex; throw ex;
} }

6
spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
View File

@ -74,7 +74,7 @@ public abstract class HtmlUtils {
* http://www.w3.org/TR/html4/sgml/entities.html * http://www.w3.org/TR/html4/sgml/entities.html
* </a> * </a>
* @param input the (unescaped) input string * @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 * @return the escaped string
* @since 4.1.2 * @since 4.1.2
*/ */
@ -125,7 +125,7 @@ public abstract class HtmlUtils {
* http://www.w3.org/TR/html4/sgml/entities.html * http://www.w3.org/TR/html4/sgml/entities.html
* </a> * </a>
* @param input the (unescaped) input string * @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 * @return the escaped string
* @since 4.1.2 * @since 4.1.2
*/ */
@ -177,7 +177,7 @@ public abstract class HtmlUtils {
* http://www.w3.org/TR/html4/sgml/entities.html * http://www.w3.org/TR/html4/sgml/entities.html
* </a> * </a>
* @param input the (unescaped) input string * @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 * @return the escaped string
* @since 4.1.2 * @since 4.1.2
*/ */

4
spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
View File

@ -484,8 +484,8 @@ public class UrlPathHelper {
* @return the updated URI string * @return the updated URI string
*/ */
public String removeSemicolonContent(String requestUri) { public String removeSemicolonContent(String requestUri) {
return this.removeSemicolonContent ? return (this.removeSemicolonContent ?
removeSemicolonContentInternal(requestUri) : removeJsessionid(requestUri); removeSemicolonContentInternal(requestUri) : removeJsessionid(requestUri));
} }
private String removeSemicolonContentInternal(String requestUri) { private String removeSemicolonContentInternal(String requestUri) {