Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Alamofire #273

Merged
merged 6 commits into from
Aug 5, 2021
+233 −277
Merged

Update Alamofire #273

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24cc17b
Update Alamofire
0x0c May 23, 2021
df26260
Store upload request.
0x0c May 23, 2021
db3b8b4
Update build_spec.sh
0x0c May 24, 2021
e3e10e9
commit diffs
yonaskolb Aug 5, 2021
26526e9
update changelog
yonaskolb Aug 5, 2021
921fbe7
handle upload response
yonaskolb Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Specs/Petstore/generated/Swift/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

github "Alamofire/Alamofire" ~> 4.9.0
github "Alamofire/Alamofire" ~> 5.4.3
10 changes: 8 additions & 2 deletions Specs/Petstore/generated/Swift/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
// swift-tools-version:4.0
// swift-tools-version:5.2

import PackageDescription

let package = Package(
name: "Petstore",
platforms: [
.macOS(.v10_12),
.iOS(.v10),
.tvOS(.v10),
.watchOS(.v3)
],
products: [
.library(name: "Petstore", targets: ["Petstore"])
],
dependencies: [
.package(url: "https:/Alamofire/Alamofire.git", .exact("4.9.0")),
.package(url: "https:/Alamofire/Alamofire.git", .exact("5.4.3")),
],
targets: [
.target(name: "Petstore", dependencies: [
Expand Down
8 changes: 4 additions & 4 deletions Specs/Petstore/generated/Swift/Petstore.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Pod::Spec.new do |s|
s.version = '1.0.0'
s.homepage = 'https:/yonaskolb/SwagGen'
s.source = { :git => '[email protected]:https:/yonaskolb/SwagGen.git' }
s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '10.0'
s.tvos.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.source_files = 'Sources/**/*.swift'
s.dependency 'Alamofire', '~> 4.9.0'
s.dependency 'Alamofire', '~> 5.4.3'
end
28 changes: 6 additions & 22 deletions Specs/Petstore/generated/Swift/Sources/APIClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class APIClient {
public var baseURL: String

/// The Alamofire SessionManager used for each request
public var sessionManager: SessionManager
public var sessionManager: Session

/// These headers will get added to every request
public var defaultHeaders: [String: String]
Expand All @@ -28,7 +28,7 @@ public class APIClient {

public var decodingQueue = DispatchQueue(label: "apiClient", qos: .utility, attributes: .concurrent)

public init(baseURL: String, sessionManager: SessionManager = .default, defaultHeaders: [String: String] = [:], behaviours: [RequestBehaviour] = []) {
public init(baseURL: String, sessionManager: Session = .default, defaultHeaders: [String: String] = [:], behaviours: [RequestBehaviour] = []) {
self.baseURL = baseURL
self.sessionManager = sessionManager
self.behaviours = behaviours
Expand Down Expand Up @@ -123,24 +123,8 @@ public class APIClient {
}
}
},
with: urlRequest,
encodingCompletion: { result in
switch result {
case .success(let uploadRequest, _, _):
cancellableRequest.networkRequest = uploadRequest
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is all this still required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yonaskolb Thank you for your comment! Sorry, I'm not sure your comment so could you describe more detail?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alamofire 5 removes encodingCompletion.
https://stackoverflow.com/questions/54985001/alamofire-5-upload-encodingcompletion

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yonaskolb Oh, I got it. I have to add responseData method to handle response.
I will revise this code to as follows. Did I get that right?

cancellableRequest.networkRequest = sessionManager.upload(
    multipartFormData: { multipartFormData in
        for (name, value) in request.formParameters {
            if let file = value as? UploadFile {
                switch file.type {
                case let .url(url):
                    if let fileName = file.fileName, let mimeType = file.mimeType {
                        multipartFormData.append(url, withName: name, fileName: fileName, mimeType: mimeType)
                    } else {
                        multipartFormData.append(url, withName: name)
                    }
                case let .data(data):
                    if let fileName = file.fileName, let mimeType = file.mimeType {
                        multipartFormData.append(data, withName: name, fileName: fileName, mimeType: mimeType)
                    } else {
                        multipartFormData.append(data, withName: name)
                    }
                }
            } else if let url = value as? URL {
                multipartFormData.append(url, withName: name)
            } else if let data = value as? Data {
                multipartFormData.append(data, withName: name)
            } else if let string = value as? String {
                multipartFormData.append(Data(string.utf8), withName: name)
            }
        }
    },
    with: urlRequest
).responseData(queue: decodingQueue) { dataResponse in
    self.handleResponse(request: request, requestBehaviour: requestBehaviour, dataResponse: dataResponse, completionQueue: completionQueue, complete: complete)
}

uploadRequest.responseData { dataResponse in
self.handleResponse(request: request, requestBehaviour: requestBehaviour, dataResponse: dataResponse, completionQueue: completionQueue, complete: complete)
}
case .failure(let error):
let apiError = APIClientError.requestEncodingError(error)
requestBehaviour.onFailure(error: apiError)
let response = APIResponse<T>(request: request, result: .failure(apiError))

completionQueue.async {
complete(response)
}
}
})
with: urlRequest
)
} else {
let networkRequest = sessionManager.request(urlRequest)
.responseData(queue: decodingQueue) { dataResponse in
Expand All @@ -151,7 +135,7 @@ public class APIClient {
}
}

private func handleResponse<T>(request: APIRequest<T>, requestBehaviour: RequestBehaviourGroup, dataResponse: DataResponse<Data>, completionQueue: DispatchQueue, complete: @escaping (APIResponse<T>) -> Void) {
private func handleResponse<T>(request: APIRequest<T>, requestBehaviour: RequestBehaviourGroup, dataResponse: AFDataResponse<Data>, completionQueue: DispatchQueue, complete: @escaping (APIResponse<T>) -> Void) {

let result: APIResult<T>

Expand Down Expand Up @@ -185,7 +169,7 @@ public class APIClient {
result = .failure(apiError)
requestBehaviour.onFailure(error: apiError)
}
let response = APIResponse<T>(request: request, result: result, urlRequest: dataResponse.request, urlResponse: dataResponse.response, data: dataResponse.data, timeline: dataResponse.timeline)
let response = APIResponse<T>(request: request, result: result, urlRequest: dataResponse.request, urlResponse: dataResponse.response, data: dataResponse.data, metrics: dataResponse.metrics)
requestBehaviour.onResponse(response: response.asAny())

completionQueue.async {
Expand Down
6 changes: 3 additions & 3 deletions Specs/Petstore/generated/Swift/Sources/APIResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public struct APIResponse<T: APIResponseValue> {
public let data: Data?

/// The timeline of the complete lifecycle of the request.
public let timeline: Timeline?
public let metrics: URLSessionTaskMetrics?

init(request: APIRequest<T>, result: APIResult<T>, urlRequest: URLRequest? = nil, urlResponse: HTTPURLResponse? = nil, data: Data? = nil, timeline: Timeline? = nil) {
init(request: APIRequest<T>, result: APIResult<T>, urlRequest: URLRequest? = nil, urlResponse: HTTPURLResponse? = nil, data: Data? = nil, metrics: URLSessionTaskMetrics? = nil) {
self.request = request
self.result = result
self.urlRequest = urlRequest
self.urlResponse = urlResponse
self.data = data
self.timeline = timeline
self.metrics = metrics
}
}

Expand Down
2 changes: 1 addition & 1 deletion Specs/Petstore/generated/Swift/Sources/RequestBehaviour.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ extension APIResponseValue {

extension APIResponse {
public func asAny() -> APIResponse<AnyResponseValue> {
return APIResponse<AnyResponseValue>(request: request.asAny(), result: result.map{ $0.asAny() }, urlRequest: urlRequest, urlResponse: urlResponse, data: data, timeline: timeline)
return APIResponse<AnyResponseValue>(request: request.asAny(), result: result.map{ $0.asAny() }, urlRequest: urlRequest, urlResponse: urlResponse, data: data, metrics: metrics)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Specs/PetstoreTest/generated/Swift/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

github "Alamofire/Alamofire" ~> 4.9.0
github "Alamofire/Alamofire" ~> 5.4.3
10 changes: 8 additions & 2 deletions Specs/PetstoreTest/generated/Swift/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
// swift-tools-version:4.0
// swift-tools-version:5.2

import PackageDescription

let package = Package(
name: "PetstoreTest",
platforms: [
.macOS(.v10_12),
.iOS(.v10),
.tvOS(.v10),
.watchOS(.v3)
],
products: [
.library(name: "PetstoreTest", targets: ["PetstoreTest"])
],
dependencies: [
.package(url: "https:/Alamofire/Alamofire.git", .exact("4.9.0")),
.package(url: "https:/Alamofire/Alamofire.git", .exact("5.4.3")),
],
targets: [
.target(name: "PetstoreTest", dependencies: [
Expand Down
8 changes: 4 additions & 4 deletions Specs/PetstoreTest/generated/Swift/PetstoreTest.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Pod::Spec.new do |s|
s.version = '1.0.0'
s.homepage = 'https:/yonaskolb/SwagGen'
s.source = { :git => '[email protected]:https:/yonaskolb/SwagGen.git' }
s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '10.0'
s.tvos.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.source_files = 'Sources/**/*.swift'
s.dependency 'Alamofire', '~> 4.9.0'
s.dependency 'Alamofire', '~> 5.4.3'
end
28 changes: 6 additions & 22 deletions Specs/PetstoreTest/generated/Swift/Sources/APIClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class APIClient {
public var baseURL: String

/// The Alamofire SessionManager used for each request
public var sessionManager: SessionManager
public var sessionManager: Session

/// These headers will get added to every request
public var defaultHeaders: [String: String]
Expand All @@ -28,7 +28,7 @@ public class APIClient {

public var decodingQueue = DispatchQueue(label: "apiClient", qos: .utility, attributes: .concurrent)

public init(baseURL: String, sessionManager: SessionManager = .default, defaultHeaders: [String: String] = [:], behaviours: [RequestBehaviour] = []) {
public init(baseURL: String, sessionManager: Session = .default, defaultHeaders: [String: String] = [:], behaviours: [RequestBehaviour] = []) {
self.baseURL = baseURL
self.sessionManager = sessionManager
self.behaviours = behaviours
Expand Down Expand Up @@ -123,24 +123,8 @@ public class APIClient {
}
}
},
with: urlRequest,
encodingCompletion: { result in
switch result {
case .success(let uploadRequest, _, _):
cancellableRequest.networkRequest = uploadRequest
uploadRequest.responseData { dataResponse in
self.handleResponse(request: request, requestBehaviour: requestBehaviour, dataResponse: dataResponse, completionQueue: completionQueue, complete: complete)
}
case .failure(let error):
let apiError = APIClientError.requestEncodingError(error)
requestBehaviour.onFailure(error: apiError)
let response = APIResponse<T>(request: request, result: .failure(apiError))

completionQueue.async {
complete(response)
}
}
})
with: urlRequest
)
} else {
let networkRequest = sessionManager.request(urlRequest)
.responseData(queue: decodingQueue) { dataResponse in
Expand All @@ -151,7 +135,7 @@ public class APIClient {
}
}

private func handleResponse<T>(request: APIRequest<T>, requestBehaviour: RequestBehaviourGroup, dataResponse: DataResponse<Data>, completionQueue: DispatchQueue, complete: @escaping (APIResponse<T>) -> Void) {
private func handleResponse<T>(request: APIRequest<T>, requestBehaviour: RequestBehaviourGroup, dataResponse: AFDataResponse<Data>, completionQueue: DispatchQueue, complete: @escaping (APIResponse<T>) -> Void) {

let result: APIResult<T>

Expand Down Expand Up @@ -185,7 +169,7 @@ public class APIClient {
result = .failure(apiError)
requestBehaviour.onFailure(error: apiError)
}
let response = APIResponse<T>(request: request, result: result, urlRequest: dataResponse.request, urlResponse: dataResponse.response, data: dataResponse.data, timeline: dataResponse.timeline)
let response = APIResponse<T>(request: request, result: result, urlRequest: dataResponse.request, urlResponse: dataResponse.response, data: dataResponse.data, metrics: dataResponse.metrics)
requestBehaviour.onResponse(response: response.asAny())

completionQueue.async {
Expand Down
6 changes: 3 additions & 3 deletions Specs/PetstoreTest/generated/Swift/Sources/APIResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public struct APIResponse<T: APIResponseValue> {
public let data: Data?

/// The timeline of the complete lifecycle of the request.
public let timeline: Timeline?
public let metrics: URLSessionTaskMetrics?

init(request: APIRequest<T>, result: APIResult<T>, urlRequest: URLRequest? = nil, urlResponse: HTTPURLResponse? = nil, data: Data? = nil, timeline: Timeline? = nil) {
init(request: APIRequest<T>, result: APIResult<T>, urlRequest: URLRequest? = nil, urlResponse: HTTPURLResponse? = nil, data: Data? = nil, metrics: URLSessionTaskMetrics? = nil) {
self.request = request
self.result = result
self.urlRequest = urlRequest
self.urlResponse = urlResponse
self.data = data
self.timeline = timeline
self.metrics = metrics
}
}

Expand Down
2 changes: 1 addition & 1 deletion Specs/PetstoreTest/generated/Swift/Sources/RequestBehaviour.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ extension APIResponseValue {

extension APIResponse {
public func asAny() -> APIResponse<AnyResponseValue> {
return APIResponse<AnyResponseValue>(request: request.asAny(), result: result.map{ $0.asAny() }, urlRequest: urlRequest, urlResponse: urlResponse, data: data, timeline: timeline)
return APIResponse<AnyResponseValue>(request: request.asAny(), result: result.map{ $0.asAny() }, urlRequest: urlRequest, urlResponse: urlResponse, data: data, metrics: metrics)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Specs/Rocket/generated/Swift/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

github "Alamofire/Alamofire" ~> 4.9.0
github "Alamofire/Alamofire" ~> 5.4.3
10 changes: 8 additions & 2 deletions Specs/Rocket/generated/Swift/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
// swift-tools-version:4.0
// swift-tools-version:5.2

import PackageDescription

let package = Package(
name: "Rocket",
platforms: [
.macOS(.v10_12),
.iOS(.v10),
.tvOS(.v10),
.watchOS(.v3)
],
products: [
.library(name: "Rocket", targets: ["Rocket"])
],
dependencies: [
.package(url: "https:/Alamofire/Alamofire.git", .exact("4.9.0")),
.package(url: "https:/Alamofire/Alamofire.git", .exact("5.4.3")),
],
targets: [
.target(name: "Rocket", dependencies: [
Expand Down
8 changes: 4 additions & 4 deletions Specs/Rocket/generated/Swift/Rocket.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ best suits the application they are developing.
s.version = '1.0.0'
s.homepage = 'https:/yonaskolb/SwagGen'
s.source = { :git => '[email protected]:https:/yonaskolb/SwagGen.git' }
s.ios.deployment_target = '9.0'
s.tvos.deployment_target = '9.0'
s.osx.deployment_target = '10.9'
s.ios.deployment_target = '10.0'
s.tvos.deployment_target = '10.0'
s.osx.deployment_target = '10.12'
s.source_files = 'Sources/**/*.swift'
s.dependency 'Alamofire', '~> 4.9.0'
s.dependency 'Alamofire', '~> 5.4.3'
end
28 changes: 6 additions & 22 deletions Specs/Rocket/generated/Swift/Sources/APIClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class APIClient {
public var baseURL: String

/// The Alamofire SessionManager used for each request
public var sessionManager: SessionManager
public var sessionManager: Session

/// These headers will get added to every request
public var defaultHeaders: [String: String]
Expand All @@ -28,7 +28,7 @@ public class APIClient {

public var decodingQueue = DispatchQueue(label: "apiClient", qos: .utility, attributes: .concurrent)

public init(baseURL: String, sessionManager: SessionManager = .default, defaultHeaders: [String: String] = [:], behaviours: [RequestBehaviour] = []) {
public init(baseURL: String, sessionManager: Session = .default, defaultHeaders: [String: String] = [:], behaviours: [RequestBehaviour] = []) {
self.baseURL = baseURL
self.sessionManager = sessionManager
self.behaviours = behaviours
Expand Down Expand Up @@ -123,24 +123,8 @@ public class APIClient {
}
}
},
with: urlRequest,
encodingCompletion: { result in
switch result {
case .success(let uploadRequest, _, _):
cancellableRequest.networkRequest = uploadRequest
uploadRequest.responseData { dataResponse in
self.handleResponse(request: request, requestBehaviour: requestBehaviour, dataResponse: dataResponse, completionQueue: completionQueue, complete: complete)
}
case .failure(let error):
let apiError = APIClientError.requestEncodingError(error)
requestBehaviour.onFailure(error: apiError)
let response = APIResponse<T>(request: request, result: .failure(apiError))

completionQueue.async {
complete(response)
}
}
})
with: urlRequest
)
} else {
let networkRequest = sessionManager.request(urlRequest)
.responseData(queue: decodingQueue) { dataResponse in
Expand All @@ -151,7 +135,7 @@ public class APIClient {
}
}

private func handleResponse<T>(request: APIRequest<T>, requestBehaviour: RequestBehaviourGroup, dataResponse: DataResponse<Data>, completionQueue: DispatchQueue, complete: @escaping (APIResponse<T>) -> Void) {
private func handleResponse<T>(request: APIRequest<T>, requestBehaviour: RequestBehaviourGroup, dataResponse: AFDataResponse<Data>, completionQueue: DispatchQueue, complete: @escaping (APIResponse<T>) -> Void) {

let result: APIResult<T>

Expand Down Expand Up @@ -185,7 +169,7 @@ public class APIClient {
result = .failure(apiError)
requestBehaviour.onFailure(error: apiError)
}
let response = APIResponse<T>(request: request, result: result, urlRequest: dataResponse.request, urlResponse: dataResponse.response, data: dataResponse.data, timeline: dataResponse.timeline)
let response = APIResponse<T>(request: request, result: result, urlRequest: dataResponse.request, urlResponse: dataResponse.response, data: dataResponse.data, metrics: dataResponse.metrics)
requestBehaviour.onResponse(response: response.asAny())

completionQueue.async {
Expand Down
6 changes: 3 additions & 3 deletions Specs/Rocket/generated/Swift/Sources/APIResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public struct APIResponse<T: APIResponseValue> {
public let data: Data?

/// The timeline of the complete lifecycle of the request.
public let timeline: Timeline?
public let metrics: URLSessionTaskMetrics?

init(request: APIRequest<T>, result: APIResult<T>, urlRequest: URLRequest? = nil, urlResponse: HTTPURLResponse? = nil, data: Data? = nil, timeline: Timeline? = nil) {
init(request: APIRequest<T>, result: APIResult<T>, urlRequest: URLRequest? = nil, urlResponse: HTTPURLResponse? = nil, data: Data? = nil, metrics: URLSessionTaskMetrics? = nil) {
self.request = request
self.result = result
self.urlRequest = urlRequest
self.urlResponse = urlResponse
self.data = data
self.timeline = timeline
self.metrics = metrics
}
}

Expand Down
2 changes: 1 addition & 1 deletion Specs/Rocket/generated/Swift/Sources/RequestBehaviour.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ extension APIResponseValue {

extension APIResponse {
public func asAny() -> APIResponse<AnyResponseValue> {
return APIResponse<AnyResponseValue>(request: request.asAny(), result: result.map{ $0.asAny() }, urlRequest: urlRequest, urlResponse: urlResponse, data: data, timeline: timeline)
return APIResponse<AnyResponseValue>(request: request.asAny(), result: result.map{ $0.asAny() }, urlRequest: urlRequest, urlResponse: urlResponse, data: data, metrics: metrics)
}
}

Expand Down
2 changes: 1 addition & 1 deletion Specs/TBX/generated/Swift/Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

github "Alamofire/Alamofire" ~> 4.9.0
github "Alamofire/Alamofire" ~> 5.4.3
Loading