Removed some of the new public methods added for creating a socket-path based request

Motivation:

I previously added too much new public API that will most likely not be necessary, and can be better accessed using a generic execute method.

Modifications:

Removed the get/post/patch/put/delete methods that were specific to socket paths.

Result:

Less new public API.

Author: dimitribouniol

README.md

@@ -162,13 +162,13 @@ httpClient.execute(request: request, delegate: delegate).futureResult.whenSucces
 Connecting to servers bound to socket paths is easy:
 ```swift
 let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
-httpClient.get(socketPath: "/tmp/myServer.socket", url: "/path/to/resource").whenComplete (...)
+httpClient.execute(socketPath: "/tmp/myServer.socket", url: "/path/to/resource", method: .GET).whenComplete (...)
 ```
 
 Connecting over TLS to a unix domain socket path is possible as well:
 ```swift
 let httpClient = HTTPClient(eventLoopGroupProvider: .createNew)
-httpClient.post(secureSocketPath: "/tmp/myServer.socket", url: "/path/to/resource", body: .string("hello")).whenComplete (...)
+httpClient.execute(secureSocketPath: "/tmp/myServer.socket", url: "/path/to/resource", body: .string("hello"), method: .POST).whenComplete (...)
 ```
 
 Direct URLs can easily be contructed to be executed in other scenarios:

Sources/AsyncHTTPClient/HTTPClient.swift

@@ -240,28 +240,6 @@ public class HTTPClient {
         return self.execute(url: url, method: .GET, deadline: deadline, logger: logger)
     }
 
-    /// Execute `GET` request to a unix domain socket path, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - socketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func get(socketPath: String, url: String, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(socketPath: socketPath, url: url, method: .GET, deadline: deadline, logger: logger)
-    }
-
-    /// Execute `GET` request to a unix domain socket path over TLS, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - secureSocketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func get(secureSocketPath: String, url: String, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(secureSocketPath: secureSocketPath, url: url, method: .GET, deadline: deadline, logger: logger)
-    }
-
     /// Execute `POST` request using specified URL.
     ///
     /// - parameters:
@@ -283,30 +261,6 @@ public class HTTPClient {
         return self.execute(url: url, method: .POST, body: body, deadline: deadline, logger: logger)
     }
 
-    /// Execute `POST` request to a unix domain socket path, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - socketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - body: Request body.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func post(socketPath: String, url: String, body: Body? = nil, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(socketPath: socketPath, url: url, method: .POST, body: body, deadline: deadline, logger: logger)
-    }
-
-    /// Execute `POST` request to a unix domain socket path over TLS, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - secureSocketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - body: Request body.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func post(secureSocketPath: String, url: String, body: Body? = nil, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(secureSocketPath: secureSocketPath, url: url, method: .POST, body: body, deadline: deadline, logger: logger)
-    }
-
     /// Execute `PATCH` request using specified URL.
     ///
     /// - parameters:
@@ -328,30 +282,6 @@ public class HTTPClient {
         return self.execute(url: url, method: .PATCH, body: body, deadline: deadline, logger: logger)
     }
 
-    /// Execute `PATCH` request to a unix domain socket path, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - socketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - body: Request body.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func patch(socketPath: String, url: String, body: Body? = nil, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(socketPath: socketPath, url: url, method: .PATCH, body: body, deadline: deadline, logger: logger)
-    }
-
-    /// Execute `PATCH` request to a unix domain socket path over TLS, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - secureSocketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - body: Request body.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func patch(secureSocketPath: String, url: String, body: Body? = nil, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(secureSocketPath: secureSocketPath, url: url, method: .PATCH, body: body, deadline: deadline, logger: logger)
-    }
-
     /// Execute `PUT` request using specified URL.
     ///
     /// - parameters:
@@ -373,30 +303,6 @@ public class HTTPClient {
         return self.execute(url: url, method: .PUT, body: body, deadline: deadline, logger: logger)
     }
 
-    /// Execute `PUT` request to a unix domain socket path, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - socketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - body: Request body.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func put(socketPath: String, url: String, body: Body? = nil, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(socketPath: socketPath, url: url, method: .PUT, body: body, deadline: deadline, logger: logger)
-    }
-
-    /// Execute `PUT` request to a unix domain socket path over TLS, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - secureSocketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - body: Request body.
-    ///     - deadline: Point in time by which the request must complete.
-    ///     - logger: The logger to use for this request.
-    public func put(secureSocketPath: String, url: String, body: Body? = nil, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(secureSocketPath: secureSocketPath, url: url, method: .PUT, body: body, deadline: deadline, logger: logger)
-    }
-
     /// Execute `DELETE` request using specified URL.
     ///
     /// - parameters:
@@ -416,28 +322,6 @@ public class HTTPClient {
         return self.execute(url: url, method: .DELETE, deadline: deadline, logger: logger)
     }
 
-    /// Execute `DELETE` request to a unix domain socket path, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - socketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - deadline: The time when the request must have been completed by.
-    ///     - logger: The logger to use for this request.
-    public func delete(socketPath: String, url: String, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(socketPath: socketPath, url: url, method: .DELETE, deadline: deadline, logger: logger)
-    }
-
-    /// Execute `DELETE` request to a unix domain socket path over TLS, using the specified URL as the request to send to the server.
-    ///
-    /// - parameters:
-    ///     - secureSocketPath: The path to the unix domain socket to connect to.
-    ///     - url: The URL path and query that will be sent to the server.
-    ///     - deadline: The time when the request must have been completed by.
-    ///     - logger: The logger to use for this request.
-    public func delete(secureSocketPath: String, url: String, deadline: NIODeadline? = nil, logger: Logger? = nil) -> EventLoopFuture<Response> {
-        return self.execute(secureSocketPath: secureSocketPath, url: url, method: .DELETE, deadline: deadline, logger: logger)
-    }
-
     /// Execute arbitrary HTTP request using specified URL.
     ///
     /// - parameters:

Tests/AsyncHTTPClientTests/HTTPClientTests.swift

@@ -237,17 +237,9 @@ class HTTPClientTests: XCTestCase {
             }
 
             XCTAssertNoThrow(XCTAssertEqual(["GET"[...]],
-                                            try self.defaultClient.get(socketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
+                                            try self.defaultClient.execute(socketPath: path, url: "echo-method", method: .GET).wait().headers[canonicalForm: "X-Method-Used"]))
             XCTAssertNoThrow(XCTAssertEqual(["POST"[...]],
-                                            try self.defaultClient.post(socketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["PATCH"[...]],
-                                            try self.defaultClient.patch(socketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["PUT"[...]],
-                                            try self.defaultClient.put(socketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["DELETE"[...]],
-                                            try self.defaultClient.delete(socketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["CHECKOUT"[...]],
-                                            try self.defaultClient.execute(socketPath: path, url: "echo-method", method: .CHECKOUT).wait().headers[canonicalForm: "X-Method-Used"]))
+                                            try self.defaultClient.execute(socketPath: path, url: "echo-method", method: .POST).wait().headers[canonicalForm: "X-Method-Used"]))
         })
     }
 
@@ -262,17 +254,9 @@ class HTTPClientTests: XCTestCase {
             }
 
             XCTAssertNoThrow(XCTAssertEqual(["GET"[...]],
-                                            try localClient.get(secureSocketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
+                                            try localClient.execute(secureSocketPath: path, url: "echo-method", method: .GET).wait().headers[canonicalForm: "X-Method-Used"]))
             XCTAssertNoThrow(XCTAssertEqual(["POST"[...]],
-                                            try localClient.post(secureSocketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["PATCH"[...]],
-                                            try localClient.patch(secureSocketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["PUT"[...]],
-                                            try localClient.put(secureSocketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["DELETE"[...]],
-                                            try localClient.delete(secureSocketPath: path, url: "echo-method").wait().headers[canonicalForm: "X-Method-Used"]))
-            XCTAssertNoThrow(XCTAssertEqual(["CHECKOUT"[...]],
-                                            try localClient.execute(secureSocketPath: path, url: "echo-method", method: .CHECKOUT).wait().headers[canonicalForm: "X-Method-Used"]))
+                                            try localClient.execute(secureSocketPath: path, url: "echo-method", method: .POST).wait().headers[canonicalForm: "X-Method-Used"]))
         })
     }