Update references to RFC 2616

Replace references to the old RFC 2616 (HTTP 1.1) with references
to the new RFCs 7230 to 7235.

This commit also deprecates:
 - HttpStatus.USE_PROXY
 - HttpStatus.REQUEST_ENTITY_TOO_LARGE in favor of HttpStatus.PAYLOAD_TOO_LARGE
 - HttpStatus.REQUEST_URI_TOO_LONG in favor of HttpStatus.URI_TOO_LONG

Issue: SPR-12067

Author: sdeleuze

spring-core/src/main/java/org/springframework/util/MimeTypeUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -309,8 +309,8 @@ public static String toString(Collection<? extends MimeType> mimeTypes) {
 	 * <blockquote>audio/basic == text/html</blockquote> <blockquote>audio/basic ==
 	 * audio/wave</blockquote>
 	 * @param mimeTypes the list of mime types to be sorted
-	 * @see <a href="http://tools.ietf.org/html/rfc2616#section-14.1">HTTP 1.1, section
-	 *      14.1</a>
+	 * @see <a href="http://tools.ietf.org/html/rfc7231#section-5.3.2">HTTP 1.1: Semantics
+	 * and Content, section 5.3.2</a>
 	 */
 	public static void sortBySpecificity(List<MimeType> mimeTypes) {
 		Assert.notNull(mimeTypes, "'mimeTypes' must not be null");

spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java

@@ -29,6 +29,7 @@
  *
  * @author Keesun Baik
  * @author Rossen Stoyanchev
+ * @author Sebastien Deleuze
  * @since 3.2
  */
 public class StatusResultMatchers {
@@ -283,7 +284,7 @@ public ResultMatcher isFound() {
 	 * Assert the response status code is {@code HttpStatus.MOVED_TEMPORARILY} (302).
 	 * @see #isFound()
 	 */
-	@SuppressWarnings("deprecation")
+	@Deprecated
 	public ResultMatcher isMovedTemporarily() {
 		return matcher(HttpStatus.MOVED_TEMPORARILY);
 	}
@@ -304,7 +305,9 @@ public ResultMatcher isNotModified() {
 
 	/**
 	 * Assert the response status code is {@code HttpStatus.USE_PROXY} (305).
+	 * @deprecated matching the deprecation of {@code HttpStatus.USE_PROXY}
 	 */
+	@Deprecated
 	public ResultMatcher isUseProxy() {
 		return matcher(HttpStatus.USE_PROXY);
 	}
@@ -414,16 +417,38 @@ public ResultMatcher isPreconditionFailed() {
 		return matcher(HttpStatus.PRECONDITION_FAILED);
 	}
 
+	/**
+	 * Assert the response status code is {@code HttpStatus.PAYLOAD_TOO_LARGE} (413).
+	 * @since 4.1
+	 */
+	public ResultMatcher isPayloadTooLarge() {
+		return matcher(HttpStatus.PAYLOAD_TOO_LARGE);
+	}
+
 	/**
 	 * Assert the response status code is {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE} (413).
+	 * @deprecated matching the deprecation of {@code HttpStatus.REQUEST_ENTITY_TOO_LARGE}
+	 * @see #isPayloadTooLarge()
 	 */
+	@Deprecated
 	public ResultMatcher isRequestEntityTooLarge() {
 		return matcher(HttpStatus.REQUEST_ENTITY_TOO_LARGE);
 	}
 
 	/**
 	 * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414).
+	 * @since 4.1
+	 */
+	public ResultMatcher isUriTooLong() {
+		return matcher(HttpStatus.URI_TOO_LONG);
+	}
+
+	/**
+	 * Assert the response status code is {@code HttpStatus.REQUEST_URI_TOO_LONG} (414).
+	 * @deprecated matching the deprecation of {@code HttpStatus.REQUEST_URI_TOO_LONG}
+	 * @see #isUriTooLong()
 	 */
+	@Deprecated
 	public ResultMatcher isRequestUriTooLong() {
 		return matcher(HttpStatus.REQUEST_URI_TOO_LONG);
 	}
@@ -458,7 +483,7 @@ public ResultMatcher isIAmATeapot() {
 
 	/**
 	  * Assert the response status code is {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE} (419).
-	  * @deprecated matching the deprecation of HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE
+	  * @deprecated matching the deprecation of {@code HttpStatus.INSUFFICIENT_SPACE_ON_RESOURCE}
 	  */
 	 @Deprecated
 	 public ResultMatcher isInsufficientSpaceOnResource() {
@@ -467,7 +492,7 @@ public ResultMatcher isInsufficientSpaceOnResource() {
 
 	 /**
 	  * Assert the response status code is {@code HttpStatus.METHOD_FAILURE} (420).
-	  * @deprecated matching the deprecation of HttpStatus.METHOD_FAILURE
+	  * @deprecated matching the deprecation of {@code HttpStatus.METHOD_FAILURE}
 	  */
 	 @Deprecated
 	 public ResultMatcher isMethodFailure() {
@@ -476,7 +501,7 @@ public ResultMatcher isMethodFailure() {
 
 	 /**
 	  * Assert the response status code is {@code HttpStatus.DESTINATION_LOCKED} (421).
-	  * @deprecated matching the deprecation of HttpStatus.DESTINATION_LOCKED
+	  * @deprecated matching the deprecation of {@code HttpStatus.DESTINATION_LOCKED}
 	  */
 	 @Deprecated
 	 public ResultMatcher isDestinationLocked() {