Remove old network implementation

 * remove network and tests from source tree
 * adapt code style
 * cleanup cmake

Relates-to: OLPEDGE-585

Signed-off-by: Serhii Lysenko <[email protected]>

Author: serhiikobalt

olp-cpp-sdk-authentication/src/BaseResult.cpp

@@ -22,7 +22,6 @@
 #include <rapidjson/document.h>
 
 #include "Constants.h"
-
 #include "olp/core/http/HttpStatusCode.h"
 
 using namespace rapidjson;

olp-cpp-sdk-authentication/test/unit/AuthenticationProductionTests.cpp

@@ -21,7 +21,6 @@
 #include <olp/authentication/AuthenticationClient.h>
 #include <olp/core/client/OlpClientSettingsFactory.h>
 #include <olp/core/http/HttpStatusCode.h>
-#include <olp/core/network/Network.h>
 #include <olp/core/porting/make_unique.h>
 #include <future>
 #include <memory>
@@ -71,6 +70,9 @@ class AuthenticationOnlineProductionTest : public ::testing::Test {
   static std::shared_ptr<olp::http::Network> s_network_;
 };
 
+// Static network instance is necessary as it needs to outlive any created
+// clients. This is a known limitation as triggered send requests capture the
+// network instance inside the callbacks.
 std::shared_ptr<olp::http::Network> AuthenticationOnlineProductionTest::s_network_;
 
 TEST_F(AuthenticationOnlineProductionTest, SignInClient) {

olp-cpp-sdk-core/CMakeLists.txt

@@ -70,12 +70,10 @@ file(GLOB GENERATED_HEADERS
     "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/generated/serializer/*.h"
 )
 
-file(GLOB NETWORK_HEADERS
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/network/*.h"
-)
 set(EDGE_SDK_HTTP_HEADERS
     "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/http/HttpStatusCode.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/http/Network.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/http/HttpStatusCode.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/http/NetworkConstants.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/http/NetworkProxySettings.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/include/olp/core/http/NetworkRequest.h"
@@ -137,11 +135,6 @@ file(GLOB GENERATED_SOURCE
     "${CMAKE_CURRENT_SOURCE_DIR}/src/generated/serializer/*.cpp"
 )
 
-file(GLOB NETWORK_SOURCE
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/network/*.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/src/network/*.h"
-)
-
 set(EDGE_SDK_HTTP_SOURCES
     "${CMAKE_CURRENT_SOURCE_DIR}/src/http/Network.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/http/NetworkProxySettings.cpp"
@@ -152,12 +145,6 @@ set(EDGE_SDK_HTTP_SOURCES
 )
 
 if (ANDROID)
-    file(GLOB NETWORK_ANDROID_SOURCE
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/network/android/*.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/network/android/*.h"
-        "${CMAKE_CURRENT_SOURCE_DIR}/src/network/socket/*.cpp"
-    )
-    set(NETWORK_SOURCE ${NETWORK_SOURCE} ${NETWORK_ANDROID_SOURCE})
 
     # http network Android implementation:
     set(EDGE_SDK_HTTP_ANDROID_SOURCES
@@ -171,19 +158,16 @@ if (ANDROID)
     set(EDGE_SDK_DEFAULT_NETWORK_DEFINITION NETWORK_HAS_ANDROID)
 endif()
 if (UNIX AND NOT ANDROID)
-    set(NETWORK_SOURCE ${NETWORK_SOURCE} ${NETWORK_CURL_SOURCES})
     set(EDGE_SDK_HTTP_SOURCES ${EDGE_SDK_HTTP_SOURCES} ${EDGE_SDK_HTTP_CURL_SOURCES})
 
     set(EDGE_SDK_DEFAULT_NETWORK_DEFINITION NETWORK_HAS_CURL)
 endif()
 if (IOS)
-    set(NETWORK_SOURCE ${NETWORK_SOURCE} ${NETWORK_IOS_SOURCES})
     set(EDGE_SDK_HTTP_SOURCES ${EDGE_SDK_HTTP_SOURCES} ${EDGE_SDK_HTTP_IOS_SOURCES})
 
     set(EDGE_SDK_DEFAULT_NETWORK_DEFINITION NETWORK_HAS_IOS)
 endif()
 if (WIN32)
-    set(NETWORK_SOURCE ${NETWORK_SOURCE} ${NETWORK_WINHTTP_SOURCES})
     set(EDGE_SDK_HTTP_SOURCES ${EDGE_SDK_HTTP_SOURCES} ${EDGE_SDK_HTTP_WIN_SOURCES})
 
     set(EDGE_SDK_DEFAULT_NETWORK_DEFINITION NETWORK_HAS_WINHTTP)
@@ -211,7 +195,6 @@ file(GLOB CORE_HEADERS
     ${CACHE_HEADERS}
     ${CLIENT_HEADERS}
     ${GENERATED_HEADERS}
-    ${NETWORK_HEADERS}
     ${EDGE_SDK_HTTP_HEADERS}
     ${PLATFORM_HEADERS}
     ${PORTING_HEADERS}
@@ -230,7 +213,6 @@ file(GLOB CORE_SOURCE
     ${CACHE_SOURCE}
     ${CLIENT_SOURCE}
     ${GENERATED_SOURCE}
-    ${NETWORK_SOURCE}
     ${EDGE_SDK_HTTP_SOURCES}
     ${PLATFORM_SOURCE}
     ${PORTING_SOURCE}
@@ -325,7 +307,6 @@ if(BUILD_SHARED_LIBS)
 endif()
 
 # install component
-install (FILES ${NETWORK_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/olp/core/network)
 install (FILES ${EDGE_SDK_HTTP_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/olp/core/http)
 install (FILES ${PLATFORM_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/olp/core/platform)
 install (FILES ${PORTING_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/olp/core/porting)
@@ -349,6 +330,5 @@ if(EDGE_SDK_ENABLE_TESTING)
     add_subdirectory(tests/client)
     add_subdirectory(tests/olpclient)
     add_subdirectory(tests/geo)
-    add_subdirectory(tests/network)
     add_subdirectory(tests/thread)
 endif()

olp-cpp-sdk-core/include/olp/core/client/OlpClient.h

@@ -37,13 +37,6 @@ class NetworkConfig;
 }  // namespace network
 
 namespace client {
-/**
- * @brief Async network handler that delegates to the core network component.
- */
-CancellationToken DefaultNetworkAsyncHandler(
-    const network::NetworkRequest& request,
-    const network::NetworkConfig& config, const NetworkAsyncCallback& callback);
-
 /**
  * @brief This class is responsible for executing the REST requests.
  */

olp-cpp-sdk-core/include/olp/core/client/OlpClientSettings.h

@@ -26,9 +26,9 @@
 #include <boost/optional.hpp>
 
 #include "olp/core/client/CancellationToken.h"
+#include "olp/core/client/HttpResponse.h"
 #include "olp/core/http/Network.h"
 #include "olp/core/client/HttpResponse.h"
-#include "olp/core/network/NetworkProxy.h"
 
 namespace olp {
 
@@ -43,21 +43,13 @@ class TaskScheduler;
 
 namespace http {
 class Network;
-struct HttpResponse;
 }  // namespace http
 
 namespace client {
 
 using NetworkAsyncCallback = std::function<void(HttpResponse)>;
 using NetworkAsyncCancel = std::function<void()>;
 
-/**
- * @brief Handler for asynchronous execution of network requests.
- */
-using NetworkAsyncHandler = std::function<CancellationToken(
-    const network::NetworkRequest&, const network::NetworkConfig&,
-    const NetworkAsyncCallback&)>;
-
 /**
  * @brief Default BackdownPolicy which simply returns the original wait time.
  */
@@ -66,7 +58,7 @@ CORE_API unsigned int DefaultBackdownPolicy(unsigned int milliseconds);
 /**
  * @brief Default RetryCondition which is to disable retries.
  */
-CORE_API bool DefaultRetryCondition(const HttpResponse& response);
+CORE_API bool DefaultRetryCondition(const olp::client::HttpResponse& response);
 
 struct AuthenticationSettings {
   /**
@@ -165,20 +157,14 @@ struct OlpClientSettings {
    * @brief The network proxy settings to use. Set boost::none to remove any
    * exisitng proxy settings.
    */
-  boost::optional<network::NetworkProxy> proxy_settings = boost::none;
+  boost::optional<http::NetworkProxySettings> proxy_settings = boost::none;
 
   /**
    * @brief The authentication settings to use. Set boost::none to remove
    * any existing settings.
    */
   boost::optional<AuthenticationSettings> authentication_settings = boost::none;
 
-  /**
-   * @brief The network handler.
-   * @deprecated since 0.7
-   */
-  boost::optional<NetworkAsyncHandler> network_async_handler = boost::none;
-
   /**
    * @brief The task scheduler instance. In case of nullptr set, all request
    * calls will be performed synchronous.