Skip to content

Commit b4ad524

Browse files
authored
Use HTTP code and range names from swift-http-types (#298)
Use HTTP code and range names from swift-http-types ### Motivation Fixes #257. Using the API-breaking 0.3.0 to sync up the HTTP code and range names with swift-http-types for consistency. ### Modifications Made a few changes to match the terminology used by swift-http-types exactly. ### Result Now the terminology is consistent between SOAR and swift-http-types. ### Test Plan All tests still pass. Reviewed by: simonjbeaumont Builds: ✔︎ pull request validation (5.8) - Build finished. ✔︎ pull request validation (5.9) - Build finished. ✔︎ pull request validation (compatibility test) - Build finished. ✔︎ pull request validation (docc test) - Build finished. ✔︎ pull request validation (nightly) - Build finished. ✔︎ pull request validation (soundness) - Build finished. ✖︎ pull request validation (integration test) - Build finished. #298
1 parent 0f813d6 commit b4ad524

File tree

2 files changed

+10
-32
lines changed

2 files changed

+10
-32
lines changed

Sources/_OpenAPIGeneratorCore/Translator/Responses/HTTPStatusCodes.swift

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ struct HTTPStatusCodes {
2323
return "`continue`"
2424
case 101:
2525
return "switchingProtocols"
26-
case 102:
27-
return "processing"
26+
case 103:
27+
return "earlyHints"
2828
case 200:
2929
return "ok"
3030
case 201:
@@ -39,12 +39,6 @@ struct HTTPStatusCodes {
3939
return "resetContent"
4040
case 206:
4141
return "partialContent"
42-
case 207:
43-
return "multiStatus"
44-
case 208:
45-
return "alreadyReported"
46-
case 226:
47-
return "imUsed"
4842
case 300:
4943
return "multipleChoices"
5044
case 301:
@@ -55,8 +49,6 @@ struct HTTPStatusCodes {
5549
return "seeOther"
5650
case 304:
5751
return "notModified"
58-
case 305:
59-
return "useProxy"
6052
case 307:
6153
return "temporaryRedirect"
6254
case 308:
@@ -65,8 +57,6 @@ struct HTTPStatusCodes {
6557
return "badRequest"
6658
case 401:
6759
return "unauthorized"
68-
case 402:
69-
return "paymentRequired"
7060
case 403:
7161
return "forbidden"
7262
case 404:
@@ -88,7 +78,7 @@ struct HTTPStatusCodes {
8878
case 412:
8979
return "preconditionFailed"
9080
case 413:
91-
return "payloadTooLarge"
81+
return "contentTooLarge"
9282
case 414:
9383
return "uriTooLong"
9484
case 415:
@@ -97,16 +87,12 @@ struct HTTPStatusCodes {
9787
return "rangeNotSatisfiable"
9888
case 417:
9989
return "expectationFailed"
100-
case 418:
101-
return "imATeapot"
10290
case 421:
10391
return "misdirectedRequest"
10492
case 422:
105-
return "unprocessableEntity"
106-
case 423:
107-
return "locked"
108-
case 424:
109-
return "failedDependency"
93+
return "unprocessableContent"
94+
case 425:
95+
return "tooEarly"
11096
case 426:
11197
return "upgradeRequired"
11298
case 428:
@@ -129,14 +115,6 @@ struct HTTPStatusCodes {
129115
return "gatewayTimeout"
130116
case 505:
131117
return "httpVersionNotSupported"
132-
case 506:
133-
return "variantAlsoNegotiates"
134-
case 507:
135-
return "insufficientStorage"
136-
case 508:
137-
return "loopDetected"
138-
case 510:
139-
return "notExtended"
140118
case 511:
141119
return "networkAuthenticationRequired"
142120
default:

Sources/_OpenAPIGeneratorCore/Translator/Responses/ResponseKind.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ enum ResponseKind {
3535
/// Successful responses.
3636
case _2XX
3737

38-
/// Redirect responses.
38+
/// Redirection responses.
3939
case _3XX
4040

4141
/// Client error responses.
@@ -101,11 +101,11 @@ enum ResponseKind {
101101
var prettyName: String {
102102
switch self {
103103
case ._1XX:
104-
return "information"
104+
return "informational"
105105
case ._2XX:
106-
return "success"
106+
return "successful"
107107
case ._3XX:
108-
return "redirect"
108+
return "redirection"
109109
case ._4XX:
110110
return "clientError"
111111
case ._5XX:

0 commit comments

Comments
 (0)