diff --git a/include/cloud_point_rpc/cli.hpp b/include/cloud_point_rpc/cli.hpp index 43aa35a..155478d 100644 --- a/include/cloud_point_rpc/cli.hpp +++ b/include/cloud_point_rpc/cli.hpp @@ -3,7 +3,7 @@ #include #include #include "export.h" -namespace cloud_point_rpc { +namespace score { /** * @brief Runs the CLI client. diff --git a/include/cloud_point_rpc/config.hpp b/include/cloud_point_rpc/config.hpp index cb26526..ba06840 100644 --- a/include/cloud_point_rpc/config.hpp +++ b/include/cloud_point_rpc/config.hpp @@ -6,7 +6,7 @@ #include #include -namespace cloud_point_rpc { +namespace score { struct ServerConfig { std::string ip; diff --git a/include/cloud_point_rpc/rpc_client.hpp b/include/cloud_point_rpc/rpc_client.hpp index 267f976..f7c8861 100644 --- a/include/cloud_point_rpc/rpc_client.hpp +++ b/include/cloud_point_rpc/rpc_client.hpp @@ -6,7 +6,7 @@ #include #include #include -namespace cloud_point_rpc { +namespace score { class RpcClient : public jsonrpccxx::JsonRpcClient { public: diff --git a/include/cloud_point_rpc/rpc_server.hpp b/include/cloud_point_rpc/rpc_server.hpp index c52c34b..d5dc23b 100644 --- a/include/cloud_point_rpc/rpc_server.hpp +++ b/include/cloud_point_rpc/rpc_server.hpp @@ -16,7 +16,7 @@ struct rpc_string { }; } -namespace cloud_point_rpc { +namespace score { class CRPC_EXPORT RpcServer { public: diff --git a/include/cloud_point_rpc/serialize.hpp b/include/cloud_point_rpc/serialize.hpp index ee19dd0..187307b 100644 --- a/include/cloud_point_rpc/serialize.hpp +++ b/include/cloud_point_rpc/serialize.hpp @@ -5,7 +5,7 @@ #include #include -namespace cloud_point_rpc { +namespace score { template concept NumericType = requires(T param) { diff --git a/include/cloud_point_rpc/service.hpp b/include/cloud_point_rpc/service.hpp index d3134be..efadc6c 100644 --- a/include/cloud_point_rpc/service.hpp +++ b/include/cloud_point_rpc/service.hpp @@ -3,7 +3,7 @@ #include "cloud_point_rpc/config.hpp" #include #include "export.h" -namespace cloud_point_rpc { +namespace score { class CRPC_EXPORT Service { public: diff --git a/include/cloud_point_rpc/tcp_connector.hpp b/include/cloud_point_rpc/tcp_connector.hpp index 69d0975..a9d1ab0 100644 --- a/include/cloud_point_rpc/tcp_connector.hpp +++ b/include/cloud_point_rpc/tcp_connector.hpp @@ -6,7 +6,7 @@ #include #include #include "export.h" -namespace cloud_point_rpc { +namespace score { /** * TCPConnector main purpose is to implement jsonrpccxx::IClientConnector Send * method As an internal implementation, TCPConnector adds to the beginning of diff --git a/include/cloud_point_rpc/tcp_read.hpp b/include/cloud_point_rpc/tcp_read.hpp index 8b71a0d..6c0b2f6 100644 --- a/include/cloud_point_rpc/tcp_read.hpp +++ b/include/cloud_point_rpc/tcp_read.hpp @@ -3,7 +3,7 @@ #include #include #include -namespace cloud_point_rpc { +namespace score { static inline std::string tcp_read(asio::ip::tcp::socket &socket, std::string_view prefix) { diff --git a/include/cloud_point_rpc/tcp_server.hpp b/include/cloud_point_rpc/tcp_server.hpp index 0adb1ff..0cf73fd 100644 --- a/include/cloud_point_rpc/tcp_server.hpp +++ b/include/cloud_point_rpc/tcp_server.hpp @@ -10,7 +10,7 @@ #include "export.h" #include #include -namespace cloud_point_rpc { +namespace score { class CRPC_EXPORT TcpServer { public: diff --git a/src/cli.cpp b/src/cli.cpp index 75668db..8b4bd0c 100644 --- a/src/cli.cpp +++ b/src/cli.cpp @@ -3,7 +3,7 @@ #include #include -namespace cloud_point_rpc { +namespace score { void print_menu(std::ostream &output) { output << "\n=== Cloud Point RPC CLI ===" << std::endl; diff --git a/src/main.cpp b/src/main.cpp index 3068468..cd0db86 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,8 +24,8 @@ int main(int argc, char *argv[]) { f.close(); try { - auto config = cloud_point_rpc::ConfigLoader::load(config_path); - return cloud_point_rpc::run_cli(std::cin, std::cout, config.server.ip, + auto config = score::ConfigLoader::load(config_path); + return score::run_cli(std::cin, std::cout, config.server.ip, config.server.port); } catch (const std::exception &e) { std::cerr << "Failed to start CLI: " << e.what() << std::endl; diff --git a/src/rpc_server.cpp b/src/rpc_server.cpp index a634472..08d3012 100644 --- a/src/rpc_server.cpp +++ b/src/rpc_server.cpp @@ -2,7 +2,7 @@ #include using json = nlohmann::json; -namespace cloud_point_rpc { +namespace score { namespace { json create_error(int code, const std::string &message, diff --git a/src/server_api.cpp b/src/server_api.cpp index 0083768..84a7d56 100644 --- a/src/server_api.cpp +++ b/src/server_api.cpp @@ -9,8 +9,8 @@ #include static std::list> gc; -cloud_point_rpc::RpcServer rpc_server; -std::unique_ptr server = nullptr; +score::RpcServer rpc_server; +std::unique_ptr server = nullptr; extern "C" { @@ -40,10 +40,10 @@ void crpc_init(const char* config_path) { LOG(INFO) << "config_path was not provided"; } try { - auto config = cloud_point_rpc::ConfigLoader::load(config_path); + auto config = score::ConfigLoader::load(config_path); LOG(INFO) << "Loaded config from " << config_path; - server = std::make_unique(config.server.ip, config.server.port, + server = std::make_unique(config.server.ip, config.server.port, [&](const std::string &request) { return rpc_server.process( request); diff --git a/src/server_main.cpp b/src/server_main.cpp index 7ff4c9f..7473e49 100644 --- a/src/server_main.cpp +++ b/src/server_main.cpp @@ -20,12 +20,12 @@ int main(int argc, char *argv[]) { LOG(INFO) << "Starting Cloud Point RPC Server (Test Mock)..."; try { - auto config = cloud_point_rpc::ConfigLoader::load(config_path); + auto config = score::ConfigLoader::load(config_path); LOG(INFO) << "Loaded config from " << config_path; // Inject test data into service - cloud_point_rpc::Service service(config.test_data); - cloud_point_rpc::RpcServer rpc_server; + score::Service service(config.test_data); + score::RpcServer rpc_server; rpc_server.register_method("get-intrinsic-params", [&](const json &) { return service.get_intrinsic_params(); @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { return service.get_cloud_point(); }); - cloud_point_rpc::TcpServer server(config.server.ip, config.server.port, + score::TcpServer server(config.server.ip, config.server.port, [&](const std::string &request) { return rpc_server.process( request); diff --git a/src/service.cpp b/src/service.cpp index e88cb82..2745d5b 100644 --- a/src/service.cpp +++ b/src/service.cpp @@ -1,6 +1,6 @@ #include "cloud_point_rpc/service.hpp" -namespace cloud_point_rpc { +namespace score { Service::Service(const TestData &data) : data_(data) {} diff --git a/src/test_api.cpp b/src/test_api.cpp index 166e426..1779ced 100644 --- a/src/test_api.cpp +++ b/src/test_api.cpp @@ -121,7 +121,7 @@ class TestThread { calls_queue = std::queue(); methods.clear(); state.store(true, std::memory_order_relaxed); - server = cloud_point_rpc::RpcServer(); + server = score::RpcServer(); } private: @@ -131,7 +131,7 @@ class TestThread { std::set methods{}; std::jthread thr; std::mutex mtx; - cloud_point_rpc::RpcServer server; + score::RpcServer server; std::chrono::duration thr_sleep{50}; } test; diff --git a/tests/test_cli.cpp b/tests/test_cli.cpp index e7897f0..a94fdc4 100644 --- a/tests/test_cli.cpp +++ b/tests/test_cli.cpp @@ -9,7 +9,7 @@ #include "cloud_point_rpc/rpc_server.hpp" #include "cloud_point_rpc/tcp_server.hpp" -using namespace cloud_point_rpc; +using namespace score; class CliTest : public ::testing::Test { public: diff --git a/tests/test_integration.cpp b/tests/test_integration.cpp index da418fc..721e654 100644 --- a/tests/test_integration.cpp +++ b/tests/test_integration.cpp @@ -11,7 +11,7 @@ #include -using namespace cloud_point_rpc; +using namespace score; class IntegrationTest : public ::testing::Test { protected: diff --git a/tests/test_rpc.cpp b/tests/test_rpc.cpp index 979b0fe..3d2798e 100644 --- a/tests/test_rpc.cpp +++ b/tests/test_rpc.cpp @@ -7,7 +7,7 @@ #include using json = nlohmann::json; -using namespace cloud_point_rpc; +using namespace score; class RpcServerTest : public ::testing::Test { protected: diff --git a/tests/test_tcp.cpp b/tests/test_tcp.cpp index 852f94c..4046853 100644 --- a/tests/test_tcp.cpp +++ b/tests/test_tcp.cpp @@ -15,11 +15,11 @@ class TcpTest : public ::testing::Test { protected: void SetUp() override { - server_ = std::make_unique( + server_ = std::make_unique( "127.0.0.1", 12345, [this](const std::string &request) { EXPECT_EQ(request, expected_); std::string msg = "Echo: " + request; - auto v = cloud_point_rpc::serialize(msg.length()); + auto v = score::serialize(msg.length()); std::string res(v.begin(), v.end()); res += msg; return res; @@ -33,19 +33,19 @@ class TcpTest : public ::testing::Test { } std::string expected_; - std::unique_ptr server_; + std::unique_ptr server_; }; TEST(SerializeTest, Base) { uint64_t value{123}; - auto res = cloud_point_rpc::serialize(value); - EXPECT_EQ(value, cloud_point_rpc::deserialize(res)); + auto res = score::serialize(value); + EXPECT_EQ(value, score::deserialize(res)); } TEST_F(TcpTest, EchoTest) { constexpr std::string_view msg = "Hello, TCP Server!"; ExpectedResponse(msg.data()); - cloud_point_rpc::TCPConnector connector("127.0.0.1", 12345); + score::TCPConnector connector("127.0.0.1", 12345); auto res = connector.Send(msg.data()); } @@ -53,6 +53,6 @@ TEST_F(TcpTest, HugeBuffer) { static constexpr uint64_t w = 1280, h = 720, c = 3; std::string data(w * h * c, 77); ExpectedResponse(data); - cloud_point_rpc::TCPConnector connector("127.0.0.1", 12345); + score::TCPConnector connector("127.0.0.1", 12345); auto res = connector.Send(data); } \ No newline at end of file