Skip to content
This repository has been archived by the owner on Dec 10, 2024. It is now read-only.

fixed inconsistent argument order in delete() and get() #50

Merged
merged 2 commits into from
Oct 21, 2016
Merged

fixed inconsistent argument order in delete() and get() #50

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221599a
fixed inconsistent argument order in delete() and get()
Oct 20, 2016
f726593
matched argument order of JustAdaptor in all relevant methods
Oct 20, 2016
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
22 changes: 11 additions & 11 deletions Sources/Just/Just.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,11 +491,11 @@ extension JustOf {
headers: [String: String] = [:],
files: [String: HTTPFile] = [:],
auth: (String, String)? = nil,
allowRedirects: Bool = true,
cookies: [String: String] = [:],
allowRedirects: Bool = true,
timeout: Double? = nil,
requestBody: Data? = nil,
URLQuery: String? = nil,
requestBody: Data? = nil,
asyncProgressHandler: (TaskProgressHandler)? = nil,
asyncCompletionHandler: ((HTTPResult) -> Void)? = nil
) -> HTTPResult {
Expand Down Expand Up @@ -531,8 +531,8 @@ extension JustOf {
cookies: [String: String] = [:],
allowRedirects: Bool = true,
timeout: Double? = nil,
requestBody: Data? = nil,
URLQuery: String? = nil,
requestBody: Data? = nil,
asyncProgressHandler: (TaskProgressHandler)? = nil,
asyncCompletionHandler: ((HTTPResult) -> Void)? = nil
) -> HTTPResult {
Expand Down Expand Up @@ -568,8 +568,8 @@ extension JustOf {
cookies: [String: String] = [:],
allowRedirects: Bool = true,
timeout: Double? = nil,
requestBody: Data? = nil,
URLQuery: String? = nil,
requestBody: Data? = nil,
asyncProgressHandler: (TaskProgressHandler)? = nil,
asyncCompletionHandler: ((HTTPResult) -> Void)? = nil
) -> HTTPResult {
Expand Down Expand Up @@ -604,8 +604,8 @@ extension JustOf {
cookies: [String: String] = [:],
allowRedirects: Bool = true,
timeout: Double? = nil,
requestBody: Data? = nil,
URLQuery: String? = nil,
requestBody: Data? = nil,
asyncProgressHandler: (TaskProgressHandler)? = nil,
asyncCompletionHandler: ((HTTPResult) -> Void)? = nil
) -> HTTPResult {
Expand Down Expand Up @@ -641,8 +641,8 @@ extension JustOf {
cookies: [String: String] = [:],
allowRedirects: Bool = true,
timeout: Double? = nil,
requestBody: Data? = nil,
URLQuery: String? = nil,
requestBody: Data? = nil,
asyncProgressHandler: (TaskProgressHandler)? = nil,
asyncCompletionHandler: ((HTTPResult) -> Void)? = nil
) -> HTTPResult {
Expand Down Expand Up @@ -678,8 +678,8 @@ extension JustOf {
cookies: [String: String] = [:],
allowRedirects: Bool = true,
timeout: Double? = nil,
requestBody: Data? = nil,
URLQuery: String? = nil,
requestBody: Data? = nil,
asyncProgressHandler: (TaskProgressHandler)? = nil,
asyncCompletionHandler: ((HTTPResult) -> Void)? = nil
) -> HTTPResult {
Expand Down Expand Up @@ -861,8 +861,8 @@ public final class HTTP: NSObject, URLSessionDelegate, JustAdaptor {
files: [String: HTTPFile],
auth: Credentials?,
timeout: Double?,
requestBody: Data?,
URLQuery: String?
URLQuery: String?,
requestBody: Data?
) -> URLRequest? {
if let urlComponent = NSURLComponents(string: URLString) {
let queryString = query(params)
Expand Down Expand Up @@ -959,8 +959,8 @@ public final class HTTP: NSObject, URLSessionDelegate, JustAdaptor {
dictionary: headers)
guard let request = synthesizeRequest(method, URLString: URLString,
params: params, data: data, json: json, headers: caseInsensitiveHeaders,
files: files, auth: auth, timeout: timeout, requestBody: requestBody,
URLQuery: URLQuery) else
files: files, auth: auth, timeout: timeout, URLQuery: URLQuery,
requestBody: requestBody) else
{
let erronousResult = HTTPResult(data: nil, response: nil,
error: invalidURLError, task: nil)
Expand Down