diff --git a/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache b/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache index 2630944598bc..94dc810006a6 100644 --- a/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache @@ -8,7 +8,7 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} struct APIHelper { {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ import Foundation } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ import Foundation return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/modules/openapi-generator/src/main/resources/swift5/APIs.mustache b/modules/openapi-generator/src/main/resources/swift5/APIs.mustache index d672115546f9..42bdf74007f1 100644 --- a/modules/openapi-generator/src/main/resources/swift5/APIs.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/APIs.mustache @@ -52,7 +52,7 @@ import Foundation } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() -> Self { - self.credential = {{projectName}}API.credential + credential = {{projectName}}API.credential return self } } diff --git a/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache b/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache index d5b1c1e0a299..554418a5ee6d 100644 --- a/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/CodableHelper.mustache @@ -8,41 +8,42 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache b/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache index 47c874815b95..78f54279711d 100644 --- a/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/Configuration.mustache @@ -7,10 +7,8 @@ import Foundation {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache b/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache index 0e00b556e8d6..d173f21077b2 100644 --- a/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/Package.swift.mustache @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "{{projectName}}", - targets: ["{{projectName}}"]), + targets: ["{{projectName}}"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache index ef593fe75973..71e9670965bf 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache @@ -117,14 +117,14 @@ private var managerStore = SynchronizedDictionary [String: String] { var httpHeaders = SessionManager.defaultHTTPHeaders - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } return httpHeaders @@ -317,7 +317,7 @@ private var managerStore = SynchronizedDictionary URLRequest { let urlRequest = try urlRequest.asURLRequest() - return self.encode(urlRequest, with: parameters) + return encode(urlRequest, with: parameters) } } diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache index 594e9c7c1cd9..896871b8d7ec 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/urlsession/URLSessionImplementations.mustache @@ -209,11 +209,11 @@ private var urlSessionStore = SynchronizedDictionary() let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ private var urlSessionStore = SynchronizedDictionary() } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ private var urlSessionStore = SynchronizedDictionary() {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in {{projectName}}API.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/alamofireLibrary/Package.swift b/samples/client/petstore/swift5/alamofireLibrary/Package.swift index 9371b3d57bd4..1bf8d9cfdd26 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/Package.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/Package.swift @@ -8,25 +8,26 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.1") + .package(url: "https://github.com/Alamofire/Alamofire.git", from: "4.9.1"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "PetstoreClient", - dependencies: ["Alamofire" ], + dependencies: ["Alamofire", ], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj index a03104894c7c..247eae5b0c52 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,7 +495,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 6ee033b07f37..c6beeedf9a4b 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -49,7 +49,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift index 9685c32b69ea..a92b70c427ba 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift @@ -9,11 +9,11 @@ import Alamofire class AlamofireRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return AlamofireRequestBuilder.self + AlamofireRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return AlamofireDecodableRequestBuilder.self + AlamofireDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class AlamofireRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -73,7 +73,7 @@ open class AlamofireRequestBuilder: RequestBuilder { configuration (e.g. to override the cache policy). */ open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest { - return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers) + manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers) } override open func execute(_ apiResponseQueue: DispatchQueue = PetstoreClientAPI.apiResponseQueue, _ completion: @escaping (_ result: Swift.Result, Error>) -> Void) { @@ -117,14 +117,14 @@ open class AlamofireRequestBuilder: RequestBuilder { fatalError("Unprocessable value \(v) with key \(k)") } } - }, to: URLString, method: xMethod, headers: nil, encodingCompletion: { encodingResult in + }, to: URLString, method: xMethod, headers: nil, encodingCompletion: { encodingResult in switch encodingResult { - case .success(let upload, _, _): + case let .success(upload, _, _): if let onProgressReady = self.onProgressReady { onProgressReady(upload.uploadProgress) } self.processRequest(request: upload, managerId, apiResponseQueue, completion) - case .failure(let encodingError): + case let .failure(encodingError): apiResponseQueue.async { completion(.failure(ErrorResponse.error(415, nil, nil, encodingError))) } @@ -159,7 +159,7 @@ open class AlamofireRequestBuilder: RequestBuilder { switch T.self { case is String.Type: - validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { (stringResponse) in + validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { stringResponse in cleanupRequest() switch stringResponse.result { @@ -171,7 +171,7 @@ open class AlamofireRequestBuilder: RequestBuilder { }) case is URL.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { dataResponse in cleanupRequest() do { @@ -209,13 +209,13 @@ open class AlamofireRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, dataResponse.data, dataResponse.response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, dataResponse.data, dataResponse.response, error))) } return }) case is Void.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (voidResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { voidResponse in cleanupRequest() switch voidResponse.result { @@ -227,7 +227,7 @@ open class AlamofireRequestBuilder: RequestBuilder { }) default: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { dataResponse in cleanupRequest() switch dataResponse.result { @@ -243,7 +243,7 @@ open class AlamofireRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders = SessionManager.defaultHTTPHeaders - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } return httpHeaders @@ -317,7 +317,7 @@ open class AlamofireDecodableRequestBuilder: AlamofireRequestBuild switch T.self { case is String.Type: - validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { (stringResponse) in + validatedRequest.responseString(queue: apiResponseQueue, completionHandler: { stringResponse in cleanupRequest() switch stringResponse.result { @@ -329,7 +329,7 @@ open class AlamofireDecodableRequestBuilder: AlamofireRequestBuild }) case is Void.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (voidResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { voidResponse in cleanupRequest() switch voidResponse.result { @@ -341,7 +341,7 @@ open class AlamofireDecodableRequestBuilder: AlamofireRequestBuild }) case is Data.Type: - validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { (dataResponse) in + validatedRequest.responseData(queue: apiResponseQueue, completionHandler: { dataResponse in cleanupRequest() switch dataResponse.result { @@ -402,6 +402,6 @@ extension JSONDataEncoding: ParameterEncoding { public func encode(_ urlRequest: URLRequestConvertible, with parameters: Parameters?) throws -> URLRequest { let urlRequest = try urlRequest.asURLRequest() - return self.encode(urlRequest, with: parameters) + return encode(urlRequest, with: parameters) } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/combineLibrary/Package.swift b/samples/client/petstore/swift5/combineLibrary/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/combineLibrary/Package.swift +++ b/samples/client/petstore/swift5/combineLibrary/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/default/Package.swift b/samples/client/petstore/swift5/default/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/default/Package.swift +++ b/samples/client/petstore/swift5/default/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/default/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/deprecated/Package.swift b/samples/client/petstore/swift5/deprecated/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/deprecated/Package.swift +++ b/samples/client/petstore/swift5/deprecated/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj index bb500a9c713e..f5af581f9fb6 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient.xcodeproj/project.pbxproj @@ -224,7 +224,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -307,7 +307,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift index 71c2a2fa5b7c..57308c82f8ed 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/nonPublicApi/Package.swift b/samples/client/petstore/swift5/nonPublicApi/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/nonPublicApi/Package.swift +++ b/samples/client/petstore/swift5/nonPublicApi/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index ddd555e5daa5..5d8f35bff492 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation internal struct APIHelper { internal static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ internal struct APIHelper { } internal static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ internal struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } internal static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } internal static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift index f5569a9fdf31..026f2295d319 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ internal class RequestBuilder { } internal func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index 280238b8263d..5055cd5ce803 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation internal class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() internal static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } internal static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } internal static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } internal class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } internal class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 4dfbe7b0cde7..3b39a978be4a 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation internal class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") internal static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift index e5511b3aa373..a6a3cf54df1e 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 11378e5653f3..c9bd304a6de2 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ internal func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ internal class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { internal func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg internal enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/objcCompatible/Package.swift b/samples/client/petstore/swift5/objcCompatible/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/objcCompatible/Package.swift +++ b/samples/client/petstore/swift5/objcCompatible/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/promisekitLibrary/Package.swift b/samples/client/petstore/swift5/promisekitLibrary/Package.swift index 4445c9794907..959c7bdaf458 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/Package.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/Package.swift @@ -8,25 +8,26 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.12.0") + .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.12.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages which this package depends on. .target( name: "PetstoreClient", - dependencies: ["PromiseKit" ], + dependencies: ["PromiseKit", ], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj index 7664d648f4f5..144cd4d8e944 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,7 +495,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 736702ea5dd9..31bfaa0255f8 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -8,35 +8,35 @@ import Foundation import PromiseKit extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -49,7 +49,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -65,32 +65,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -98,11 +98,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -175,7 +175,7 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/readonlyProperties/Package.swift b/samples/client/petstore/swift5/readonlyProperties/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/readonlyProperties/Package.swift +++ b/samples/client/petstore/swift5/readonlyProperties/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/resultLibrary/Package.swift b/samples/client/petstore/swift5/resultLibrary/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/resultLibrary/Package.swift +++ b/samples/client/petstore/swift5/resultLibrary/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/rxswiftLibrary/Package.swift b/samples/client/petstore/swift5/rxswiftLibrary/Package.swift index 24f9a6c99ae5..e774d3e15c77 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/Package.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/Package.swift @@ -8,17 +8,18 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0") + .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0"), ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -27,6 +28,6 @@ let package = Package( name: "PetstoreClient", dependencies: ["RxSwift"], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj index a039b69cf53f..eb19c9c18571 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -408,7 +408,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -495,7 +495,7 @@ ); INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Package.swift b/samples/client/petstore/swift5/urlsessionLibrary/Package.swift index 96dfff54edf4..b7fe4734aa8a 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Package.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Package.swift @@ -8,13 +8,14 @@ let package = Package( .iOS(.v9), .macOS(.v10_11), .tvOS(.v9), - .watchOS(.v3) + .watchOS(.v3), ], products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "PetstoreClient", - targets: ["PetstoreClient"]) + targets: ["PetstoreClient"] + ), ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -26,6 +27,6 @@ let package = Package( name: "PetstoreClient", dependencies: [], path: "PetstoreClient/Classes" - ) + ), ] ) diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj index 0e4ec79d9849..7c3beef86d86 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient.xcodeproj/project.pbxproj @@ -364,7 +364,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -447,7 +447,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift index 1f7f2ffbe179..f7bb5274bd98 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift @@ -8,7 +8,7 @@ import Foundation public struct APIHelper { public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? { - let destination = source.reduce(into: [String: Any]()) { (result, item) in + let destination = source.reduce(into: [String: Any]()) { result, item in if let value = item.value { result[item.key] = value } @@ -21,7 +21,7 @@ public struct APIHelper { } public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] { - return source.reduce(into: [String: String]()) { (result, item) in + return source.reduce(into: [String: String]()) { result, item in if let collection = item.value as? [Any?] { result[item.key] = collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } else if let value: Any = item.value { @@ -35,27 +35,27 @@ public struct APIHelper { return nil } - return source.reduce(into: [String: Any](), { (result, item) in + return source.reduce(into: [String: Any]()) { result, item in switch item.value { case let x as Bool: result[item.key] = x.description default: result[item.key] = item.value } - }) + } } public static func mapValueToPathItem(_ source: Any) -> Any { if let collection = source as? [Any?] { - return collection.filter { $0 != nil }.map {"\($0!)"}.joined(separator: ",") + return collection.filter { $0 != nil }.map { "\($0!)" }.joined(separator: ",") } return source } public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? { - let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in + let destination = source.filter { $0.value != nil }.reduce(into: [URLQueryItem]()) { result, item in if let collection = item.value as? [Any?] { - collection.filter { $0 != nil }.map {"\($0!)"}.forEach { value in + collection.filter { $0 != nil }.map { "\($0!)" }.forEach { value in result.append(URLQueryItem(name: item.key, value: value)) } } else if let value = item.value { diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift index 3183a307a7b1..dbdab491ff7d 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift @@ -51,7 +51,7 @@ open class RequestBuilder { } open func addCredential() -> Self { - self.credential = PetstoreClientAPI.credential + credential = PetstoreClientAPI.credential return self } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift index ef971ebadc60..09c82e53e132 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift @@ -8,41 +8,42 @@ import Foundation open class CodableHelper { - private static var customDateFormatter: DateFormatter? private static var defaultDateFormatter: DateFormatter = OpenISO8601DateFormatter() + private static var customJSONDecoder: JSONDecoder? private static var defaultJSONDecoder: JSONDecoder = { let decoder = JSONDecoder() decoder.dateDecodingStrategy = .formatted(CodableHelper.dateFormatter) return decoder }() + private static var customJSONEncoder: JSONEncoder? private static var defaultJSONEncoder: JSONEncoder = { - let encoder = JSONEncoder() + let encoder = JSONEncoder() encoder.dateEncodingStrategy = .formatted(CodableHelper.dateFormatter) encoder.outputFormatting = .prettyPrinted return encoder }() public static var dateFormatter: DateFormatter { - get { return self.customDateFormatter ?? self.defaultDateFormatter } - set { self.customDateFormatter = newValue } + get { return customDateFormatter ?? defaultDateFormatter } + set { customDateFormatter = newValue } } public static var jsonDecoder: JSONDecoder { - get { return self.customJSONDecoder ?? self.defaultJSONDecoder } - set { self.customJSONDecoder = newValue } + get { return customJSONDecoder ?? defaultJSONDecoder } + set { customJSONDecoder = newValue } } public static var jsonEncoder: JSONEncoder { - get { return self.customJSONEncoder ?? self.defaultJSONEncoder } - set { self.customJSONEncoder = newValue } + get { return customJSONEncoder ?? defaultJSONEncoder } + set { customJSONEncoder = newValue } } open class func decode(_ type: T.Type, from data: Data) -> Swift.Result where T: Decodable { - return Swift.Result { try self.jsonDecoder.decode(type, from: data) } + return Swift.Result { try jsonDecoder.decode(type, from: data) } } open class func encode(_ value: T) -> Swift.Result where T: Encodable { - return Swift.Result { try self.jsonEncoder.encode(value) } + return Swift.Result { try jsonEncoder.encode(value) } } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift index 627d9adb757e..18edabbed782 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift @@ -7,10 +7,8 @@ import Foundation open class Configuration { - - // This value is used to configure the date formatter that is used to serialize dates into JSON format. - // You must set it prior to encoding any dates, and it will only be read once. - @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") + // This value is used to configure the date formatter that is used to serialize dates into JSON format. + // You must set it prior to encoding any dates, and it will only be read once. + @available(*, unavailable, message: "To set a different date format, use CodableHelper.dateFormatter instead.") public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ" - } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift index 93ed6b90b376..2c8638c35c3c 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift @@ -7,35 +7,35 @@ import Foundation extension Bool: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Float: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension Int32: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int32) } + func encodeToJSON() -> Any { NSNumber(value: self as Int32) } } extension Int64: JSONEncodable { - func encodeToJSON() -> Any { return NSNumber(value: self as Int64) } + func encodeToJSON() -> Any { NSNumber(value: self as Int64) } } extension Double: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension String: JSONEncodable { - func encodeToJSON() -> Any { return self as Any } + func encodeToJSON() -> Any { self as Any } } extension RawRepresentable where RawValue: JSONEncodable { - func encodeToJSON() -> Any { return self.rawValue as Any } + func encodeToJSON() -> Any { self.rawValue as Any } } private func encodeIfPossible(_ object: T) -> Any { @@ -48,7 +48,7 @@ private func encodeIfPossible(_ object: T) -> Any { extension Array: JSONEncodable { func encodeToJSON() -> Any { - return self.map(encodeIfPossible) + self.map(encodeIfPossible) } } @@ -64,32 +64,32 @@ extension Dictionary: JSONEncodable { extension Data: JSONEncodable { func encodeToJSON() -> Any { - return self.base64EncodedString(options: Data.Base64EncodingOptions()) + self.base64EncodedString(options: Data.Base64EncodingOptions()) } } extension Date: JSONEncodable { func encodeToJSON() -> Any { - return CodableHelper.dateFormatter.string(from: self) as Any + CodableHelper.dateFormatter.string(from: self) as Any } } extension URL: JSONEncodable { func encodeToJSON() -> Any { - return self + self } } extension UUID: JSONEncodable { func encodeToJSON() -> Any { - return self.uuidString + uuidString } } extension String: CodingKey { public var stringValue: String { - return self + self } public init?(stringValue: String) { @@ -97,11 +97,11 @@ extension String: CodingKey { } public var intValue: Int? { - return nil + nil } public init?(intValue: Int) { - return nil + nil } } @@ -174,6 +174,6 @@ extension KeyedDecodingContainerProtocol { extension HTTPURLResponse { var isStatusCodeSuccessful: Bool { - return Array(200 ..< 300).contains(statusCode) + Array(200 ..< 300).contains(statusCode) } } diff --git a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 28bc756aa584..beb8609855d5 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -11,11 +11,11 @@ import MobileCoreServices class URLSessionRequestBuilderFactory: RequestBuilderFactory { func getNonDecodableBuilder() -> RequestBuilder.Type { - return URLSessionRequestBuilder.self + URLSessionRequestBuilder.self } func getBuilder() -> RequestBuilder.Type { - return URLSessionDecodableRequestBuilder.self + URLSessionDecodableRequestBuilder.self } } @@ -65,7 +65,7 @@ open class URLSessionRequestBuilder: RequestBuilder { the file extension). Return the desired Content-Type otherwise. */ open func contentTypeForFormPart(fileURL: URL) -> String? { - return nil + nil } /** @@ -209,11 +209,11 @@ open class URLSessionRequestBuilder: RequestBuilder { let fileManager = FileManager.default let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask)[0] - let requestURL = try self.getURL(from: urlRequest) + let requestURL = try getURL(from: urlRequest) - var requestPath = try self.getPath(from: requestURL) + var requestPath = try getPath(from: requestURL) - if let headerFileName = self.getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { + if let headerFileName = getFileName(fromContentDisposition: httpResponse.allHeaderFields["Content-Disposition"] as? String) { requestPath = requestPath.appending("/\(headerFileName)") } @@ -227,7 +227,7 @@ open class URLSessionRequestBuilder: RequestBuilder { } catch let requestParserError as DownloadException { completion(.failure(ErrorResponse.error(400, data, response, requestParserError))) - } catch let error { + } catch { completion(.failure(ErrorResponse.error(400, data, response, error))) } @@ -244,7 +244,7 @@ open class URLSessionRequestBuilder: RequestBuilder { open func buildHeaders() -> [String: String] { var httpHeaders: [String: String] = [:] - for (key, value) in self.headers { + for (key, value) in headers { httpHeaders[key] = value } for (key, value) in PetstoreClientAPI.customHeaders { @@ -390,13 +390,13 @@ private class SessionDelegate: NSObject, URLSessionDelegate, URLSessionDataDeleg public enum HTTPMethod: String { case options = "OPTIONS" - case get = "GET" - case head = "HEAD" - case post = "POST" - case put = "PUT" - case patch = "PATCH" - case delete = "DELETE" - case trace = "TRACE" + case get = "GET" + case head = "HEAD" + case post = "POST" + case put = "PUT" + case patch = "PATCH" + case delete = "DELETE" + case trace = "TRACE" case connect = "CONNECT" } @@ -499,7 +499,7 @@ private class FormDataEncoding: ParameterEncoding { let fileData = try Data(contentsOf: fileURL) - let mimetype = self.contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) + let mimetype = contentTypeForFormPart(fileURL) ?? mimeType(for: fileURL) let fileName = fileURL.lastPathComponent