Moved FlushEventListener and FlushMetrics to private API

Moved the auto-flush specific classes - FlushEventListener and FlushMetrics to private API.
Also, removed the AutoFlushController from StreamLayerClientImpl

Relates to: OLPEDGE-826

Signed-off-by: Bohdan Kurylovych <[email protected]>

Author: Bohdan Kurylovych

olp-cpp-sdk-dataservice-write/src/AutoFlushController.h

@@ -22,7 +22,7 @@
 #include <future>
 #include <memory>
 
-#include <olp/dataservice/write/FlushEventListener.h>
+#include "FlushEventListener.h"
 #include "AutoFlushSettings.h"
 
 namespace olp {

olp-cpp-sdk-dataservice-write/src/DefaultFlushEventListener.h

@@ -24,8 +24,7 @@
 #include <mutex>
 #include <vector>
 
-#include <olp/dataservice/write/FlushMetrics.h>
-#include <olp/dataservice/write/FlushEventListener.h>
+#include "FlushEventListener.h"
 
 namespace olp {
 namespace dataservice {

…p/dataservice/write/FlushEventListener.h …taservice-write/src/FlushEventListener.holp-cpp-sdk-dataservice-write/include/olp/dataservice/write/FlushEventListener.h renamed to olp-cpp-sdk-dataservice-write/src/FlushEventListener.h olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/FlushEventListener.h renamed to olp-cpp-sdk-dataservice-write/src/FlushEventListener.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <olp/dataservice/write/FlushMetrics.h>
+#include "FlushMetrics.h"
 
 namespace olp {
 namespace dataservice {

…ude/olp/dataservice/write/FlushMetrics.h …sdk-dataservice-write/src/FlushMetrics.holp-cpp-sdk-dataservice-write/include/olp/dataservice/write/FlushMetrics.h renamed to olp-cpp-sdk-dataservice-write/src/FlushMetrics.h olp-cpp-sdk-dataservice-write/include/olp/dataservice/write/FlushMetrics.h renamed to olp-cpp-sdk-dataservice-write/src/FlushMetrics.h

@@ -89,8 +89,7 @@ StreamLayerClientImpl::StreamLayerClientImpl(
       init_inprogress_(false),
       cache_(settings_.cache),
       cache_mutex_(),
-      stream_client_settings_(std::move(client_settings)),
-      auto_flush_controller_(new AutoFlushController(AutoFlushSettings{})) {}
+      stream_client_settings_(std::move(client_settings)) {}
 
 CancellationToken StreamLayerClientImpl::InitApiClients(
     const std::shared_ptr<CancellationContext>& cancel_context,
@@ -294,7 +293,6 @@ boost::optional<std::string> StreamLayerClientImpl::Queue(
     }
   }
 
-  auto_flush_controller_->NotifyQueueEventStart();
   {
     std::lock_guard<std::mutex> lock(cache_mutex_);
     const auto publish_data_key = GenerateUuid();
@@ -313,7 +311,6 @@ boost::optional<std::string> StreamLayerClientImpl::Queue(
     cache_->Put(GetUuidListKey(), uuid_list,
                 [&uuid_list]() { return uuid_list; });
   }
-  auto_flush_controller_->NotifyQueueEventComplete();
 
   return boost::none;
 }
@@ -392,8 +389,6 @@ olp::client::CancellationToken StreamLayerClientImpl::Flush(
         continue;
       }
 
-      self->auto_flush_controller_->NotifyFlushEvent();
-
       // TODO: This needs a redesign as pushing multiple publishes also on the
       // TaskScheduler would mean a dead-lock in case we have a single-thread
       // pool and this is waiting on each publish to finish. So while this loop

olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.cpp

@@ -27,7 +27,6 @@
 
 #include <olp/dataservice/write/StreamLayerClient.h>
 #include "ApiClientLookup.h"
-#include "AutoFlushController.h"
 #include "generated/model/Catalog.h"
 
 namespace olp {
@@ -114,7 +113,6 @@ class StreamLayerClientImpl
   std::shared_ptr<cache::KeyValueCache> cache_;
   mutable std::mutex cache_mutex_;
   StreamLayerClientSettings stream_client_settings_;
-  std::unique_ptr<AutoFlushController> auto_flush_controller_;
 };
 
 }  // namespace write

olp-cpp-sdk-dataservice-write/src/StreamLayerClientImpl.h

@@ -21,7 +21,6 @@ set(OLP_SDK_TESTS_COMMON_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/matchers/NetworkUrlMatchers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mocks/NetworkMock.h
     ${CMAKE_CURRENT_SOURCE_DIR}/mocks/CacheMock.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/testables/FlushEventListenerTestable.h
 )
 
 set(OLP_SDK_TESTS_COMMON_SOURCES

tests/common/CMakeLists.txt

@@ -38,12 +38,10 @@
 #include <olp/dataservice/write/model/PublishDataRequest.h>
 #include <olp/dataservice/write/model/PublishSdiiRequest.h>
 #include <testutils/CustomParameters.hpp>
-#include "testables/FlushEventListenerTestable.h"
 #include "Utils.h"
 
 using namespace olp::dataservice::write;
 using namespace olp::dataservice::write::model;
-using namespace olp::tests::common;
 using namespace testing;
 
 const std::string kEndpoint = "endpoint";

tests/common/testables/FlushEventListenerTestable.h

@@ -30,7 +30,6 @@
 #include <olp/dataservice/write/StreamLayerClient.h>
 #include <olp/dataservice/write/model/PublishDataRequest.h>
 #include "HttpResponses.h"
-#include "testables/FlushEventListenerTestable.h"
 
 namespace {