rename GAHttpWrapper to GAHttpClient

Gogoshika-ga · Gogoshika-ga · commit ab2563b628ae · 2026-04-02T11:45:26.000+03:00
diff --git a/README.md b/README.md
@@ -126,12 +126,12 @@ gameAnalytics_configureCustomLogHandler(myLogHandler);
 
 ### Custom HTTP client
 
-By default, the SDK uses cURL for HTTP requests. If you need to use a different HTTP library (e.g. on consoles or custom platforms), you can provide your own implementation by subclassing `GAHttpWrapper`:
+By default, the SDK uses cURL for HTTP requests. If you need to use a different HTTP library (e.g. on consoles or custom platforms), you can provide your own implementation by subclassing `GAHttpClient`:
 
 ``` c++
-#include "GameAnalytics/GAHttpWrapper.h"
+#include "GameAnalytics/GAHttpClient.h"
 
-class MyHttpClient : public gameanalytics::GAHttpWrapper
+class MyHttpClient : public gameanalytics::GAHttpClient
 {
 public:
     void initialize() override
diff --git a/include/GameAnalytics/GAHttpClient.h b/include/GameAnalytics/GAHttpClient.h
@@ -7,7 +7,7 @@
 
 namespace gameanalytics
 { 
-    class GAHttpWrapper
+    class GAHttpClient
     {
         public:
 
@@ -23,7 +23,7 @@ namespace gameanalytics
                 }
             };
 
-            virtual ~GAHttpWrapper() {};
+            virtual ~GAHttpClient() {};
 
             virtual void initialize() = 0;
 
diff --git a/include/GameAnalytics/GameAnalytics.h b/include/GameAnalytics/GameAnalytics.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "GameAnalytics/GATypes.h"
-#include "GameAnalytics/GAHttpWrapper.h"
+#include "GameAnalytics/GAHttpClient.h"
 
 namespace gameanalytics
 {
@@ -65,7 +65,7 @@ namespace gameanalytics
 
          // Set a custom HTTP implementation. Must be called before initialize().
          // If not called, the default cURL implementation is used.
-         static void configureHttpClient(std::unique_ptr<GAHttpWrapper> httpClient);
+         static void configureHttpClient(std::unique_ptr<GAHttpClient> httpClient);
 
          // initialize - starting SDK (need configuration before starting)
          static void initialize(std::string const& gameKey, std::string const& gameSecret);
diff --git a/source/gameanalytics/GAHTTPApi.cpp b/source/gameanalytics/GAHTTPApi.cpp
@@ -23,7 +23,7 @@ namespace gameanalytics
         constexpr int HTTP_RESPONSE_UNAUTHORIZED = 401;
         constexpr int HTTP_RESPONSE_INTERNAL_ERROR = 500;
 
-        std::unique_ptr<GAHttpWrapper> GAHTTPApi::pendingCustomImpl = nullptr;
+        std::unique_ptr<GAHttpClient> GAHTTPApi::pendingCustomImpl = nullptr;
 
         // Constructor - setup the basic information for HTTP
         GAHTTPApi::GAHTTPApi():
@@ -58,7 +58,7 @@ namespace gameanalytics
             return state::GAState::getInstance()._gaHttp;
         }
 
-        void GAHTTPApi::setCustomHttpImpl(std::unique_ptr<GAHttpWrapper> customImpl)
+        void GAHTTPApi::setCustomHttpImpl(std::unique_ptr<GAHttpClient> customImpl)
         {
             pendingCustomImpl = std::move(customImpl);
         }
@@ -92,7 +92,7 @@ namespace gameanalytics
                 std::vector<uint8_t> payloadData = createPayloadData(jsonString, useGzip);
 
                 std::string const auth = createAuth(payloadData);
-                GAHttpWrapper::Response response = impl->sendRequest(url, auth, payloadData, useGzip, nullptr);
+                GAHttpClient::Response response = impl->sendRequest(url, auth, payloadData, useGzip, nullptr);
 
                 if(response.code < 0)
                 {
@@ -197,7 +197,7 @@ namespace gameanalytics
                 std::vector<uint8_t> payloadData = createPayloadData(jsonString, useGzip);
 
                 std::string const auth = createAuth(payloadData);
-                GAHttpWrapper::Response response = impl->sendRequest(url, auth, payloadData, useGzip, nullptr);
+                GAHttpClient::Response response = impl->sendRequest(url, auth, payloadData, useGzip, nullptr);
 
                 if(response.code < 0)
                 {
@@ -337,7 +337,7 @@ namespace gameanalytics
                 std::vector<uint8_t> payloadData = getInstance().createPayloadData(payloadJSONString, useGzip);
 
                 std::string auth = createAuth(payloadData);
-                GAHttpWrapper::Response response = impl->sendRequest(url, auth, payloadData, useGzip, nullptr);
+                GAHttpClient::Response response = impl->sendRequest(url, auth, payloadData, useGzip, nullptr);
 
                 if(response.code < 0)
                 {
@@ -383,7 +383,7 @@ namespace gameanalytics
             return payloadData;
         }
 
-        EGAHTTPApiResponse GAHTTPApi::processRequestResponse(GAHttpWrapper::Response const& response, std::string const& requestId)
+        EGAHTTPApiResponse GAHTTPApi::processRequestResponse(GAHttpClient::Response const& response, std::string const& requestId)
         {
             // if no result - often no connection
             if (response.packet.empty() && response.code != HTTP_RESPONSE_NO_CONTENT)
diff --git a/source/gameanalytics/GAHTTPApi.h b/source/gameanalytics/GAHTTPApi.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "GACommon.h"
-#include "GameAnalytics/GAHttpWrapper.h"
+#include "GameAnalytics/GAHttpClient.h"
 
 #include <vector>
 #include <map>
@@ -127,7 +127,7 @@ namespace gameanalytics
 
             static GAHTTPApi& getInstance();
 
-            static void setCustomHttpImpl(std::unique_ptr<GAHttpWrapper> customImpl);
+            static void setCustomHttpImpl(std::unique_ptr<GAHttpClient> customImpl);
 
             EGAHTTPApiResponse requestInitReturningDict(json& json_out, std::string const& configsHash);
             EGAHTTPApiResponse sendEventsInArray(json& json_out, const json& eventArray);
@@ -141,9 +141,9 @@ namespace gameanalytics
             GAHTTPApi& operator=(const GAHTTPApi&) = delete;
             std::vector<uint8_t> createPayloadData(std::string const& payload, bool gzip);
             std::string createAuth(std::vector<uint8_t> const& payload);
-            EGAHTTPApiResponse processRequestResponse(GAHttpWrapper::Response const& response, std::string const& requestId);
+            EGAHTTPApiResponse processRequestResponse(GAHttpClient::Response const& response, std::string const& requestId);
 
-            std::unique_ptr<GAHttpWrapper> impl;
+            std::unique_ptr<GAHttpClient> impl;
 
             std::string protocol                = PROTOCOL;
             std::string hostName                = HOST_NAME;
@@ -162,7 +162,7 @@ namespace gameanalytics
             std::map<ErrorType, int> countMap;
             std::map<ErrorType, int64_t> timestampMap;
 
-            static std::unique_ptr<GAHttpWrapper> pendingCustomImpl;
+            static std::unique_ptr<GAHttpClient> pendingCustomImpl;
         };
 
         constexpr const char* GAHTTPApi::sdkErrorCategoryString(EGASdkErrorCategory value)
diff --git a/source/gameanalytics/GameAnalytics.cpp b/source/gameanalytics/GameAnalytics.cpp
@@ -350,7 +350,7 @@ namespace gameanalytics
 
     // ----------------------- INITIALIZE ---------------------- //
 
-    void GameAnalytics::configureHttpClient(std::unique_ptr<GAHttpWrapper> httpClient)
+    void GameAnalytics::configureHttpClient(std::unique_ptr<GAHttpClient> httpClient)
     {
         if(_endThread)
         {
diff --git a/source/gameanalytics/Http/GAHttpCurl.cpp b/source/gameanalytics/Http/GAHttpCurl.cpp
@@ -4,7 +4,7 @@
 
 namespace gameanalytics
 {
-    size_t writefunc(void *ptr, size_t size, size_t nmemb, GAHttpWrapper::Response *s)
+    size_t writefunc(void *ptr, size_t size, size_t nmemb, GAHttpClient::Response *s)
     {
         if(!s || !ptr)
         {
@@ -28,7 +28,7 @@ namespace gameanalytics
         curl_global_cleanup();
     }
 
-    GAHttpWrapper::Response GAHttpCurl::sendRequest(std::string const& url, std::string const& auth, std::vector<uint8_t> const& payloadData, bool useGzip, void* userData)
+    GAHttpClient::Response GAHttpCurl::sendRequest(std::string const& url, std::string const& auth, std::vector<uint8_t> const& payloadData, bool useGzip, void* userData)
     {
         CURL* curl = curl_easy_init();
         if (!curl)
@@ -38,7 +38,7 @@ namespace gameanalytics
 
         curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 
-        GAHttpWrapper::Response response = {};
+        GAHttpClient::Response response = {};
 
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);
         curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
diff --git a/source/gameanalytics/Http/GAHttpCurl.h b/source/gameanalytics/Http/GAHttpCurl.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "GameAnalytics/GAHttpWrapper.h"
+#include "GameAnalytics/GAHttpClient.h"
 #include <curl/curl.h>
 
 namespace gameanalytics
 {
-    class GAHttpCurl: public GAHttpWrapper
+    class GAHttpCurl: public GAHttpClient
     {
         virtual void initialize() override;
         
diff --git a/test/GAHttpInterfaceTests.cpp b/test/GAHttpInterfaceTests.cpp
@@ -7,14 +7,14 @@
 #include <gtest/gtest.h>
 
 #include "GameAnalytics/GameAnalytics.h"
-#include "GameAnalytics/GAHttpWrapper.h"
+#include "GameAnalytics/GAHttpClient.h"
 #include "GAHTTPApi.h"
 
 namespace
 {
 
 // A mock HTTP implementation for testing
-class MockHttpClient : public gameanalytics::GAHttpWrapper
+class MockHttpClient : public gameanalytics::GAHttpClient
 {
 public:
     void initialize() override
@@ -58,22 +58,22 @@ class MockHttpClient : public gameanalytics::GAHttpWrapper
 
 // -------- Response struct tests --------
 
-TEST(GAHttpWrapperResponse, DefaultResponseHasNegativeCode)
+TEST(GAHttpClientResponse, DefaultResponseHasNegativeCode)
 {
-    gameanalytics::GAHttpWrapper::Response response;
+    gameanalytics::GAHttpClient::Response response;
     EXPECT_EQ(response.code, -1);
     EXPECT_TRUE(response.packet.empty());
 }
 
-TEST(GAHttpWrapperResponse, ToStringReturnsEmptyForEmptyPacket)
+TEST(GAHttpClientResponse, ToStringReturnsEmptyForEmptyPacket)
 {
-    gameanalytics::GAHttpWrapper::Response response;
+    gameanalytics::GAHttpClient::Response response;
     EXPECT_TRUE(response.toString().empty());
 }
 
-TEST(GAHttpWrapperResponse, ToStringReturnsPacketContent)
+TEST(GAHttpClientResponse, ToStringReturnsPacketContent)
 {
-    gameanalytics::GAHttpWrapper::Response response;
+    gameanalytics::GAHttpClient::Response response;
     std::string body = R"({"status":"ok"})";
     response.packet.assign(body.begin(), body.end());
     response.code = 200;
@@ -83,9 +83,9 @@ TEST(GAHttpWrapperResponse, ToStringReturnsPacketContent)
     EXPECT_EQ(result.size(), body.size());
 }
 
-TEST(GAHttpWrapperResponse, ToStringHandlesBinaryData)
+TEST(GAHttpClientResponse, ToStringHandlesBinaryData)
 {
-    gameanalytics::GAHttpWrapper::Response response;
+    gameanalytics::GAHttpClient::Response response;
     response.packet = {0x00, 0x01, 0x02, 0xFF};
     response.code = 200;
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace gameanalytics`
`9`	`9`	`{`
`10`		`- class GAHttpWrapper`
	`10`	`+ class GAHttpClient`
`11`	`11`	`{`
`12`	`12`	`public:`
`13`	`13`
`@@ -23,7 +23,7 @@ namespace gameanalytics`
`23`	`23`	`}`
`24`	`24`	`};`
`25`	`25`
`26`		`- virtual ~GAHttpWrapper() {};`
	`26`	`+ virtual ~GAHttpClient() {};`
`27`	`27`
`28`	`28`	`virtual void initialize() = 0;`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,7 @@ namespace gameanalytics`
`350`	`350`
`351`	`351`	`// ----------------------- INITIALIZE ---------------------- //`
`352`	`352`
`353`		`- void GameAnalytics::configureHttpClient(std::unique_ptr<GAHttpWrapper> httpClient)`
	`353`	`+ void GameAnalytics::configureHttpClient(std::unique_ptr<GAHttpClient> httpClient)`
`354`	`354`	`{`
`355`	`355`	`if(_endThread)`
`356`	`356`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace gameanalytics`
`6`	`6`	`{`
`7`		`- size_t writefunc(void ptr, size_t size, size_t nmemb, GAHttpWrapper::Response s)`
	`7`	`+ size_t writefunc(void ptr, size_t size, size_t nmemb, GAHttpClient::Response s)`
`8`	`8`	`{`
`9`	`9`	`if(!s \|\| !ptr)`
`10`	`10`	`{`
`@@ -28,7 +28,7 @@ namespace gameanalytics`
`28`	`28`	`curl_global_cleanup();`
`29`	`29`	`}`
`30`	`30`
`31`		`- GAHttpWrapper::Response GAHttpCurl::sendRequest(std::string const& url, std::string const& auth, std::vector<uint8_t> const& payloadData, bool useGzip, void* userData)`
	`31`	`+ GAHttpClient::Response GAHttpCurl::sendRequest(std::string const& url, std::string const& auth, std::vector<uint8_t> const& payloadData, bool useGzip, void* userData)`
`32`	`32`	`{`
`33`	`33`	`CURL* curl = curl_easy_init();`
`34`	`34`	`if (!curl)`
`@@ -38,7 +38,7 @@ namespace gameanalytics`
`38`	`38`
`39`	`39`	`curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);`
`40`	`40`
`41`		`- GAHttpWrapper::Response response = {};`
	`41`	`+ GAHttpClient::Response response = {};`
`42`	`42`
`43`	`43`	`curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writefunc);`
`44`	`44`	`curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#include "GameAnalytics/GAHttpWrapper.h"`
	`3`	`+#include "GameAnalytics/GAHttpClient.h"`
`4`	`4`	`#include <curl/curl.h>`
`5`	`5`
`6`	`6`	`namespace gameanalytics`
`7`	`7`	`{`
`8`		`- class GAHttpCurl: public GAHttpWrapper`
	`8`	`+ class GAHttpCurl: public GAHttpClient`
`9`	`9`	`{`
`10`	`10`	`virtual void initialize() override;`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@`
`7`	`7`	`#include <gtest/gtest.h>`
`8`	`8`
`9`	`9`	`#include "GameAnalytics/GameAnalytics.h"`
`10`		`-#include "GameAnalytics/GAHttpWrapper.h"`
	`10`	`+#include "GameAnalytics/GAHttpClient.h"`
`11`	`11`	`#include "GAHTTPApi.h"`
`12`	`12`
`13`	`13`	`namespace`
`14`	`14`	`{`
`15`	`15`
`16`	`16`	`// A mock HTTP implementation for testing`
`17`		`-class MockHttpClient : public gameanalytics::GAHttpWrapper`
	`17`	`+class MockHttpClient : public gameanalytics::GAHttpClient`
`18`	`18`	`{`
`19`	`19`	`public:`
`20`	`20`	`void initialize() override`
`@@ -58,22 +58,22 @@ class MockHttpClient : public gameanalytics::GAHttpWrapper`
`58`	`58`
`59`	`59`	`// -------- Response struct tests --------`
`60`	`60`
`61`		`-TEST(GAHttpWrapperResponse, DefaultResponseHasNegativeCode)`
	`61`	`+TEST(GAHttpClientResponse, DefaultResponseHasNegativeCode)`
`62`	`62`	`{`
`63`		`- gameanalytics::GAHttpWrapper::Response response;`
	`63`	`+ gameanalytics::GAHttpClient::Response response;`
`64`	`64`	`EXPECT_EQ(response.code, -1);`
`65`	`65`	`EXPECT_TRUE(response.packet.empty());`
`66`	`66`	`}`
`67`	`67`
`68`		`-TEST(GAHttpWrapperResponse, ToStringReturnsEmptyForEmptyPacket)`
	`68`	`+TEST(GAHttpClientResponse, ToStringReturnsEmptyForEmptyPacket)`
`69`	`69`	`{`
`70`		`- gameanalytics::GAHttpWrapper::Response response;`
	`70`	`+ gameanalytics::GAHttpClient::Response response;`
`71`	`71`	`EXPECT_TRUE(response.toString().empty());`
`72`	`72`	`}`
`73`	`73`
`74`		`-TEST(GAHttpWrapperResponse, ToStringReturnsPacketContent)`
	`74`	`+TEST(GAHttpClientResponse, ToStringReturnsPacketContent)`
`75`	`75`	`{`
`76`		`- gameanalytics::GAHttpWrapper::Response response;`
	`76`	`+ gameanalytics::GAHttpClient::Response response;`
`77`	`77`	`std::string body = R"({"status":"ok"})";`
`78`	`78`	`response.packet.assign(body.begin(), body.end());`
`79`	`79`	`response.code = 200;`
`@@ -83,9 +83,9 @@ TEST(GAHttpWrapperResponse, ToStringReturnsPacketContent)`
`83`	`83`	`EXPECT_EQ(result.size(), body.size());`
`84`	`84`	`}`
`85`	`85`
`86`		`-TEST(GAHttpWrapperResponse, ToStringHandlesBinaryData)`
	`86`	`+TEST(GAHttpClientResponse, ToStringHandlesBinaryData)`
`87`	`87`	`{`
`88`		`- gameanalytics::GAHttpWrapper::Response response;`
	`88`	`+ gameanalytics::GAHttpClient::Response response;`
`89`	`89`	`response.packet = {0x00, 0x01, 0x02, 0xFF};`
`90`	`90`	`response.code = 200;`
`91`	`91`