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 466ad8dd83..9f80c75282 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpStatus.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpStatus.java
@@ -39,23 +39,23 @@ public enum HttpStatus {
* {@code 100 Continue}.
* @see HTTP/1.1: Semantics and Content, section 6.2.1
*/
- CONTINUE(100, "Continue"),
+ CONTINUE(100, Series.INFORMATIONAL, "Continue"),
/**
* {@code 101 Switching Protocols}.
* @see HTTP/1.1: Semantics and Content, section 6.2.2
*/
- SWITCHING_PROTOCOLS(101, "Switching Protocols"),
+ SWITCHING_PROTOCOLS(101, Series.INFORMATIONAL, "Switching Protocols"),
/**
* {@code 102 Processing}.
* @see WebDAV
*/
- PROCESSING(102, "Processing"),
+ PROCESSING(102, Series.INFORMATIONAL, "Processing"),
/**
* {@code 103 Checkpoint}.
* @see A proposal for supporting
* resumable POST/PUT HTTP requests in HTTP/1.0
*/
- CHECKPOINT(103, "Checkpoint"),
+ CHECKPOINT(103, Series.INFORMATIONAL, "Checkpoint"),
// 2xx Success
@@ -63,52 +63,52 @@ public enum HttpStatus {
* {@code 200 OK}.
* @see HTTP/1.1: Semantics and Content, section 6.3.1
*/
- OK(200, "OK"),
+ OK(200, Series.SUCCESSFUL, "OK"),
/**
* {@code 201 Created}.
* @see HTTP/1.1: Semantics and Content, section 6.3.2
*/
- CREATED(201, "Created"),
+ CREATED(201, Series.SUCCESSFUL, "Created"),
/**
* {@code 202 Accepted}.
* @see HTTP/1.1: Semantics and Content, section 6.3.3
*/
- ACCEPTED(202, "Accepted"),
+ ACCEPTED(202, Series.SUCCESSFUL, "Accepted"),
/**
* {@code 203 Non-Authoritative Information}.
* @see HTTP/1.1: Semantics and Content, section 6.3.4
*/
- NON_AUTHORITATIVE_INFORMATION(203, "Non-Authoritative Information"),
+ NON_AUTHORITATIVE_INFORMATION(203, Series.SUCCESSFUL, "Non-Authoritative Information"),
/**
* {@code 204 No Content}.
* @see HTTP/1.1: Semantics and Content, section 6.3.5
*/
- NO_CONTENT(204, "No Content"),
+ NO_CONTENT(204, Series.SUCCESSFUL, "No Content"),
/**
* {@code 205 Reset Content}.
* @see HTTP/1.1: Semantics and Content, section 6.3.6
*/
- RESET_CONTENT(205, "Reset Content"),
+ RESET_CONTENT(205, Series.SUCCESSFUL, "Reset Content"),
/**
* {@code 206 Partial Content}.
* @see HTTP/1.1: Range Requests, section 4.1
*/
- PARTIAL_CONTENT(206, "Partial Content"),
+ PARTIAL_CONTENT(206, Series.SUCCESSFUL, "Partial Content"),
/**
* {@code 207 Multi-Status}.
* @see WebDAV
*/
- MULTI_STATUS(207, "Multi-Status"),
+ MULTI_STATUS(207, Series.SUCCESSFUL, "Multi-Status"),
/**
* {@code 208 Already Reported}.
* @see WebDAV Binding Extensions
*/
- ALREADY_REPORTED(208, "Already Reported"),
+ ALREADY_REPORTED(208, Series.SUCCESSFUL, "Already Reported"),
/**
* {@code 226 IM Used}.
* @see Delta encoding in HTTP
*/
- IM_USED(226, "IM Used"),
+ IM_USED(226, Series.SUCCESSFUL, "IM Used"),
// 3xx Redirection
@@ -116,51 +116,51 @@ public enum HttpStatus {
* {@code 300 Multiple Choices}.
* @see HTTP/1.1: Semantics and Content, section 6.4.1
*/
- MULTIPLE_CHOICES(300, "Multiple Choices"),
+ MULTIPLE_CHOICES(300, Series.REDIRECTION, "Multiple Choices"),
/**
* {@code 301 Moved Permanently}.
* @see HTTP/1.1: Semantics and Content, section 6.4.2
*/
- MOVED_PERMANENTLY(301, "Moved Permanently"),
+ MOVED_PERMANENTLY(301, Series.REDIRECTION, "Moved Permanently"),
/**
* {@code 302 Found}.
* @see HTTP/1.1: Semantics and Content, section 6.4.3
*/
- FOUND(302, "Found"),
+ FOUND(302, Series.REDIRECTION, "Found"),
/**
* {@code 302 Moved Temporarily}.
* @see HTTP/1.0, section 9.3
* @deprecated in favor of {@link #FOUND} which will be returned from {@code HttpStatus.valueOf(302)}
*/
@Deprecated
- MOVED_TEMPORARILY(302, "Moved Temporarily"),
+ MOVED_TEMPORARILY(302, Series.REDIRECTION, "Moved Temporarily"),
/**
* {@code 303 See Other}.
* @see HTTP/1.1: Semantics and Content, section 6.4.4
*/
- SEE_OTHER(303, "See Other"),
+ SEE_OTHER(303, Series.REDIRECTION, "See Other"),
/**
* {@code 304 Not Modified}.
* @see HTTP/1.1: Conditional Requests, section 4.1
*/
- NOT_MODIFIED(304, "Not Modified"),
+ NOT_MODIFIED(304, Series.REDIRECTION, "Not Modified"),
/**
* {@code 305 Use Proxy}.
* @see HTTP/1.1: Semantics and Content, section 6.4.5
* @deprecated due to security concerns regarding in-band configuration of a proxy
*/
@Deprecated
- USE_PROXY(305, "Use Proxy"),
+ USE_PROXY(305, Series.REDIRECTION, "Use Proxy"),
/**
* {@code 307 Temporary Redirect}.
* @see HTTP/1.1: Semantics and Content, section 6.4.7
*/
- TEMPORARY_REDIRECT(307, "Temporary Redirect"),
+ TEMPORARY_REDIRECT(307, Series.REDIRECTION, "Temporary Redirect"),
/**
* {@code 308 Permanent Redirect}.
* @see RFC 7238
*/
- PERMANENT_REDIRECT(308, "Permanent Redirect"),
+ PERMANENT_REDIRECT(308, Series.REDIRECTION, "Permanent Redirect"),
// --- 4xx Client Error ---
@@ -168,77 +168,77 @@ public enum HttpStatus {
* {@code 400 Bad Request}.
* @see HTTP/1.1: Semantics and Content, section 6.5.1
*/
- BAD_REQUEST(400, "Bad Request"),
+ BAD_REQUEST(400, Series.CLIENT_ERROR, "Bad Request"),
/**
* {@code 401 Unauthorized}.
* @see HTTP/1.1: Authentication, section 3.1
*/
- UNAUTHORIZED(401, "Unauthorized"),
+ UNAUTHORIZED(401, Series.CLIENT_ERROR, "Unauthorized"),
/**
* {@code 402 Payment Required}.
* @see HTTP/1.1: Semantics and Content, section 6.5.2
*/
- PAYMENT_REQUIRED(402, "Payment Required"),
+ PAYMENT_REQUIRED(402, Series.CLIENT_ERROR, "Payment Required"),
/**
* {@code 403 Forbidden}.
* @see HTTP/1.1: Semantics and Content, section 6.5.3
*/
- FORBIDDEN(403, "Forbidden"),
+ FORBIDDEN(403, Series.CLIENT_ERROR, "Forbidden"),
/**
* {@code 404 Not Found}.
* @see HTTP/1.1: Semantics and Content, section 6.5.4
*/
- NOT_FOUND(404, "Not Found"),
+ NOT_FOUND(404, Series.CLIENT_ERROR, "Not Found"),
/**
* {@code 405 Method Not Allowed}.
* @see HTTP/1.1: Semantics and Content, section 6.5.5
*/
- METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
+ METHOD_NOT_ALLOWED(405, Series.CLIENT_ERROR, "Method Not Allowed"),
/**
* {@code 406 Not Acceptable}.
* @see HTTP/1.1: Semantics and Content, section 6.5.6
*/
- NOT_ACCEPTABLE(406, "Not Acceptable"),
+ NOT_ACCEPTABLE(406, Series.CLIENT_ERROR, "Not Acceptable"),
/**
* {@code 407 Proxy Authentication Required}.
* @see HTTP/1.1: Authentication, section 3.2
*/
- PROXY_AUTHENTICATION_REQUIRED(407, "Proxy Authentication Required"),
+ PROXY_AUTHENTICATION_REQUIRED(407, Series.CLIENT_ERROR, "Proxy Authentication Required"),
/**
* {@code 408 Request Timeout}.
* @see HTTP/1.1: Semantics and Content, section 6.5.7
*/
- REQUEST_TIMEOUT(408, "Request Timeout"),
+ REQUEST_TIMEOUT(408, Series.CLIENT_ERROR, "Request Timeout"),
/**
* {@code 409 Conflict}.
* @see HTTP/1.1: Semantics and Content, section 6.5.8
*/
- CONFLICT(409, "Conflict"),
+ CONFLICT(409, Series.CLIENT_ERROR, "Conflict"),
/**
* {@code 410 Gone}.
* @see
* HTTP/1.1: Semantics and Content, section 6.5.9
*/
- GONE(410, "Gone"),
+ GONE(410, Series.CLIENT_ERROR, "Gone"),
/**
* {@code 411 Length Required}.
* @see
* HTTP/1.1: Semantics and Content, section 6.5.10
*/
- LENGTH_REQUIRED(411, "Length Required"),
+ LENGTH_REQUIRED(411, Series.CLIENT_ERROR, "Length Required"),
/**
* {@code 412 Precondition failed}.
* @see
* HTTP/1.1: Conditional Requests, section 4.2
*/
- PRECONDITION_FAILED(412, "Precondition Failed"),
+ PRECONDITION_FAILED(412, Series.CLIENT_ERROR, "Precondition Failed"),
/**
* {@code 413 Payload Too Large}.
* @since 4.1
* @see
* HTTP/1.1: Semantics and Content, section 6.5.11
*/
- PAYLOAD_TOO_LARGE(413, "Payload Too Large"),
+ PAYLOAD_TOO_LARGE(413, Series.CLIENT_ERROR, "Payload Too Large"),
/**
* {@code 413 Request Entity Too Large}.
* @see HTTP/1.1, section 10.4.14
@@ -246,112 +246,112 @@ public enum HttpStatus {
* returned from {@code HttpStatus.valueOf(413)}
*/
@Deprecated
- REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
+ REQUEST_ENTITY_TOO_LARGE(413, Series.CLIENT_ERROR, "Request Entity Too Large"),
/**
* {@code 414 URI Too Long}.
* @since 4.1
* @see
* HTTP/1.1: Semantics and Content, section 6.5.12
*/
- URI_TOO_LONG(414, "URI Too Long"),
+ URI_TOO_LONG(414, Series.CLIENT_ERROR, "URI Too Long"),
/**
* {@code 414 Request-URI Too Long}.
* @see HTTP/1.1, section 10.4.15
* @deprecated in favor of {@link #URI_TOO_LONG} which will be returned from {@code HttpStatus.valueOf(414)}
*/
@Deprecated
- REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"),
+ REQUEST_URI_TOO_LONG(414, Series.CLIENT_ERROR, "Request-URI Too Long"),
/**
* {@code 415 Unsupported Media Type}.
* @see
* HTTP/1.1: Semantics and Content, section 6.5.13
*/
- UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
+ UNSUPPORTED_MEDIA_TYPE(415, Series.CLIENT_ERROR, "Unsupported Media Type"),
/**
* {@code 416 Requested Range Not Satisfiable}.
* @see HTTP/1.1: Range Requests, section 4.4
*/
- REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested range not satisfiable"),
+ REQUESTED_RANGE_NOT_SATISFIABLE(416, Series.CLIENT_ERROR, "Requested range not satisfiable"),
/**
* {@code 417 Expectation Failed}.
* @see
* HTTP/1.1: Semantics and Content, section 6.5.14
*/
- EXPECTATION_FAILED(417, "Expectation Failed"),
+ EXPECTATION_FAILED(417, Series.CLIENT_ERROR, "Expectation Failed"),
/**
* {@code 418 I'm a teapot}.
* @see HTCPCP/1.0
*/
- I_AM_A_TEAPOT(418, "I'm a teapot"),
+ I_AM_A_TEAPOT(418, Series.CLIENT_ERROR, "I'm a teapot"),
/**
* @deprecated See
*
* WebDAV Draft Changes
*/
@Deprecated
- INSUFFICIENT_SPACE_ON_RESOURCE(419, "Insufficient Space On Resource"),
+ INSUFFICIENT_SPACE_ON_RESOURCE(419, Series.CLIENT_ERROR, "Insufficient Space On Resource"),
/**
* @deprecated See
*
* WebDAV Draft Changes
*/
@Deprecated
- METHOD_FAILURE(420, "Method Failure"),
+ METHOD_FAILURE(420, Series.CLIENT_ERROR, "Method Failure"),
/**
* @deprecated
* See
* WebDAV Draft Changes
*/
@Deprecated
- DESTINATION_LOCKED(421, "Destination Locked"),
+ DESTINATION_LOCKED(421, Series.CLIENT_ERROR, "Destination Locked"),
/**
* {@code 422 Unprocessable Entity}.
* @see WebDAV
*/
- UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
+ UNPROCESSABLE_ENTITY(422, Series.CLIENT_ERROR, "Unprocessable Entity"),
/**
* {@code 423 Locked}.
* @see WebDAV
*/
- LOCKED(423, "Locked"),
+ LOCKED(423, Series.CLIENT_ERROR, "Locked"),
/**
* {@code 424 Failed Dependency}.
* @see WebDAV
*/
- FAILED_DEPENDENCY(424, "Failed Dependency"),
+ FAILED_DEPENDENCY(424, Series.CLIENT_ERROR, "Failed Dependency"),
/**
* {@code 425 Too Early}.
* @since 5.2
* @see RFC 8470
*/
- TOO_EARLY(425, "Too Early"),
+ TOO_EARLY(425, Series.CLIENT_ERROR, "Too Early"),
/**
* {@code 426 Upgrade Required}.
* @see Upgrading to TLS Within HTTP/1.1
*/
- UPGRADE_REQUIRED(426, "Upgrade Required"),
+ UPGRADE_REQUIRED(426, Series.CLIENT_ERROR, "Upgrade Required"),
/**
* {@code 428 Precondition Required}.
* @see Additional HTTP Status Codes
*/
- PRECONDITION_REQUIRED(428, "Precondition Required"),
+ PRECONDITION_REQUIRED(428, Series.CLIENT_ERROR, "Precondition Required"),
/**
* {@code 429 Too Many Requests}.
* @see Additional HTTP Status Codes
*/
- TOO_MANY_REQUESTS(429, "Too Many Requests"),
+ TOO_MANY_REQUESTS(429, Series.CLIENT_ERROR, "Too Many Requests"),
/**
* {@code 431 Request Header Fields Too Large}.
* @see Additional HTTP Status Codes
*/
- REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"),
+ REQUEST_HEADER_FIELDS_TOO_LARGE(431, Series.CLIENT_ERROR, "Request Header Fields Too Large"),
/**
* {@code 451 Unavailable For Legal Reasons}.
* @see
* An HTTP Status Code to Report Legal Obstacles
* @since 4.3
*/
- UNAVAILABLE_FOR_LEGAL_REASONS(451, "Unavailable For Legal Reasons"),
+ UNAVAILABLE_FOR_LEGAL_REASONS(451, Series.CLIENT_ERROR, "Unavailable For Legal Reasons"),
// --- 5xx Server Error ---
@@ -359,71 +359,73 @@ public enum HttpStatus {
* {@code 500 Internal Server Error}.
* @see HTTP/1.1: Semantics and Content, section 6.6.1
*/
- INTERNAL_SERVER_ERROR(500, "Internal Server Error"),
+ INTERNAL_SERVER_ERROR(500, Series.SERVER_ERROR, "Internal Server Error"),
/**
* {@code 501 Not Implemented}.
* @see HTTP/1.1: Semantics and Content, section 6.6.2
*/
- NOT_IMPLEMENTED(501, "Not Implemented"),
+ NOT_IMPLEMENTED(501, Series.SERVER_ERROR, "Not Implemented"),
/**
* {@code 502 Bad Gateway}.
* @see HTTP/1.1: Semantics and Content, section 6.6.3
*/
- BAD_GATEWAY(502, "Bad Gateway"),
+ BAD_GATEWAY(502, Series.SERVER_ERROR, "Bad Gateway"),
/**
* {@code 503 Service Unavailable}.
* @see HTTP/1.1: Semantics and Content, section 6.6.4
*/
- SERVICE_UNAVAILABLE(503, "Service Unavailable"),
+ SERVICE_UNAVAILABLE(503, Series.SERVER_ERROR, "Service Unavailable"),
/**
* {@code 504 Gateway Timeout}.
* @see HTTP/1.1: Semantics and Content, section 6.6.5
*/
- GATEWAY_TIMEOUT(504, "Gateway Timeout"),
+ GATEWAY_TIMEOUT(504, Series.SERVER_ERROR, "Gateway Timeout"),
/**
* {@code 505 HTTP Version Not Supported}.
* @see HTTP/1.1: Semantics and Content, section 6.6.6
*/
- HTTP_VERSION_NOT_SUPPORTED(505, "HTTP Version not supported"),
+ HTTP_VERSION_NOT_SUPPORTED(505, Series.SERVER_ERROR, "HTTP Version not supported"),
/**
* {@code 506 Variant Also Negotiates}
* @see Transparent Content Negotiation
*/
- VARIANT_ALSO_NEGOTIATES(506, "Variant Also Negotiates"),
+ VARIANT_ALSO_NEGOTIATES(506, Series.SERVER_ERROR, "Variant Also Negotiates"),
/**
* {@code 507 Insufficient Storage}
* @see WebDAV
*/
- INSUFFICIENT_STORAGE(507, "Insufficient Storage"),
+ INSUFFICIENT_STORAGE(507, Series.SERVER_ERROR, "Insufficient Storage"),
/**
* {@code 508 Loop Detected}
* @see WebDAV Binding Extensions
*/
- LOOP_DETECTED(508, "Loop Detected"),
+ LOOP_DETECTED(508, Series.SERVER_ERROR, "Loop Detected"),
/**
* {@code 509 Bandwidth Limit Exceeded}
*/
- BANDWIDTH_LIMIT_EXCEEDED(509, "Bandwidth Limit Exceeded"),
+ BANDWIDTH_LIMIT_EXCEEDED(509, Series.SERVER_ERROR, "Bandwidth Limit Exceeded"),
/**
* {@code 510 Not Extended}
* @see HTTP Extension Framework
*/
- NOT_EXTENDED(510, "Not Extended"),
+ NOT_EXTENDED(510, Series.SERVER_ERROR, "Not Extended"),
/**
* {@code 511 Network Authentication Required}.
* @see Additional HTTP Status Codes
*/
- NETWORK_AUTHENTICATION_REQUIRED(511, "Network Authentication Required");
+ NETWORK_AUTHENTICATION_REQUIRED(511, Series.SERVER_ERROR, "Network Authentication Required");
private final int value;
private final String reasonPhrase;
+ private final Series series;
- HttpStatus(int value, String reasonPhrase) {
+ HttpStatus(int value, Series series, String reasonPhrase) {
this.value = value;
this.reasonPhrase = reasonPhrase;
+ this.series = series;
}
@@ -446,7 +448,7 @@ public enum HttpStatus {
* @see HttpStatus.Series
*/
public Series series() {
- return Series.valueOf(this);
+ return this.series;
}
/**
@@ -586,10 +588,9 @@ public enum HttpStatus {
* Return the enum constant of this type with the corresponding series.
* @param status a standard HTTP status enum value
* @return the enum constant of this type with the corresponding series
- * @throws IllegalArgumentException if this enum has no corresponding constant
*/
public static Series valueOf(HttpStatus status) {
- return valueOf(status.value);
+ return status.series;
}
/**
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 311b01c9b4..1ee7609d25 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpStatusTests.java
@@ -128,4 +128,12 @@ public class HttpStatusTests {
}
}
+ @Test
+ public void allStatusSeriesShouldMatchExpectations() {
+ // a series of a status is manually set, make sure it is the correct one
+ for (HttpStatus status : HttpStatus.values()) {
+ HttpStatus.Series expectedSeries = HttpStatus.Series.valueOf(status.value());
+ assertThat(expectedSeries).isEqualTo(status.series());
+ }
+ }
}