Code format fixes

Author: kstefanou52

Sources/OpenAPIRuntime/Conversion/ParameterStyles.swift

@@ -26,7 +26,6 @@
     ///
     /// Details: https://datatracker.ietf.org/doc/html/rfc6570#section-3.2.2
     case simple
-    
     /// The deepObject style.
     ///
     /// Details: https://spec.openapis.org/oas/v3.1.0.html#style-values

Sources/OpenAPIRuntime/URICoder/Common/URICoderConfiguration.swift

@@ -25,7 +25,6 @@ struct URICoderConfiguration {
 
         /// A style for form-based URI expansion.
         case form
-        
         /// A style for nested variable expansion
         case deepObject
     }

Sources/OpenAPIRuntime/URICoder/Parsing/URIParser.swift

@@ -43,7 +43,6 @@ enum ParsingError: Swift.Error, Hashable {
 
     /// A malformed key-value pair was detected.
     case malformedKeyValuePair(Raw)
-    
     /// An invalid configuration was detected.
     case invalidConfiguration(String)
 }
@@ -213,7 +212,6 @@ extension URIParser {
             }
         }
     }
-    
     /// Parses the root node assuming the raw string uses the deepObject style
     /// and the explode parameter is enabled.
     /// - Returns: The parsed root node.
@@ -224,35 +222,26 @@ extension URIParser {
             let pairSeparator: Character = "&"
             let nestedKeyStartingCharacter: Character = "["
             let nestedKeyEndingCharacter: Character = "]"
-            
             func nestedKey(from deepObjectKey: String.SubSequence) -> Raw {
                 var unescapedDeepObjectKey = Substring(deepObjectKey.removingPercentEncoding ?? "")
                 let topLevelKey = unescapedDeepObjectKey.parseUpToCharacterOrEnd(nestedKeyStartingCharacter)
                 let nestedKey = unescapedDeepObjectKey.parseUpToCharacterOrEnd(nestedKeyEndingCharacter)
                 return nestedKey.isEmpty ? topLevelKey : nestedKey
             }
-            
             while !data.isEmpty {
                 let (firstResult, firstValue) = data.parseUpToEitherCharacterOrEnd(
                     first: keyValueSeparator,
                     second: pairSeparator
                 )
-                
-                guard case .foundFirst = firstResult else {
-                    throw ParsingError.malformedKeyValuePair(firstValue)
-                }
+                guard case .foundFirst = firstResult else { throw ParsingError.malformedKeyValuePair(firstValue) }
                 // Hit the key/value separator, so a value will follow.
                 let secondValue = data.parseUpToCharacterOrEnd(pairSeparator)
                 let key = nestedKey(from: firstValue)
                 let value = secondValue
-                
                 appendPair(key, [value])
             }
         }
-        
-        try parseNode.forEach { (key, value) in
-            if value.count > 1 { throw ParsingError.malformedKeyValuePair(key) }
-        }
+        for (key, value) in parseNode where value.count > 1 { throw ParsingError.malformedKeyValuePair(key) }
         return parseNode
     }
 }

Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift

@@ -69,13 +69,10 @@ extension URISerializer {
 
         /// Nested containers are not supported.
         case nestedContainersNotSupported
-        
         /// Deep object arrays are not supported.
         case deepObjectsArrayNotSupported
-        
         /// Deep object with primitive values are not supported.
         case deepObjectsWithPrimitiveValuesNotSupported
-        
         /// An invalid configuration was detected.
         case invalidConfiguration(String)
     }
@@ -190,8 +187,7 @@ extension URISerializer {
         case (.simple, _):
             keyAndValueSeparator = nil
             pairSeparator = ","
-        case (.deepObject, _):
-            throw SerializationError.deepObjectsArrayNotSupported
+        case (.deepObject, _): throw SerializationError.deepObjectsArrayNotSupported
         }
         func serializeNext(_ element: URIEncodedNode.Primitive) throws {
             if let keyAndValueSeparator {
@@ -263,7 +259,6 @@ extension URISerializer {
             try serializeNext(element, forKey: serializeNestedKey(elementKey, forKey: key))
             data.append(pairSeparator)
         }
-        
         if let (elementKey, element) = sortedDictionary.last {
             try serializeNext(element, forKey: serializeNestedKey(elementKey, forKey: key))
         }

Tests/OpenAPIRuntimeTests/URICoder/Encoding/Test_URIEncoder.swift

@@ -23,7 +23,6 @@ final class Test_URIEncoder: Test_Runtime {
         let encodedString = try encoder.encode(Foo(bar: "hello world"), forKey: "root")
         XCTAssertEqual(encodedString, "bar=hello+world")
     }
-    
     func testNestedEncoding() throws {
         struct Foo: Encodable { var bar: String }
         let serializer = URISerializer(configuration: .deepObjectExplode)

Tests/OpenAPIRuntimeTests/URICoder/Parsing/Test_URIParser.swift

@@ -17,7 +17,8 @@ import XCTest
 final class Test_URIParser: Test_Runtime {
 
     let testedVariants: [URICoderConfiguration] = [
-        .formExplode, .formUnexplode, .simpleExplode, .simpleUnexplode, .formDataExplode, .formDataUnexplode, .deepObjectExplode
+        .formExplode, .formUnexplode, .simpleExplode, .simpleUnexplode, .formDataExplode, .formDataUnexplode,
+        .deepObjectExplode,
     ]
 
     func testParsing() throws {
@@ -101,7 +102,7 @@ final class Test_URIParser: Test_Runtime {
                     formDataUnexplode: .custom(
                         "keys=comma,%2C,dot,.,semi,%3B",
                         value: ["keys": ["comma", ",", "dot", ".", "semi", ";"]]
-                    ), 
+                    ),
                     deepObjectExplode: "keys%5Bcomma%5D=%2C&keys%5Bdot%5D=.&keys%5Bsemi%5D=%3B"
                 ),
                 value: ["semi": [";"], "dot": ["."], "comma": [","]]
@@ -120,14 +121,8 @@ final class Test_URIParser: Test_Runtime {
                         line: testCase.line
                     )
                 } catch {
-                    guard let expectedError = input.expectedError,
-                          let parsingError = error as? ParsingError else {
-                        XCTAssert(
-                            false,
-                            "Unexpected error thrown: \(error)",
-                            file: testCase.file,
-                            line: testCase.line
-                        )
+                    guard let expectedError = input.expectedError, let parsingError = error as? ParsingError else {
+                        XCTAssert(false, "Unexpected error thrown: \(error)", file: testCase.file, line: testCase.line)
                         return
                     }
                     XCTAssertEqual(
@@ -181,7 +176,6 @@ extension Test_URIParser {
                 static func custom(_ string: String, value: URIParsedNode) -> Self {
                     .init(string: string, valueOverride: value, expectedError: nil)
                 }
-                
                 static func custom(_ string: String, expectedError: ParsingError) -> Self {
                     .init(string: string, valueOverride: nil, expectedError: expectedError)
                 }

Tests/OpenAPIRuntimeTests/URICoder/Serialization/Test_URISerializer.swift

@@ -32,10 +32,7 @@ final class Test_URISerializer: Test_Runtime {
                     simpleUnexplode: "",
                     formDataExplode: "empty=",
                     formDataUnexplode: "empty=",
-                    deepObjectExplode: .custom(
-                        "empty=",
-                        expectedError: .deepObjectsWithPrimitiveValuesNotSupported
-                    )
+                    deepObjectExplode: .custom("empty=", expectedError: .deepObjectsWithPrimitiveValuesNotSupported)
                 )
             ),
             makeCase(
@@ -48,10 +45,7 @@ final class Test_URISerializer: Test_Runtime {
                     simpleUnexplode: "fred",
                     formDataExplode: "who=fred",
                     formDataUnexplode: "who=fred",
-                    deepObjectExplode: .custom(
-                        "who=fred",
-                        expectedError: .deepObjectsWithPrimitiveValuesNotSupported
-                    )
+                    deepObjectExplode: .custom("who=fred", expectedError: .deepObjectsWithPrimitiveValuesNotSupported)
                 )
             ),
             makeCase(
@@ -64,10 +58,7 @@ final class Test_URISerializer: Test_Runtime {
                     simpleUnexplode: "1234",
                     formDataExplode: "x=1234",
                     formDataUnexplode: "x=1234",
-                    deepObjectExplode: .custom(
-                        "x=1234",
-                        expectedError: .deepObjectsWithPrimitiveValuesNotSupported
-                    )
+                    deepObjectExplode: .custom("x=1234", expectedError: .deepObjectsWithPrimitiveValuesNotSupported)
                 )
             ),
             makeCase(
@@ -80,10 +71,7 @@ final class Test_URISerializer: Test_Runtime {
                     simpleUnexplode: "12.34",
                     formDataExplode: "x=12.34",
                     formDataUnexplode: "x=12.34",
-                    deepObjectExplode: .custom(
-                        "x=12.34",
-                        expectedError: .deepObjectsWithPrimitiveValuesNotSupported
-                    )
+                    deepObjectExplode: .custom("x=12.34", expectedError: .deepObjectsWithPrimitiveValuesNotSupported)
                 )
             ),
             makeCase(
@@ -129,7 +117,7 @@ final class Test_URISerializer: Test_Runtime {
                     formDataExplode: "list=red&list=green&list=blue",
                     formDataUnexplode: "list=red,green,blue",
                     deepObjectExplode: .custom(
-                        "list=red&list=green&list=blue", 
+                        "list=red&list=green&list=blue",
                         expectedError: .deepObjectsArrayNotSupported
                     )
                 )
@@ -165,13 +153,9 @@ final class Test_URISerializer: Test_Runtime {
                     )
                 } catch {
                     guard let expectedError = input.expectedError,
-                          let serializationError = error as? URISerializer.SerializationError else {
-                        XCTAssert(
-                            false,
-                            "Unexpected error thrown: \(error)",
-                            file: testCase.file,
-                            line: testCase.line
-                        )
+                        let serializationError = error as? URISerializer.SerializationError
+                    else {
+                        XCTAssert(false, "Unexpected error thrown: \(error)", file: testCase.file, line: testCase.line)
                         return
                     }
                     XCTAssertEqual(
@@ -209,26 +193,21 @@ extension Test_URISerializer {
             static let deepObjectExplode: Self = .init(name: "deepObjectExplode", config: .deepObjectExplode)
         }
         struct Variants {
-            
             struct Input: ExpressibleByStringLiteral {
                 var string: String
                 var expectedError: URISerializer.SerializationError?
-                
                 init(string: String, expectedError: URISerializer.SerializationError? = nil) {
                     self.string = string
                     self.expectedError = expectedError
                 }
-                
                 static func custom(_ string: String, expectedError: URISerializer.SerializationError) -> Self {
                     .init(string: string, expectedError: expectedError)
                 }
-                
                 init(stringLiteral value: String) {
                     self.string = value
                     self.expectedError = nil
                 }
             }
-            
             var formExplode: Input
             var formUnexplode: Input
             var simpleExplode: Input