Moved http::client_message::request/response into the http namespace.

Author: glynos

contrib/http_examples/read_headers.cpp

@@ -19,7 +19,7 @@ main(int argc, char *argv[]) {
 
   try {
     http::client client;
-    http::client::request request{network::uri{std::string{argv[1]}}};
+    http::request request{network::uri{std::string{argv[1]}}};
     request.version("1.0");
     request.append_header("Connection", "close");
     request.append_header("User-Agent", "cpp-netlib read_headers example");

contrib/http_examples/simple_wget.cpp

@@ -37,7 +37,7 @@ int main(int argc, char* argv[]) {
 
   try {
     http::client client;
-    http::client::request request{network::uri{std::string{argv[1]}}};
+    http::request request{network::uri{std::string{argv[1]}}};
     request.version("1.0");
     request.append_header("Connection", "close");
     request.append_header("User-Agent", "cpp-netlib simple_wget example");

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

@@ -26,19 +26,19 @@ namespace network {
 
         std::shared_ptr<client_connection::async_connection> connection_;
 
-        client::request request_;
-        client::request_options options_;
+        request request_;
+        request_options options_;
 
-        std::promise<client::response> response_promise_;
+        std::promise<response> response_promise_;
 
         boost::asio::streambuf request_buffer_;
         boost::asio::streambuf response_buffer_;
 
         // TODO configure deadline timer for timeouts
 
         request_helper(std::shared_ptr<client_connection::async_connection> connection,
-                       client::request request,
-                       client::request_options options)
+                       request request,
+                       request_options options)
           : connection_(connection)
           , request_(request)
           , options_(options) { }
@@ -118,8 +118,8 @@ namespace network {
         lifetime_thread_.join();
       }
 
-      std::future<client::response> client::impl::execute(std::shared_ptr<request_helper> helper) {
-        std::future<client::response> res = helper->response_promise_.get_future();
+      std::future<response> client::impl::execute(std::shared_ptr<request_helper> helper) {
+        std::future<response> res = helper->response_promise_.get_future();
 
         // TODO see linearize.hpp
 
@@ -332,7 +332,7 @@ namespace network {
         delete pimpl_;
       }
 
-      std::future<client::response> client::execute(request req, request_options options) {
+      std::future<response> client::execute(request req, request_options options) {
         std::shared_ptr<client_connection::async_connection> connection;
         if (pimpl_->mock_connection_) {
           connection = pimpl_->mock_connection_;
@@ -344,32 +344,32 @@ namespace network {
         return pimpl_->execute(std::make_shared<request_helper>(connection, req, options));
       }
 
-      std::future<client::response> client::get(request req, request_options options) {
+      std::future<response> client::get(request req, request_options options) {
         req.method(method::get);
         return execute(req, options);
       }
 
-      std::future<client::response> client::post(request req, request_options options) {
+      std::future<response> client::post(request req, request_options options) {
         req.method(method::post);
         return execute(req, options);
       }
 
-      std::future<client::response> client::put(request req, request_options options) {
+      std::future<response> client::put(request req, request_options options) {
         req.method(method::put);
         return execute(req, options);
       }
 
-      std::future<client::response> client::delete_(request req, request_options options) {
+      std::future<response> client::delete_(request req, request_options options) {
         req.method(method::delete_);
         return execute(req, options);
       }
 
-      std::future<client::response> client::head(request req, request_options options) {
+      std::future<response> client::head(request req, request_options options) {
         req.method(method::head);
         return execute(req, options);
       }
 
-      std::future<client::response> client::options(request req, request_options options) {
+      std::future<response> client::options(request req, request_options options) {
         req.method(method::options);
         return execute(req, options);
       }

http/src/network/http/client.hpp

@@ -5,8 +5,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef NETWORK_HTTP_CLIENT_INC__
-#define NETWORK_HTTP_CLIENT_INC__
+#ifndef NETWORK_HTTP_CLIENT_INC
+#define NETWORK_HTTP_CLIENT_INC
 
 #include <network/http/v2/client.hpp>
 #include <network/http/v2/method.hpp>
@@ -16,6 +16,9 @@ namespace network {
   namespace http {
     using v2::client;
     using v2::client_options;
+    using v2::request;
+    using v2::request_options;
+    using v2::response;
     using v2::method;
     namespace status = v2::status;
     using v2::client_error;
@@ -25,4 +28,4 @@ namespace network {
 } // namespace network
 
 
-#endif  // NETWORK_HTTP_CLIENT_INC__
+#endif  // NETWORK_HTTP_CLIENT_INC

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

@@ -280,6 +280,10 @@ namespace network {
         lhs.swap(rhs);
       }
 
+      typedef client_message::request_options request_options;
+      typedef client_message::request request;
+      typedef client_message::response response;
+
       /**
        * \ingroup http_client
        * \class client network/http/v2/client/client.hpp network/http/v2/client.hpp
@@ -293,10 +297,6 @@ namespace network {
 
       public:
 
-        typedef client_message::request_options request_options;
-        typedef client_message::request request;
-        typedef client_message::response response;
-
         /**
          * \typedef string_type
          * \brief The client string_type.

http/test/v2/client/features/http_client_test.cpp

@@ -20,7 +20,7 @@ Describe(http_client) {
   }
 
   It(gets_a_header_response) {
-    http::client::request request{network::uri{"http://www.boost.org/"}};
+    http::request request{network::uri{"http://www.boost.org/"}};
     request
       .method(http::method::get)
       .path("/LICENSE_1_0.txt")

http/test/v2/client/units/client_resolution_test.cpp

@@ -75,7 +75,7 @@ class client_resolution_test : public ::testing::Test {
 };
 
 TEST_F(client_resolution_test, host_not_found) {
-  http::client::request request;
+  http::request request;
   request
     .method(http::method::get)
     .path("/LICENSE_1_0.txt")