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

Rename HttpStatus 308 to Permanent Redirect 

Issue: SPR-11854
This commit is contained in:
Rossen Stoyanchev 2014-06-10 18:51:22 -04:00
parent 6b129c52e3
commit b214db3fc8
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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));
}

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

@ -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 ---

2
spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
View File

@ -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");