Use dependency ejection to remove json include from API

reo7sp · Oct 15, 2024 · 0eca000 · 0eca000
1 parent 93a5234
commit 0eca000
Show file tree

Hide file tree

Showing 8 changed files with 2,621 additions and 393 deletions.
diff --git a/include/tgbot/Api.h b/include/tgbot/Api.h
diff --git a/include/tgbot/ApiImpl.h b/include/tgbot/ApiImpl.h
diff --git a/include/tgbot/Bot.h b/include/tgbot/Bot.h
@@ -34,7 +34,7 @@ class TGBOT_API Bot {
      * @return Object which can execute Telegram Bot API methods.
      */
     inline const Api& getApi() const {
-        return _api;
+        return *_api;
     }
 
     /**
@@ -55,7 +55,7 @@ class TGBOT_API Bot {
     static HttpClient &_getDefaultHttpClient();
 
     const std::string _token;
-    const Api _api;
+    const std::shared_ptr<Api> _api;
     std::unique_ptr<EventBroadcaster> _eventBroadcaster;
     const EventHandler _eventHandler;
 };

diff --git a/include/tgbot/net/TgLongPoll.h b/include/tgbot/net/TgLongPoll.h
@@ -1,7 +1,7 @@
 #ifndef TGBOT_TGLONGPOLL_H
 #define TGBOT_TGLONGPOLL_H
 
-#include "tgbot/Api.h"
+#include "tgbot/ApiImpl.h"
 #include "tgbot/export.h"
 
 #include <cstdint>
@@ -22,7 +22,7 @@ class EventHandler;
 class TGBOT_API TgLongPoll {
 
 public:
-    TgLongPoll(const Api* api, const EventHandler* eventHandler, std::int32_t limit, std::int32_t timeout, std::shared_ptr<std::vector<std::string>> allowUpdates);
+    TgLongPoll(const ApiImpl* api, const EventHandler* eventHandler, std::int32_t limit, std::int32_t timeout, std::shared_ptr<std::vector<std::string>> allowUpdates);
     TgLongPoll(const Bot& bot, std::int32_t limit = 100, std::int32_t timeout = 10, const std::shared_ptr<std::vector<std::string>>& allowUpdates = nullptr);
 
     /**
@@ -31,7 +31,7 @@ class TGBOT_API TgLongPoll {
     void start();
 
 private:
-    const Api* _api;
+    const ApiImpl* _api;
     const EventHandler* _eventHandler;
     std::int32_t _lastUpdateId = 0;
     std::int32_t _limit;

diff --git a/src/Api.cpp b/src/Api.cpp
diff --git a/src/Bot.cpp b/src/Bot.cpp
@@ -1,3 +1,4 @@
+#include "tgbot/ApiImpl.h"
 #include "tgbot/net/BoostHttpOnlySslClient.h"
 #include "tgbot/Bot.h"
 
@@ -10,7 +11,7 @@ namespace TgBot {
 
 Bot::Bot(std::string token, const HttpClient& httpClient, const std::string& url)
     : _token(std::move(token))
-    , _api(_token, httpClient, url)
+    , _api(std::make_shared<ApiImpl>(_token, httpClient, url))
     , _eventBroadcaster(std::make_unique<EventBroadcaster>())
     , _eventHandler(getEvents()) {
 }

diff --git a/src/net/TgLongPoll.cpp b/src/net/TgLongPoll.cpp
@@ -1,6 +1,6 @@
 #include "tgbot/net/TgLongPoll.h"
 
-#include "tgbot/Api.h"
+#include "tgbot/ApiImpl.h"
 #include "tgbot/Bot.h"
 #include "tgbot/EventHandler.h"
 
@@ -11,15 +11,15 @@
 
 namespace TgBot {
 
-TgLongPoll::TgLongPoll(const Api* api, const EventHandler* eventHandler, std::int32_t limit, std::int32_t timeout, std::shared_ptr<std::vector<std::string>> allowUpdates)
+TgLongPoll::TgLongPoll(const ApiImpl* api, const EventHandler* eventHandler, std::int32_t limit, std::int32_t timeout, std::shared_ptr<std::vector<std::string>> allowUpdates)
     : _api(api), _eventHandler(eventHandler), _limit(limit), _timeout(timeout)
     , _allowUpdates(std::move(allowUpdates)) {
 
     const_cast<TgBot::HttpClient&>(_api->_httpClient)._timeout = _timeout + 5;
 }
 
 TgLongPoll::TgLongPoll(const Bot& bot, std::int32_t limit, std::int32_t timeout, const std::shared_ptr<std::vector<std::string>>& allowUpdates)
-    : TgLongPoll(&bot.getApi(), &bot.getEventHandler(), limit, timeout, allowUpdates) {
+    : TgLongPoll(dynamic_cast<const ApiImpl *>(&bot.getApi()), &bot.getEventHandler(), limit, timeout, allowUpdates) {
 }
 
 void TgLongPoll::start() {

diff --git a/test/tgbot/Api.cpp b/test/tgbot/Api.cpp
@@ -4,18 +4,18 @@
 #include <boost/test/unit_test.hpp>
 
 #include "tgbot/net/HttpClient.h"
-#include "tgbot/Api.h"
+#include "tgbot/ApiImpl.h"
 #include "tgbot/TgException.h"
 
 using namespace std;
 using namespace TgBot;
 
 typedef TgException::ErrorCode TgErrorCode;
 
-class TestableApi : public Api {
+class TestableApi : public ApiImpl {
 public:
-    using Api::Api;
-    using Api::sendRequest;
+    using ApiImpl::ApiImpl;
+    using ApiImpl::sendRequest;
 };
 
 class HttpClientMock : public HttpClient {