From b214db3fc8bfac8a179fe439e7e3b8485bf512c2 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@gopivotal.com>
Date: Tue, 10 Jun 2014 18:51:22 -0400
Subject: [PATCH] Rename HttpStatus 308 to Permanent Redirect

Issue: SPR-11854
---
 .../test/web/servlet/result/StatusResultMatchers.java      | 4 ++--
 .../src/main/java/org/springframework/http/HttpStatus.java | 7 +++----
 .../java/org/springframework/http/HttpStatusTests.java     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
index a08a223c84..aeb0c45d3d 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java
@@ -317,9 +317,9 @@ public class StatusResultMatchers {
 	}
 
 	/**
-	 * Assert the response status code is {@code HttpStatus.RESUME_INCOMPLETE} (308).
+	 * Assert the response status code is {@code HttpStatus.PERMANENT_REDIRECT} (308).
 	 */
-	public ResultMatcher isResumeIncomplete() {
+	public ResultMatcher isPermanentRedirect() {
 		return matcher(HttpStatus.valueOf(308));
 	}
 
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 262ad852c2..752e2a789f 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -150,11 +150,10 @@ public enum HttpStatus {
 	 */
 	TEMPORARY_REDIRECT(307, "Temporary Redirect"),
 	/**
-	 * {@code 308 Resume Incomplete}.
-	 * @see <a href="http://code.google.com/p/gears/wiki/ResumableHttpRequestsProposal">A proposal for supporting
-	 * resumable POST/PUT HTTP requests in HTTP/1.0</a>
+	 * {@code 308 Permanent Redirect}.
+	 * @see <a href="http://tools.ietf.org/html/rfc7238">RFC 7238</a>
 	 */
-	RESUME_INCOMPLETE(308, "Resume Incomplete"),
+	PERMANENT_REDIRECT(308, "Permanent Redirect"),
 
 	// --- 4xx Client Error ---
 
diff --git a/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java b/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
index 15fd547402..fee715e25a 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
@@ -54,7 +54,7 @@ public class HttpStatusTests {
 		statusCodes.put(304, "NOT_MODIFIED");
 		statusCodes.put(305, "USE_PROXY");
 		statusCodes.put(307, "TEMPORARY_REDIRECT");
-		statusCodes.put(308, "RESUME_INCOMPLETE");
+		statusCodes.put(308, "PERMANENT_REDIRECT");
 
 		statusCodes.put(400, "BAD_REQUEST");
 		statusCodes.put(401, "UNAUTHORIZED");
-- 
GitLab