Skip to content

Commit 360006a

Browse files
swankjesseswankjesse
authored
Don't declare our own HTTP status codes (#8362)
These already exist.
1 parent a673f45 commit 360006a

4 files changed

Lines changed: 21 additions & 227 deletions

File tree

‎okhttp/src/main/kotlin/okhttp3/internal/-ResponseCommon.kt‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@
1717

1818
package okhttp3.internal
1919

20-
import kotlin.jvm.JvmOverloads
20+
import java.net.HttpURLConnection.HTTP_MOVED_PERM
21+
import java.net.HttpURLConnection.HTTP_MOVED_TEMP
22+
import java.net.HttpURLConnection.HTTP_MULT_CHOICE
23+
import java.net.HttpURLConnection.HTTP_SEE_OTHER
2124
import okhttp3.CacheControl
2225
import okhttp3.Headers
2326
import okhttp3.MediaType
@@ -26,11 +29,7 @@ import okhttp3.Request
2629
import okhttp3.Response
2730
import okhttp3.ResponseBody
2831
import okhttp3.ResponseBody.Companion.asResponseBody
29-
import okhttp3.internal.http.HTTP_MOVED_PERM
30-
import okhttp3.internal.http.HTTP_MOVED_TEMP
31-
import okhttp3.internal.http.HTTP_MULT_CHOICE
3232
import okhttp3.internal.http.HTTP_PERM_REDIRECT
33-
import okhttp3.internal.http.HTTP_SEE_OTHER
3433
import okhttp3.internal.http.HTTP_TEMP_REDIRECT
3534
import okio.Buffer
3635
import okio.IOException

‎okhttp/src/main/kotlin/okhttp3/internal/cache/CacheStrategy.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
package okhttp3.internal.cache
1717

1818
import java.net.HttpURLConnection.HTTP_BAD_METHOD
19+
import java.net.HttpURLConnection.HTTP_GONE
20+
import java.net.HttpURLConnection.HTTP_MOVED_PERM
21+
import java.net.HttpURLConnection.HTTP_MOVED_TEMP
22+
import java.net.HttpURLConnection.HTTP_MULT_CHOICE
1923
import java.net.HttpURLConnection.HTTP_NOT_AUTHORITATIVE
24+
import java.net.HttpURLConnection.HTTP_NOT_FOUND
25+
import java.net.HttpURLConnection.HTTP_NOT_IMPLEMENTED
26+
import java.net.HttpURLConnection.HTTP_NO_CONTENT
27+
import java.net.HttpURLConnection.HTTP_OK
2028
import java.net.HttpURLConnection.HTTP_REQ_TOO_LONG
2129
import java.util.Date
2230
import java.util.concurrent.TimeUnit.SECONDS
2331
import okhttp3.Request
2432
import okhttp3.Response
25-
import okhttp3.internal.http.HTTP_GONE
26-
import okhttp3.internal.http.HTTP_MOVED_PERM
27-
import okhttp3.internal.http.HTTP_MOVED_TEMP
28-
import okhttp3.internal.http.HTTP_MULT_CHOICE
29-
import okhttp3.internal.http.HTTP_NOT_FOUND
30-
import okhttp3.internal.http.HTTP_NOT_IMPLEMENTED
31-
import okhttp3.internal.http.HTTP_NO_CONTENT
32-
import okhttp3.internal.http.HTTP_OK
3333
import okhttp3.internal.http.HTTP_PERM_REDIRECT
3434
import okhttp3.internal.http.HTTP_TEMP_REDIRECT
3535
import okhttp3.internal.http.toHttpDateOrNull

‎okhttp/src/main/kotlin/okhttp3/internal/http/HttpStatusCodes.kt‎

Lines changed: 1 addition & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -26,239 +26,26 @@
2626

2727
package okhttp3.internal.http
2828

29-
// HTTP Status Codes
29+
// HTTP Status Codes not offered by HttpUrlConnection.
3030
//
3131
// https://datatracker.ietf.org/doc/html/rfc7231#page-47
3232
//
3333
// From https://github.com/apache/httpcomponents-core/blob/master/httpcore5/src/main/java/org/apache/hc/core5/http/HttpStatus.java
3434

35-
// --- 1xx Informational ---
36-
// /** `100 1xx Informational` (HTTP/1.1 - RFC 7231) */
37-
// const val HTTP_INFORMATIONAL = 100
38-
3935
/** `100 Continue` (HTTP/1.1 - RFC 7231) */
4036
const val HTTP_CONTINUE = 100
4137

42-
/** `101 Switching Protocols` (HTTP/1.1 - RFC 7231) */
43-
const val HTTP_SWITCHING_PROTOCOLS = 101
44-
4538
/** `102 Processing` (WebDAV - RFC 2518) */
4639
const val HTTP_PROCESSING = 102
4740

4841
/** `103 Early Hints (Early Hints - RFC 8297)` */
4942
const val HTTP_EARLY_HINTS = 103
5043

51-
// --- 2xx Success ---
52-
// /** `2xx Success` (HTTP/1.0 - RFC 7231) */
53-
// const val HTTP_SUCCESS = 200
54-
55-
/** `200 OK` (HTTP/1.0 - RFC 7231) */
56-
const val HTTP_OK = 200
57-
58-
/** `201 Created` (HTTP/1.0 - RFC 7231) */
59-
const val HTTP_CREATED = 201
60-
61-
/** `202 Accepted` (HTTP/1.0 - RFC 7231) */
62-
const val HTTP_ACCEPTED = 202
63-
64-
/** `203 Non Authoritative Information` (HTTP/1.1 - RFC 7231) */
65-
const val HTTP_NOT_AUTHORITATIVE = 203
66-
67-
/** `204 No Content` (HTTP/1.0 - RFC 7231) */
68-
const val HTTP_NO_CONTENT = 204
69-
70-
/** `205 Reset Content` (HTTP/1.1 - RFC 7231) */
71-
const val HTTP_RESET_CONTENT = 205
72-
73-
/** `206 Partial Content` (HTTP/1.1 - RFC 7231) */
74-
const val HTTP_PARTIAL_CONTENT = 206
75-
76-
/**
77-
* `207 Multi-Status` (WebDAV - RFC 2518)
78-
* or
79-
* `207 Partial Update OK` (HTTP/1.1 - draft-ietf-http-v11-spec-rev-01?)
80-
*/
81-
const val HTTP_MULTI_STATUS = 207
82-
83-
/**
84-
* `208 Already Reported` (WebDAV - RFC 5842, p.30, section 7.1)
85-
*/
86-
const val HTTP_ALREADY_REPORTED = 208
87-
88-
/**
89-
* `226 IM Used` (Delta encoding in HTTP - RFC 3229, p. 30, section 10.4.1)
90-
*/
91-
const val HTTP_IM_USED = 226
92-
93-
// --- 3xx Redirection ---
94-
// /** `3xx Redirection` (HTTP/1.1 - RFC 7231) */
95-
// const val HTTP_REDIRECTION = 300
96-
97-
/** `300 Multiple Choices` (HTTP/1.1 - RFC 7231) */
98-
const val HTTP_MULT_CHOICE = 300
99-
100-
/** `301 Moved Permanently` (HTTP/1.0 - RFC 7231) */
101-
const val HTTP_MOVED_PERM = 301
102-
103-
/** `302 Moved Temporarily` (Sometimes `Found`) (HTTP/1.0 - RFC 7231) */
104-
const val HTTP_MOVED_TEMP = 302
105-
106-
/** `303 See Other` (HTTP/1.1 - RFC 7231) */
107-
const val HTTP_SEE_OTHER = 303
108-
109-
/** `304 Not Modified` (HTTP/1.0 - RFC 7231) */
110-
const val HTTP_NOT_MODIFIED = 304
111-
112-
/** `305 Use Proxy` (HTTP/1.1 - RFC 7231) */
113-
const val HTTP_USE_PROXY = 305
114-
11544
/** `307 Temporary Redirect` (HTTP/1.1 - RFC 7231) */
11645
const val HTTP_TEMP_REDIRECT = 307
11746

11847
/** `308 Permanent Redirect` (HTTP/1.1 - RFC 7538) */
11948
const val HTTP_PERM_REDIRECT = 308
12049

121-
// --- 4xx Client Error ---
122-
// /** `4xx Client Error` (HTTP/1.1 - RFC 7231) */
123-
// const val HTTP_CLIENT_ERROR = 400
124-
125-
/** `400 Bad Request` (HTTP/1.1 - RFC 7231) */
126-
const val HTTP_BAD_REQUEST = 400
127-
128-
/** `401 Unauthorized` (HTTP/1.0 - RFC 7231) */
129-
const val HTTP_UNAUTHORIZED = 401
130-
131-
/** `402 Payment Required` (HTTP/1.1 - RFC 7231) */
132-
const val HTTP_PAYMENT_REQUIRED = 402
133-
134-
/** `403 Forbidden` (HTTP/1.0 - RFC 7231) */
135-
const val HTTP_FORBIDDEN = 403
136-
137-
/** `404 Not Found` (HTTP/1.0 - RFC 7231) */
138-
const val HTTP_NOT_FOUND = 404
139-
140-
/** `405 Method Not Allowed` (HTTP/1.1 - RFC 7231) */
141-
const val HTTP_BAD_METHOD = 405
142-
143-
/** `406 Not Acceptable` (HTTP/1.1 - RFC 7231) */
144-
const val HTTP_NOT_ACCEPTABLE = 406
145-
146-
/** `407 Proxy Authentication Required` (HTTP/1.1 - RFC 7231) */
147-
const val HTTP_PROXY_AUTH = 407
148-
149-
/** `408 Request Timeout` (HTTP/1.1 - RFC 7231) */
150-
const val HTTP_CLIENT_TIMEOUT = 408
151-
152-
/** `409 Conflict` (HTTP/1.1 - RFC 7231) */
153-
const val HTTP_CONFLICT = 409
154-
155-
/** `410 Gone` (HTTP/1.1 - RFC 7231) */
156-
const val HTTP_GONE = 410
157-
158-
/** `411 Length Required` (HTTP/1.1 - RFC 7231) */
159-
const val HTTP_LENGTH_REQUIRED = 411
160-
161-
/** `412 Precondition Failed` (HTTP/1.1 - RFC 7231) */
162-
const val HTTP_PRECONDITION_FAILED = 412
163-
164-
/** `413 Request Entity Too Large` (HTTP/1.1 - RFC 7231) */
165-
const val HTTP_REQUEST_TOO_LONG = 413
166-
167-
/** `414 Request-URI Too Long` (HTTP/1.1 - RFC 7231) */
168-
const val HTTP_REQ_TOO_LONG = 414
169-
170-
/** `415 Unsupported Media Type` (HTTP/1.1 - RFC 7231) */
171-
const val HTTP_UNSUPPORTED_MEDIA_TYPE = 415
172-
173-
/** `416 Requested Range Not Satisfiable` (HTTP/1.1 - RFC 7231) */
174-
const val HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416
175-
176-
/** `417 Expectation Failed` (HTTP/1.1 - RFC 7231) */
177-
const val HTTP_EXPECTATION_FAILED = 417
178-
17950
/** `421 Misdirected Request` (HTTP/2 - RFC 7540) */
18051
const val HTTP_MISDIRECTED_REQUEST = 421
181-
182-
/**
183-
* Static constant for a 419 error.
184-
* `419 Insufficient Space on Resource`
185-
* (WebDAV - draft-ietf-webdav-protocol-05?)
186-
* or `419 Proxy Reauthentication Required`
187-
* (HTTP/1.1 drafts?)
188-
*/
189-
const val HTTP_INSUFFICIENT_SPACE_ON_RESOURCE = 419
190-
191-
/**
192-
* Static constant for a 420 error.
193-
* `420 Method Failure`
194-
* (WebDAV - draft-ietf-webdav-protocol-05?)
195-
*/
196-
const val HTTP_METHOD_FAILURE = 420
197-
198-
/** `422 Unprocessable Entity` (WebDAV - RFC 2518) */
199-
const val HTTP_UNPROCESSABLE_ENTITY = 422
200-
201-
/** `423 Locked` (WebDAV - RFC 2518) */
202-
const val HTTP_LOCKED = 423
203-
204-
/** `424 Failed Dependency` (WebDAV - RFC 2518) */
205-
const val HTTP_FAILED_DEPENDENCY = 424
206-
207-
/** `425 Too Early` (Using Early Data in HTTP - RFC 8470) */
208-
const val HTTP_TOO_EARLY = 425
209-
210-
/** `426 Upgrade Dependency` (HTTP/1.1 - RFC 2817) */
211-
const val HTTP_UPGRADE_REQUIRED = 426
212-
213-
/** `428 Precondition Required` (Additional HTTP Status Codes - RFC 6585) */
214-
const val HTTP_PRECONDITION_REQUIRED = 428
215-
216-
/** `429 Too Many Requests` (Additional HTTP Status Codes - RFC 6585) */
217-
const val HTTP_TOO_MANY_REQUESTS = 429
218-
219-
/** `431 Request Header Fields Too Large` (Additional HTTP Status Codes - RFC 6585) */
220-
const val HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431
221-
222-
/** `451 Unavailable For Legal Reasons` (Legal Obstacles - RFC 7725) */
223-
const val HTTP_UNAVAILABLE_FOR_LEGAL_REASONS = 451
224-
225-
// --- 5xx Server Error ---
226-
// /** `500 Server Error` (HTTP/1.0 - RFC 7231) */
227-
// const val HTTP_SERVER_ERROR = 500
228-
229-
/** `500 Internal Server Error` (HTTP/1.0 - RFC 7231) */
230-
const val HTTP_INTERNAL_SERVER_ERROR = 500
231-
232-
/** `501 Not Implemented` (HTTP/1.0 - RFC 7231) */
233-
const val HTTP_NOT_IMPLEMENTED = 501
234-
235-
/** `502 Bad Gateway` (HTTP/1.0 - RFC 7231) */
236-
const val HTTP_BAD_GATEWAY = 502
237-
238-
/** `503 Service Unavailable` (HTTP/1.0 - RFC 7231) */
239-
const val HTTP_UNAVAILABLE = 503
240-
241-
/** `504 Gateway Timeout` (HTTP/1.1 - RFC 7231) */
242-
const val HTTP_GATEWAY_TIMEOUT = 504
243-
244-
/** `505 HTTP Version Not Supported` (HTTP/1.1 - RFC 7231) */
245-
const val HTTP_HTTP_VERSION_NOT_SUPPORTED = 505
246-
247-
/** `506 Variant Also Negotiates` ( Transparent Content Negotiation - RFC 2295) */
248-
const val HTTP_VARIANT_ALSO_NEGOTIATES = 506
249-
250-
/** `507 Insufficient Storage` (WebDAV - RFC 2518) */
251-
const val HTTP_INSUFFICIENT_STORAGE = 507
252-
253-
/**
254-
* `508 Loop Detected` (WebDAV - RFC 5842, p.33, section 7.2)
255-
*/
256-
const val HTTP_LOOP_DETECTED = 508
257-
258-
/**
259-
* `510 Not Extended` (An HTTP Extension Framework - RFC 2774, p. 10, section 7)
260-
*/
261-
const val HTTP_NOT_EXTENDED = 510
262-
263-
/** `511 Network Authentication Required` (Additional HTTP Status Codes - RFC 6585) */
264-
const val HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511

‎okhttp/src/main/kotlin/okhttp3/internal/http/RetryAndFollowUpInterceptor.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ package okhttp3.internal.http
1818
import java.io.FileNotFoundException
1919
import java.io.IOException
2020
import java.io.InterruptedIOException
21+
import java.net.HttpURLConnection.HTTP_CLIENT_TIMEOUT
22+
import java.net.HttpURLConnection.HTTP_MOVED_PERM
23+
import java.net.HttpURLConnection.HTTP_MOVED_TEMP
24+
import java.net.HttpURLConnection.HTTP_MULT_CHOICE
25+
import java.net.HttpURLConnection.HTTP_PROXY_AUTH
26+
import java.net.HttpURLConnection.HTTP_SEE_OTHER
27+
import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
28+
import java.net.HttpURLConnection.HTTP_UNAVAILABLE
2129
import java.net.ProtocolException
2230
import java.net.Proxy
2331
import java.net.SocketTimeoutException

0 commit comments

Comments
 (0)