From 7d2f632b1dd1fe2ca01ef89716efe355e4d32687 Mon Sep 17 00:00:00 2001
From: Maksim Denisov <denisov.maksim@huawei.com>
Date: Mon, 16 Sep 2024 15:32:59 +0200
Subject: Introduce ByteStreamUtils, wrap kChunkSize

...and use the qualified name ByteStreamUtils::kChunkSize
---
 src/buildtool/execution_api/common/TARGETS         |  6 ++---
 .../execution_api/common/bytestream_common.hpp     | 23 -------------------
 .../execution_api/common/bytestream_utils.hpp      | 26 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 26 deletions(-)
 delete mode 100644 src/buildtool/execution_api/common/bytestream_common.hpp
 create mode 100644 src/buildtool/execution_api/common/bytestream_utils.hpp

(limited to 'src/buildtool/execution_api/common')

diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 0f3288e5..a060d0fa 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -30,10 +30,10 @@
   , "private-deps": [["src/buildtool/common", "artifact_digest_factory"]]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
-, "bytestream-common":
+, "bytestream_utils":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["bytestream-common"]
-  , "hdrs": ["bytestream_common.hpp"]
+  , "name": ["bytestream_utils"]
+  , "hdrs": ["bytestream_utils.hpp"]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
 , "api_bundle":
diff --git a/src/buildtool/execution_api/common/bytestream_common.hpp b/src/buildtool/execution_api/common/bytestream_common.hpp
deleted file mode 100644
index 5c7cf3cb..00000000
--- a/src/buildtool/execution_api/common/bytestream_common.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2022 Huawei Cloud Computing Technology Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// settings common for server and client
-#ifndef BYTESTREAM_COMMON_HPP
-#define BYTESTREAM_COMMON_HPP
-#include <cstddef>
-
-// Chunk size for uploads (default size used by BuildBarn)
-constexpr static std::size_t kChunkSize = 64 * 1024;
-
-#endif
diff --git a/src/buildtool/execution_api/common/bytestream_utils.hpp b/src/buildtool/execution_api/common/bytestream_utils.hpp
new file mode 100644
index 00000000..c28c9627
--- /dev/null
+++ b/src/buildtool/execution_api/common/bytestream_utils.hpp
@@ -0,0 +1,26 @@
+// Copyright 2024 Huawei Cloud Computing Technology Co., Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BYTESTREAM_UTILS_HPP
+#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BYTESTREAM_UTILS_HPP
+
+#include <cstddef>
+
+class ByteStreamUtils final {
+  public:
+    // Chunk size for uploads (default size used by BuildBarn)
+    static constexpr std::size_t kChunkSize = 64 * 1024;
+};
+
+#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_BYTESTREAM_UTILS_HPP
-- 
cgit v1.2.3