From c49f9e8a16997d7dc4cad691a249741146101be0 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Mon, 23 Jun 2025 12:00:03 +0200
Subject: ExecutionService: Use LocalApi directly

---
 .../execution_api/execution_service/execution_server.hpp      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/buildtool/execution_api/execution_service/execution_server.hpp')

diff --git a/src/buildtool/execution_api/execution_service/execution_server.hpp b/src/buildtool/execution_api/execution_service/execution_server.hpp
index 7e1bcfa1..2ae636da 100644
--- a/src/buildtool/execution_api/execution_service/execution_server.hpp
+++ b/src/buildtool/execution_api/execution_service/execution_server.hpp
@@ -26,20 +26,21 @@
 #include "gsl/gsl"
 #include "src/buildtool/common/bazel_types.hpp"
 #include "src/buildtool/execution_api/common/execution_action.hpp"
-#include "src/buildtool/execution_api/common/execution_api.hpp"
-#include "src/buildtool/execution_api/common/execution_response.hpp"
 #include "src/buildtool/execution_api/execution_service/operation_cache.hpp"
 #include "src/buildtool/execution_api/local/context.hpp"
+#include "src/buildtool/execution_api/local/local_api.hpp"
 #include "src/buildtool/logging/logger.hpp"
 #include "src/buildtool/storage/config.hpp"
 #include "src/buildtool/storage/storage.hpp"
 #include "src/utils/cpp/expected.hpp"
 
+class LocalResponse;
+
 class ExecutionServiceImpl final : public bazel_re::Execution::Service {
   public:
     explicit ExecutionServiceImpl(
         gsl::not_null<LocalContext const*> const& local_context,
-        gsl::not_null<IExecutionApi const*> const& local_api,
+        gsl::not_null<LocalApi const*> const& local_api,
         std::optional<std::uint8_t> op_exponent) noexcept
         : storage_config_{*local_context->storage_config},
           storage_{*local_context->storage},
@@ -137,7 +138,7 @@ class ExecutionServiceImpl final : public bazel_re::Execution::Service {
   private:
     StorageConfig const& storage_config_;
     Storage const& storage_;
-    IExecutionApi const& api_;
+    LocalApi const& api_;
     OperationCache op_cache_;
     Logger logger_{"execution-service"};
 
@@ -146,7 +147,7 @@ class ExecutionServiceImpl final : public bazel_re::Execution::Service {
         const noexcept -> std::optional<IExecutionAction::Ptr>;
 
     [[nodiscard]] auto ToBazelExecuteResponse(
-        IExecutionResponse::Ptr const& i_execution_response) const noexcept
+        gsl::not_null<LocalResponse*> const& local_response) const noexcept
         -> expected<::bazel_re::ExecuteResponse, std::string>;
 
     void WriteResponse(
-- 
cgit v1.2.3