Commit b72ea357 authored by octal's avatar octal

Some code cleanup

parent 6d35e560
...@@ -98,9 +98,8 @@ public: ...@@ -98,9 +98,8 @@ public:
friend class Private::Parser<Http::Request>; friend class Private::Parser<Http::Request>;
friend class RequestBuilder; friend class RequestBuilder;
// @Todo: try to remove the need for friend-ness here
friend class Client; friend class Client;
friend class ResponseWriter;
friend class Timeout;
Request(const Request& other) = default; Request(const Request& other) = default;
Request& operator=(const Request& other) = default; Request& operator=(const Request& other) = default;
...@@ -154,6 +153,7 @@ private: ...@@ -154,6 +153,7 @@ private:
class RequestBuilder { class RequestBuilder {
public: public:
RequestBuilder& method(Method method);
RequestBuilder& resource(std::string val); RequestBuilder& resource(std::string val);
RequestBuilder& params(const Uri::Query& query); RequestBuilder& params(const Uri::Query& query);
RequestBuilder& header(const std::shared_ptr<Header::Header>& header); RequestBuilder& header(const std::shared_ptr<Header::Header>& header);
...@@ -172,6 +172,7 @@ public: ...@@ -172,6 +172,7 @@ public:
const Request& request() const { return request_; } const Request& request() const { return request_; }
operator Request() const { return request_; } operator Request() const { return request_; }
private: private:
Request request_; Request request_;
}; };
...@@ -236,11 +237,6 @@ public: ...@@ -236,11 +237,6 @@ public:
} }
private: private:
Timeout()
: handler(nullptr)
, transport(nullptr)
{ }
Timeout(Tcp::Transport* transport, Timeout(Tcp::Transport* transport,
Handler* handler, Handler* handler,
Request request) Request request)
...@@ -520,12 +516,6 @@ public: ...@@ -520,12 +516,6 @@ public:
} }
private: private:
ResponseWriter()
: Response()
, buf_(0)
, transport_(nullptr)
{ }
ResponseWriter(Tcp::Transport* transport, Request request, Handler* handler) ResponseWriter(Tcp::Transport* transport, Request request, Handler* handler)
: Response(request.version()) : Response(request.version())
, buf_(DefaultStreamSize) , buf_(DefaultStreamSize)
......
...@@ -382,33 +382,6 @@ Connection::perform( ...@@ -382,33 +382,6 @@ Connection::perform(
}); });
} }
#if 0
struct OnRequestWriteCompleted {
OnRequestWriteCompleted(
const std::shared_ptr<Transport>& transport,
Fd fd,
Async::Resolver resolve, Async::Rejection reject,
Connection::OnDone onDone)
: transport(transport)
, fd(fd)
, resolve(std::move(resolve))
, reject(std::move(reject))
, onDone(std::move(onDone))
{ }
void operator()(size_t bytes) {
transport->addInFlight(fd, std::move(resolve), std::move(reject));
onDone();
}
std::shared_ptr<Transport> transport;
Fd fd;
Async::Resolver resolve;
Async::Rejection reject;
Connection::OnDone onDone;
};
#endif
void void
Connection::performImpl( Connection::performImpl(
const Http::Request& request, const Http::Request& request,
...@@ -423,9 +396,6 @@ Connection::performImpl( ...@@ -423,9 +396,6 @@ Connection::performImpl(
reject(std::runtime_error("Could not write request")); reject(std::runtime_error("Could not write request"));
auto buffer = buf.buffer(); auto buffer = buf.buffer();
#if 0
OnRequestWriteCompleted onCompleted(transport_, fd, std::move(resolve), std::move(reject), std::move(onDone));
#endif
transport_->asyncSendRequest(fd, buffer, std::move(resolve), std::move(reject), std::move(onDone)); transport_->asyncSendRequest(fd, buffer, std::move(resolve), std::move(reject), std::move(onDone));
} }
......
...@@ -559,6 +559,13 @@ Request::peer() const { ...@@ -559,6 +559,13 @@ Request::peer() const {
} }
#endif #endif
RequestBuilder&
RequestBuilder::method(Method method)
{
request_.method_ = method;
return *this;
}
RequestBuilder& RequestBuilder&
RequestBuilder::resource(std::string val) { RequestBuilder::resource(std::string val) {
request_.resource_ = std::move(val); request_.resource_ = std::move(val);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment