Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reflect 3.2=>3.1.2 backports in @since tags etc

Browse Source 
Issue: SPR-9443, SPR-6847, SPR-9446, SPR-9444, SPR-9439, SPR-9302,
       SPR-9507, SPR-9238, SPR-9397, SPR-9406, SPR-9502
This commit is contained in:
Chris Beams
2012-06-27 22:58:46 +02:00
parent f6de5d4360
commit dc822cdca0
10 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
View File

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
*
* @author Arjen Poutsma
* @author Keith Donald
* @since 3.2
* @since 3.1.2
* @see org.springframework.web.servlet.view.json.MappingJackson2JsonView
*/
public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConverter<Object> {

2
spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java
View File

@@ -73,7 +73,7 @@ public class HttpClientErrorException extends HttpStatusCodeException {
* @param responseHeaders the response headers, may be {@code null}
* @param responseBody the response body content, may be {@code null}
* @param responseCharset the response body charset, may be {@code null}
* @since 3.2
* @since 3.1.2
*/
public HttpClientErrorException(HttpStatus statusCode, String statusText,
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {

2
spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java
View File

@@ -74,7 +74,7 @@ public class HttpServerErrorException extends HttpStatusCodeException {
* @param responseHeaders the response headers, may be {@code null}
* @param responseBody the response body content, may be {@code null}
* @param responseCharset the response body charset, may be {@code null}
* @since 3.2
* @since 3.1.2
*/
public HttpServerErrorException(HttpStatus statusCode, String statusText,
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {

4
spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java
View File

@@ -89,7 +89,7 @@ public abstract class HttpStatusCodeException extends RestClientException {
* @param responseHeaders the response headers, may be {@code null}
* @param responseBody the response body content, may be {@code null}
* @param responseCharset the response body charset, may be {@code null}
* @since 3.2
* @since 3.1.2
*/
protected HttpStatusCodeException(HttpStatus statusCode, String statusText,
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
@@ -118,7 +118,7 @@ public abstract class HttpStatusCodeException extends RestClientException {
/**
* Return the HTTP response headers.
* @since 3.2
* @since 3.1.2
*/
public HttpHeaders getResponseHeaders() {
return this.responseHeaders;