From dc9a7b8499da9ce7a90546afecd048d0bfb31f38 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Thu, 13 Jun 2024 10:16:29 +0200
Subject: Make ServeApi a general class, not a singleton

...and adjust interfaces.
---
 src/buildtool/serve_api/serve_service/target.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/buildtool/serve_api/serve_service/target.hpp')

diff --git a/src/buildtool/serve_api/serve_service/target.hpp b/src/buildtool/serve_api/serve_service/target.hpp
index 7e94c919..171ac42b 100644
--- a/src/buildtool/serve_api/serve_service/target.hpp
+++ b/src/buildtool/serve_api/serve_service/target.hpp
@@ -40,8 +40,8 @@
 class TargetService final : public justbuild::just_serve::Target::Service {
   public:
     TargetService(RemoteServeConfig const& serve_config,
-                  std::optional<gsl::not_null<const ServeApi*>> serve) noexcept
-        : serve_config_{serve_config}, serve_(std::move(serve)) {}
+                  std::optional<ServeApi> const& serve) noexcept
+        : serve_config_{serve_config}, serve_(serve) {}
 
     // Given a target-level caching key, returns the computed value. In doing
     // so, it can build on the associated endpoint passing the
@@ -120,7 +120,7 @@ class TargetService final : public justbuild::just_serve::Target::Service {
 
   private:
     RemoteServeConfig const& serve_config_;
-    std::optional<gsl::not_null<const ServeApi*>> serve_;
+    std::optional<ServeApi> const& serve_;
     std::shared_ptr<Logger> logger_{std::make_shared<Logger>("target-service")};
 
     // type of dispatch list; reduces verbosity
-- 
cgit v1.2.3