Template Function code refactor (#61)

* Refactor to in-class member initializer

* Refactor member thread as unique_ptr

* Refactor to use function wrapper

Co-authored-by: Borgbyte <[email protected]>

Author: ZahidZafar

examples/example_integration.cpp

@@ -40,7 +40,7 @@ int main() {
 	ct.alwaysUsePost(true);
 	ct.setDeviceID("test-device-id");
 
-	void (*logger_function)(Countly::LogLevel level, const std::string & message);
+	Countly::LoggerFunction logger_function;
 	logger_function = printLog;
 	ct.setLogger(logger_function);
 	// OS, OS_version, device, resolution, carrier, app_version);

include/countly.hpp

@@ -4,6 +4,7 @@
 #include "countly/constants.hpp"
 
 #include <chrono>
+#include <functional>
 #include <iterator>
 #include <map>
 #include <memory>
@@ -42,14 +43,16 @@ class Countly {
 
 	enum LogLevel {DEBUG, INFO, WARNING, ERROR, FATAL};
 
-	void setLogger(void (*fun)(LogLevel level, const std::string& message));
+	using LoggerFunction = std::function<void(LogLevel, const std::string&)>;
+	void setLogger(LoggerFunction fun);
 
 	struct HTTPResponse {
 		bool success;
 		json data;
 	};
 
-	void setHTTPClient(HTTPResponse (*fun)(bool use_post, const std::string& url, const std::string& data));
+	using HTTPClientFunction = std::function<HTTPResponse(bool, const std::string&, const std::string&)>;
+	void setHTTPClient(HTTPClientFunction fun);
 
 	void setMetrics(const std::string& os, const std::string& os_version, const std::string& device, const std::string& resolution, const std::string& carrier, const std::string& app_version);
 
@@ -245,8 +248,8 @@ class Countly {
 
 	void updateLoop();
 
-	void (*logger_function)(LogLevel level, const std::string& message) = nullptr;
-	HTTPResponse (*http_client_function)(bool is_post, const std::string& url, const std::string& data) = nullptr;
+	LoggerFunction logger_function;
+	HTTPClientFunction http_client_function;
 
 	std::string host;
 
@@ -259,7 +262,7 @@ class Countly {
 	bool is_sdk_initialized = false;
 
 	std::chrono::system_clock::time_point last_sent_session_request;
-	
+
 	json session_params;
 	std::string salt;
 

src/countly.cpp

@@ -59,13 +59,13 @@ void Countly::setSalt(const std::string& value) {
 	mutex.unlock();
 }
 
-void Countly::setLogger(void (*fun)(Countly::LogLevel level, const std::string& message)) {
+void Countly::setLogger(LoggerFunction fun) {
 	mutex.lock();
 	logger_function = fun;
 	mutex.unlock();
 }
 
-void Countly::setHTTPClient(Countly::HTTPResponse (*fun)(bool use_post, const std::string& url, const std::string& data)) {
+void Countly::setHTTPClient(HTTPClientFunction fun) {
 	mutex.lock();
 	http_client_function = fun;
 	mutex.unlock();
@@ -781,7 +781,7 @@ void Countly::setDatabasePath(const std::string& path) {
 #endif
 
 void Countly::log(Countly::LogLevel level, const std::string& message) {
-	if (logger_function != nullptr) {
+	if (logger_function) {
 		logger_function(level, message);
 	}
 }
@@ -828,14 +828,14 @@ Countly::HTTPResponse Countly::sendHTTP(std::string path, std::string data) {
 	response.success = false;
 
 #ifdef COUNTLY_USE_CUSTOM_HTTP
-	if (http_client_function == nullptr) {
+	if (!http_client_function) {
 		log(Countly::LogLevel::FATAL, "Missing HTTP client function");
 		return response;
 	}
 
 	return http_client_function(use_post, path, data);
 #else
-	if (http_client_function != nullptr) {
+	if (http_client_function) {
 		return http_client_function(use_post, path, data);
 	}
 #ifdef _WIN32