Review comments and swift-format changes

apple · Dec 18, 2024 · 52618bb · 52618bb
1 parent f440264
commit 52618bb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 32 deletions.
diff --git a/Sources/OpenAPIRuntime/Errors/RuntimeError.swift b/Sources/OpenAPIRuntime/Errors/RuntimeError.swift
@@ -142,41 +142,24 @@ internal enum RuntimeError: Error, CustomStringConvertible, LocalizedError, Pret
     throw RuntimeError.unexpectedResponseBody(expectedContent: expectedContent, body: body)
 }
 
-/// HTTP Response status definition for ``RuntimeError``. 
+/// HTTP Response status definition for ``RuntimeError``.
 extension RuntimeError: HTTPResponseConvertible {
+    /// HTTP Status code corresponding to each error case
     public var httpStatus: HTTPTypes.HTTPResponse.Status {
         switch self {
-        case .invalidServerURL,
-                .invalidServerVariableValue:
-            .notFound
-        case .invalidExpectedContentType,
-                .missingCoderForCustomContentType,
-                .unexpectedContentTypeHeader:
-            .unsupportedMediaType
-        case .unexpectedAcceptHeader(_):
-            .notAcceptable
-        case .missingOrMalformedContentDispositionName:
-            .unprocessableContent
-        case .failedToDecodeStringConvertibleValue,
-                .invalidAcceptSubstring,
-                .invalidBase64String,
-                .invalidHeaderFieldName,
-                .malformedAcceptHeader,
-                .missingMultipartBoundaryContentTypeParameter,
-                .missingRequiredHeaderField,
-                .missingRequiredMultipartFormDataContentType,
-                .missingRequiredQueryParameter,
-                .missingRequiredPathParameter,
-                .missingRequiredRequestBody,
-                .pathUnset,
-                .unsupportedParameterStyle:
+        case .invalidServerURL, .invalidServerVariableValue: .notFound
+        case .invalidExpectedContentType, .unexpectedContentTypeHeader: .unsupportedMediaType
+        case .missingCoderForCustomContentType: .unprocessableContent
+        case .unexpectedAcceptHeader: .notAcceptable
+        case .failedToDecodeStringConvertibleValue, .invalidAcceptSubstring, .invalidBase64String,
+            .invalidHeaderFieldName, .malformedAcceptHeader, .missingMultipartBoundaryContentTypeParameter,
+            .missingOrMalformedContentDispositionName, .missingRequiredHeaderField,
+            .missingRequiredMultipartFormDataContentType, .missingRequiredQueryParameter, .missingRequiredPathParameter,
+            .missingRequiredRequestBody, .unsupportedParameterStyle:
             .badRequest
-        case .handlerFailed,
-                .middlewareFailed,
-                .missingRequiredResponseBody,
-                .transportFailed,
-                .unexpectedResponseStatus,
-                .unexpectedResponseBody:
+        case .pathUnset: .notFound
+        case .handlerFailed, .middlewareFailed, .missingRequiredResponseBody, .transportFailed,
+            .unexpectedResponseStatus, .unexpectedResponseBody:
             .internalServerError
         }
     }

diff --git a/Tests/OpenAPIRuntimeTests/Errors/Test_RuntimeError.swift b/Tests/OpenAPIRuntimeTests/Errors/Test_RuntimeError.swift
@@ -19,7 +19,7 @@ import XCTest
 struct MockRuntimeErrorHandler: Sendable {
     var failWithError: (any Error)? = nil
     func greet(_ input: String) async throws -> String {
-        if failWithError != nil { throw failWithError! }
+        if let failWithError { throw failWithError }
         guard input == "hello" else { throw TestError() }
         return "bye"
     }