Simplified the HTTP client, request and response classes.

Author: glynos

http/src/http/v2/client/client.cpp

@@ -4,6 +4,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/asio/strand.hpp>
+#include <boost/asio/deadline_timer.hpp>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/range/algorithm/find_first_of.hpp>
@@ -143,8 +144,6 @@ namespace network {
           std::shared_ptr<request_context> context) {
         std::future<response> res = context->response_promise_.get_future();
 
-        // TODO see linearize.hpp
-
         // If there is no user-agent, provide one as a default.
         auto user_agent = context->request_.header("User-Agent");
         if (!user_agent) {
@@ -330,11 +329,13 @@ namespace network {
 
         // if options_.follow_redirects()
         // and if status in range 300 - 307
-        // then take the request and reset the URL
+        // then take the request and reset the URL from the 'Location' header
+        // restart connection
+        // Not that the 'Location' header can be a *relative* URI
 
         std::shared_ptr<response> res(new response{});
         res->set_version(version);
-        res->set_status(network::http::v2::status::code(status));
+        res->set_status(network::http::status::code(status));
         res->set_status_message(boost::trim_copy(message));
 
         // Read the response headers.

http/src/network/http/v2/client/client.hpp

@@ -20,8 +20,6 @@
 #include <string>
 #include <vector>
 #include <chrono>
-#include <boost/asio/io_service.hpp>
-#include <boost/asio/deadline_timer.hpp>
 #include <boost/optional.hpp>
 #include <network/config.hpp>
 #include <network/version.hpp>
@@ -49,8 +47,7 @@ class client_options {
    * \brief Constructor.
    */
   client_options()
-    : io_service_(boost::none)
-    , follow_redirects_(false)
+    : follow_redirects_(false)
     , cache_resolved_(false)
     , use_proxy_(false)
     , always_verify_peer_(false)
@@ -60,30 +57,12 @@ class client_options {
   /**
    * \brief Copy constructor.
    */
-  client_options(const client_options &other)
-    : io_service_(other.io_service_)
-    , follow_redirects_(other.follow_redirects_)
-    , cache_resolved_(other.cache_resolved_)
-    , use_proxy_(other.use_proxy_)
-    , always_verify_peer_(other.always_verify_peer_)
-    , user_agent_(other.user_agent_)
-    , timeout_(other.timeout_)
-    , openssl_certificate_paths_(other.openssl_certificate_paths_)
-    , openssl_verify_paths_(other.openssl_verify_paths_) { }
+  client_options(const client_options &other) = default;
 
   /**
    * \brief Move constructor.
    */
-  client_options(client_options &&other)
-    : io_service_(std::move(other.io_service_))
-    , follow_redirects_(std::move(other.follow_redirects_))
-    , cache_resolved_(std::move(other.cache_resolved_))
-    , use_proxy_(std::move(other.use_proxy_))
-    , always_verify_peer_(std::move(other.always_verify_peer_))
-    , user_agent_(std::move(other.user_agent_))
-    , timeout_(std::move(other.timeout_))
-    , openssl_certificate_paths_(std::move(other.openssl_certificate_paths_))
-    , openssl_verify_paths_(std::move(other.openssl_verify_paths_)) { }
+  client_options(client_options &&other) = default;
 
   /**
    * \brief Assignment operator.
@@ -96,16 +75,13 @@ class client_options {
   /**
    * \brief Destructor.
    */
-  ~client_options() {
-
-  }
+  ~client_options() = default;
 
   /**
    * \brief Swap.
    */
   void swap(client_options &other) noexcept {
     using std::swap;
-    std::swap(io_service_, other.io_service_);
     swap(follow_redirects_, other.follow_redirects_);
     swap(cache_resolved_, other.cache_resolved_);
     swap(use_proxy_, other.use_proxy_);
@@ -116,23 +92,6 @@ class client_options {
     swap(openssl_verify_paths_, other.openssl_verify_paths_);
   }
 
-  /**
-   * \brief Overrides the client's I/O service.
-   * \param io_service The new io_service object to use.
-   */
-  client_options &io_service(boost::asio::io_service &io_service) {
-    io_service_ = io_service;
-    return *this;
-  }
-
-  /**
-   * \brief Gets the overridden I/O service.
-   * \returns An optional io_service object.
-   */
-  boost::optional<boost::asio::io_service &> io_service() const {
-    return io_service_;
-  }
-
   /**
    * \brief Tells the client to follow redirects.
    * \param follow_redirects If \c true, then the client must
@@ -284,7 +243,6 @@ class client_options {
 
 private:
 
-  boost::optional<boost::asio::io_service &> io_service_;
   bool follow_redirects_;
   bool cache_resolved_;
   bool use_proxy_;

http/src/network/http/v2/client/request.hpp

@@ -62,20 +62,12 @@ class request_options {
   /**
    * \brief Copy constructor.
    */
-  request_options(request_options const &other)
-    : resolve_timeout_(other.resolve_timeout_)
-    , read_timeout_(other.read_timeout_)
-    , total_timeout_(other.total_timeout_)
-    , max_redirects_(other.max_redirects_) { }
+  request_options(request_options const &other) = default;
 
   /**
    * \brief Move constructor.
    */
-  request_options(request_options &&other)
-    : resolve_timeout_(std::move(other.resolve_timeout_))
-    , read_timeout_(std::move(other.read_timeout_))
-    , total_timeout_(std::move(other.total_timeout_))
-    , max_redirects_(std::move(other.max_redirects_)) { }
+  request_options(request_options &&other) = default;
 
   /**
    * \brief Assignment operator.
@@ -88,9 +80,7 @@ class request_options {
   /**
    * \brief Destructor.
    */
-  ~request_options() {
-
-  }
+  ~request_options() = default;
 
   /**
    * \brief
@@ -312,14 +302,49 @@ class request {
   /**
    * \brief Constructor.
    */
-  request()
-    : byte_source_(nullptr) { }
+  request() = default;
 
   /**
    * \brief Constructor.
    */
-  explicit request(uri url)
-    : url_(url) {
+  explicit request(uri url) {
+    this->url(url);
+  }
+
+  /**
+   * \brief Copy constructor.
+   */
+  request(const request &other) = default;
+
+  /**
+   * \brief Move constructor.
+   */
+  request(request &&other) noexcept = default;
+
+  /**
+   * \brief Destructor.
+   */
+  ~request() = default;
+
+  /**
+   * \brief Swaps one request object with another.
+   * \param other The other request object.
+   */
+  void swap(request &other) noexcept {
+    using std::swap;
+    swap(url_, other.url_);
+    swap(method_, other.method_);
+    swap(path_, other.path_);
+    swap(version_, other.version_);
+    swap(headers_, other.headers_);
+    swap(byte_source_, other.byte_source_);
+  }
+
+  /**
+   * \brief
+   * \returns
+   */
+  request &url(const uri &url) {
     if (auto scheme = url.scheme()) {
       if ((!boost::equal(*scheme, boost::as_literal("http"))) &&
           (!boost::equal(*scheme, boost::as_literal("https")))) {
@@ -356,65 +381,6 @@ class request {
     else {
       throw invalid_url();
     }
-  }
-
-  /**
-   * \brief Copy constructor.
-   */
-  request(const request &other)
-    : url_(other.url_)
-    , method_(other.method_)
-    , path_(other.path_)
-    , version_(other.version_)
-    , headers_(other.headers_)
-    , byte_source_(other.byte_source_) { }
-
-  /**
-   * \brief Move constructor.
-   */
-  request(request &&other) noexcept
-    : url_(std::move(other.url_))
-    , method_(std::move(other.method_))
-    , path_(std::move(other.path_))
-    , version_(std::move(other.version_))
-    , headers_(std::move(other.headers_))
-    , byte_source_(std::move(other.byte_source_)) { }
-
-  /**
-   * \brief Assignment operator.
-   */
-  request &operator = (request other) {
-    other.swap(*this);
-    return *this;
-  }
-
-  /**
-   * \brief Destructor.
-   */
-  ~request() {
-
-  }
-
-  /**
-   * \brief Swaps one request object with another.
-   * \param other The other request object.
-   */
-  void swap(request &other) noexcept {
-    using std::swap;
-    swap(url_, other.url_);
-    swap(method_, other.method_);
-    swap(path_, other.path_);
-    swap(version_, other.version_);
-    swap(headers_, other.headers_);
-    swap(byte_source_, other.byte_source_);
-  }
-
-  /**
-   * \brief
-   * \returns
-   */
-  request &url(const uri &url) {
-    // throw invalid_url
     url_ = url;
     return *this;
   }
@@ -516,7 +482,7 @@ class request {
    * Duplicates are allowed.
    */
   request &append_header(string_type name, string_type value) {
-    headers_.emplace_back(std::make_pair(name, value));
+    headers_.emplace_back(name, value);
     return *this;
   }
 

http/src/network/http/v2/client/response.hpp

@@ -63,42 +63,19 @@ class response {
   /**
    * \brief Constructor.
    */
-  response() { }
+  response() = default;
 
   /**
    * \brief Copy constructor.
    * \param other The other response object.
    */
-  response(const response &other)
-    : version_(other.version_)
-    , status_(other.status_)
-    , status_message_(other.status_message_)
-    , headers_(other.headers_)
-    , body_(other.body_) {
-
-  }
+  response(const response &other) = default;
 
   /**
    * \brief Move constructor.
    * \param other The other response object.
    */
-  response(response &&other) noexcept
-  : version_(std::move(other.version_))
-    , status_(std::move(other.status_))
-    , status_message_(std::move(other.status_message_))
-    , headers_(std::move(other.headers_))
-    , body_(std::move(other.body_)) {
-
-  }
-
-  /**
-   * \brief Assignment operator.
-   * \param other The other response object.
-   */
-  response &operator= (response other) {
-    other.swap(*this);
-    return *this;
-  }
+  response(response &&other) noexcept = default;
 
   /**
    * \brief Swap function.