Merge pull request #13 from qorix-group/piotrkorkus_remove_baselibs_dep

Remove baselibs dep from C++

Author: pawelrutkaq

.bazelrc

@@ -2,7 +2,6 @@ build --java_language_version=17
 build --tool_java_language_version=17
 build --java_runtime_version=remotejdk_17
 build --tool_java_runtime_version=remotejdk_17
-build --@score_baselibs//score/json:base_library=nlohmann
 
 test --test_output=errors
 

MODULE.bazel

@@ -24,7 +24,7 @@ module(
 bazel_dep(name = "score_starpls_lsp", version = "0.1.0", dev_dependency = True)
 
 # Python rules.
-bazel_dep(name = "rules_python", version = "1.0.0", dev_dependency = True)
+bazel_dep(name = "rules_python", version = "1.7.0", dev_dependency = True)
 
 PYTHON_VERSION = "3.12"
 
@@ -36,13 +36,13 @@ python.toolchain(
 use_repo(python)
 
 # C++ GoogleTest dependencies.
-bazel_dep(name = "googletest", version = "1.14.0", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
 
 # Rust rules.
-bazel_dep(name = "rules_rust", version = "0.56.0")
+bazel_dep(name = "rules_rust", version = "0.67.0")
 
 # C/C++ rules.
-bazel_dep(name = "rules_cc", version = "0.1.1", dev_dependency = True)
+bazel_dep(name = "rules_cc", version = "0.2.14")
 
 # Rust module dependencies.
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
@@ -51,8 +51,8 @@ rust.toolchain(
     versions = ["1.85.0"],
 )
 
-# C++ base libs.
-bazel_dep(name = "score_baselibs", version = "0.1.2", dev_dependency = True)
+# Json for C++.
+bazel_dep(name = "nlohmann_json", version = "3.12.0")
 
 # Score Rust crates.
-bazel_dep(name = "score_crates", version = "0.0.4")
+bazel_dep(name = "score_crates", version = "0.0.6")

test_scenarios_cpp/BUILD

@@ -35,7 +35,7 @@ cc_library(
     ],
     includes = ["include/"],
     visibility = ["//visibility:public"],
-    deps = ["@score_baselibs//score/json:json_parser"],
+    deps = ["@nlohmann_json//:json"],
 )
 
 cc_test(

test_scenarios_cpp/include/tracing.hpp

@@ -20,7 +20,7 @@
 #include <string>
 
 #include "monotonic_clock.hpp"
-#include "score/json/json_writer.h"
+#include <nlohmann/json.hpp>
 
 #define _TRACING(target, level, fields...)                         \
     do {                                                           \
@@ -58,8 +58,7 @@ class Subscriber {
     template <typename... T>
     void event(const std::optional<std::string>& target, const Level& level,
                std::pair<std::string, T>... fields) const {
-        using namespace score::json;
-        Object fields_object{object_create(fields...)};
+        nlohmann::json fields_object = object_create(fields...);
         handle_event(target, level, std::move(fields_object));
     }
 
@@ -69,15 +68,15 @@ class Subscriber {
     MonotonicClock timer_;
 
     void handle_event(const std::optional<std::string>& target, const Level& level,
-                      score::json::Object&& fields) const;
+                      nlohmann::json&& fields) const;
 
-    score::json::Object object_create() const { return score::json::Object{}; }
+    nlohmann::json object_create() const { return nlohmann::json::object(); }
 
     template <typename HeadT, typename... TailT>
-    score::json::Object object_create(std::pair<std::string, HeadT> field,
-                                      std::pair<std::string, TailT>... fields) const {
-        auto object{object_create(fields...)};
-        object.insert(field);
+    nlohmann::json object_create(std::pair<std::string, HeadT> field,
+                                 std::pair<std::string, TailT>... fields) const {
+        auto object = object_create(fields...);
+        object[field.first] = field.second;
         return object;
     }
 };

test_scenarios_cpp/src/tracing.cpp

@@ -65,15 +65,13 @@ Subscriber::Subscriber(Level max_level, bool thread_ids)
     : max_level_{max_level}, thread_ids_{thread_ids} {}
 
 void Subscriber::handle_event(const std::optional<std::string>& target, const Level& level,
-                              score::json::Object&& fields) const {
-    using namespace score::json;
-
+                              nlohmann::json&& fields) const {
     // Drop handling if below max level.
     if (level < max_level_) {
         return;
     }
 
-    Object event;
+    nlohmann::json event;
 
     // Add timestamp.
     event.emplace("timestamp", timer_.format_time());
@@ -98,17 +96,13 @@ void Subscriber::handle_event(const std::optional<std::string>& target, const Le
     }
 
     // Make JSON string.
-    JsonWriter writer;
-    auto buffer_result{writer.ToBuffer(event)};
-    if (!buffer_result) {
-        throw std::runtime_error{"Failed to stringify JSON"};
-    }
+    std::string json_str = event.dump();
 
     // Minify JSON and add "\n".
     // "\n" + 'std::flush' is used instead of 'std::endl'.
     // This is to avoid message mangling in multithreaded scenarios.
     std::stringstream ss;
-    ss << minify_json(*buffer_result) << "\n";
+    ss << minify_json(json_str) << "\n";
 
     // Print output.
     std::cout << ss.str() << std::flush;