Renamed base class connection to async_connection.

glynos · glynos · commit 29ec7e2b46a1 · 2013-12-07T17:05:44.000+01:00
diff --git a/http/src/network/http/v2/client/connection/async_connection.hpp b/http/src/network/http/v2/client/connection/async_connection.hpp
@@ -3,8 +3,8 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef NETWORK_HTTP_V2_CLIENT_CONNECTION_CONNECTION_INC
-#define NETWORK_HTTP_V2_CLIENT_CONNECTION_CONNECTION_INC
+#ifndef NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_CONNECTION_INC
+#define NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_CONNECTION_INC
 
 #include <functional>
 #include <string>
@@ -17,13 +17,13 @@ namespace network {
   namespace http {
     namespace v2 {
       /**
-       * \class connection network/http/v2/client/connection/connection.hpp
+       * \class async_connection network/http/v2/client/connection/async_connection.hpp
        * \brief Manages a connection through a socket.
        */
-      class connection {
+      class async_connection {
 
-        connection(const connection &) = delete;
-        connection &operator = (const connection &) = delete;
+        async_connection(const async_connection &) = delete;
+        async_connection &operator = (const async_connection &) = delete;
 
       public:
 
@@ -45,12 +45,12 @@ namespace network {
         /**
          * \brief Constructor.
          */
-        connection() = default;
+        async_connection() = default;
 
         /**
          * \brief Destructor.
          */
-        virtual ~connection() noexcept { }
+        virtual ~async_connection() noexcept { }
 
         /**
          * \brief Asynchronously creates a connection to an endpoint.
@@ -88,4 +88,4 @@ namespace network {
   } // namespace http
 } // namespace network
 
-#endif // NETWORK_HTTP_V2_CLIENT_CONNECTION_CONNECTION_INC
+#endif // NETWORK_HTTP_V2_CLIENT_CONNECTION_ASYNC_CONNECTION_INC
diff --git a/http/src/network/http/v2/client/connection/normal_connection.hpp b/http/src/network/http/v2/client/connection/normal_connection.hpp
@@ -11,12 +11,12 @@
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/io_service.hpp>
 #include <network/config.hpp>
-#include <network/http/v2/client/connection/connection.hpp>
+#include <network/http/v2/client/connection/async_connection.hpp>
 
 namespace network {
   namespace http {
     namespace v2 {
-      class normal_connection : public connection {
+      class normal_connection : public async_connection {
 
         normal_connection(const normal_connection &) = delete;
         normal_connection &operator = (const normal_connection &) = delete;
@@ -35,11 +35,8 @@ namespace network {
         virtual void async_connect(const boost::asio::ip::tcp::endpoint &endpoint,
                                    connect_callback callback) {
           using boost::asio::ip::tcp;
-          std::cout << "Oh 1." << std::endl;
           socket_.reset(new tcp::socket{io_service_});
-          std::cout << "Oh 2." << std::endl;
           socket_->async_connect(endpoint, callback);
-          std::cout << "Oh 3." << std::endl;
         }
 
         virtual void async_write(boost::asio::streambuf &command_streambuf,
diff --git a/http/test/v2/features/client/normal_connection_test.cpp b/http/test/v2/features/client/normal_connection_test.cpp
@@ -111,7 +111,7 @@ Describe(normal_http_connection) {
 
   std::unique_ptr<boost::asio::io_service> io_service_;
   std::unique_ptr<tcp::resolver> resolver_;
-  std::unique_ptr<http::connection> connection_;
+  std::unique_ptr<http::async_connection> connection_;
 
   boost::asio::streambuf request_;
   boost::asio::streambuf response_;
