diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index c08b7d67238979a5c2007b6a58d38734538f5b49..a1aa5a871f09946b836159be80e16ba5c35e1934 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -36,14 +36,14 @@ set(libcaosdb_INCL
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/transaction.h
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/transaction_status.h
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/utility.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/Client.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/UploadRequestHandler.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/DownloadRequestHandler.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/HandlerInterface.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/FileWriter.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/FileReader.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/FileLock.h
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/FileError.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/Client.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/UploadRequestHandler.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/DownloadRequestHandler.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/HandlerInterface.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileWriter.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileReader.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileLock.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileError.h
)
# pass variable to parent scope
diff --git a/include/caosdb/filestreaming/Client.h b/include/caosdb/file_transmission/Client.h
similarity index 67%
rename from include/caosdb/filestreaming/Client.h
rename to include/caosdb/file_transmission/Client.h
index 35afc97069fb36523ce5e7fb4fb3223b709d6e3e..218a3e6859a2039932700a1df921602704b3315e 100644
--- a/include/caosdb/filestreaming/Client.h
+++ b/include/caosdb/file_transmission/Client.h
@@ -1,9 +1,9 @@
-#include "caosdb/entity.h" // for FileDescriptor
-#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for FileTransmissionS...
-#include "caosdb/filestreaming/HandlerInterface.h" // for HandlerInterface
-#include "caosdb/status_code.h" // for StatusCode
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
-#include <memory> // for shared_ptr, uniqu...
+#include "caosdb/entity.h" // for FileDescriptor
+#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for FileTransmissionS...
+#include "caosdb/file_transmission/HandlerInterface.h" // for HandlerInterface
+#include "caosdb/status_code.h" // for StatusCode
+#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
+#include <memory> // for shared_ptr, uniqu...
namespace FileExchange {
using caosdb::StatusCode;
diff --git a/include/caosdb/filestreaming/DownloadRequestHandler.h b/include/caosdb/file_transmission/DownloadRequestHandler.h
similarity index 67%
rename from include/caosdb/filestreaming/DownloadRequestHandler.h
rename to include/caosdb/file_transmission/DownloadRequestHandler.h
index 45e52c5615575e05096eebe6f1eb17c4311607ae..0b19132fc07bd2afdc4ce42aee28ae28c6ee7645 100644
--- a/include/caosdb/filestreaming/DownloadRequestHandler.h
+++ b/include/caosdb/file_transmission/DownloadRequestHandler.h
@@ -1,13 +1,13 @@
-#include "caosdb/entity.h" // for FileDescriptor
-#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for FileTransmissionS...
-#include "caosdb/entity/v1alpha1/main.pb.h" // for FileDownloadResponse
-#include "caosdb/filestreaming/FileWriter.h" // for FileWriter
-#include "caosdb/filestreaming/HandlerInterface.h" // for HandlerTag, Handl...
-#include <grpcpp/impl/codegen/async_stream.h> // for ClientAsyncReader
-#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
-#include <grpcpp/impl/codegen/status.h> // for Status
-#include <memory> // for unique_ptr
+#include "caosdb/entity.h" // for FileDescriptor
+#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for FileTransmissionS...
+#include "caosdb/entity/v1alpha1/main.pb.h" // for FileDownloadResponse
+#include "caosdb/file_transmission/FileWriter.h" // for FileWriter
+#include "caosdb/file_transmission/HandlerInterface.h" // for HandlerTag, Handl...
+#include <grpcpp/impl/codegen/async_stream.h> // for ClientAsyncReader
+#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
+#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
+#include <grpcpp/impl/codegen/status.h> // for Status
+#include <memory> // for unique_ptr
namespace FileExchange {
using caosdb::entity::FileDescriptor;
diff --git a/include/caosdb/filestreaming/FileError.h b/include/caosdb/file_transmission/FileError.h
similarity index 100%
rename from include/caosdb/filestreaming/FileError.h
rename to include/caosdb/file_transmission/FileError.h
diff --git a/include/caosdb/filestreaming/FileLock.h b/include/caosdb/file_transmission/FileLock.h
similarity index 100%
rename from include/caosdb/filestreaming/FileLock.h
rename to include/caosdb/file_transmission/FileLock.h
diff --git a/include/caosdb/filestreaming/FileReader.h b/include/caosdb/file_transmission/FileReader.h
similarity index 64%
rename from include/caosdb/filestreaming/FileReader.h
rename to include/caosdb/file_transmission/FileReader.h
index ff0ac49c48186c0481f9547c8946b7c71d68b562..c1264395eb1a43b20e7f7ddf3395c85b26dce396 100644
--- a/include/caosdb/filestreaming/FileReader.h
+++ b/include/caosdb/file_transmission/FileReader.h
@@ -1,12 +1,12 @@
#pragma once
-#include "caosdb/filestreaming/FileLock.h" // for FileMutex, FileReadLock
-#include <boost/filesystem/fstream.hpp> // for ifstream
-#include <boost/filesystem/operations.hpp> // for exists
-#include <boost/filesystem/path.hpp> // for path
-#include <fstream> // for ifstream, size_t
-#include <memory> // for shared_ptr
-#include <string> // for string
+#include "caosdb/file_transmission/FileLock.h" // for FileMutex, FileReadLock
+#include <boost/filesystem/fstream.hpp> // for ifstream
+#include <boost/filesystem/operations.hpp> // for exists
+#include <boost/filesystem/path.hpp> // for path
+#include <fstream> // for ifstream, size_t
+#include <memory> // for shared_ptr
+#include <string> // for string
namespace FileExchange {
using boost::filesystem::exists;
diff --git a/include/caosdb/filestreaming/FileWriter.h b/include/caosdb/file_transmission/FileWriter.h
similarity index 67%
rename from include/caosdb/filestreaming/FileWriter.h
rename to include/caosdb/file_transmission/FileWriter.h
index a757fe849e6bbf5c0e952bc097b4559872806971..ee1589194b2c4eee6ac889d71eab5a4d7ea64438 100644
--- a/include/caosdb/filestreaming/FileWriter.h
+++ b/include/caosdb/file_transmission/FileWriter.h
@@ -1,10 +1,10 @@
#pragma once
-#include "caosdb/filestreaming/FileLock.h" // for FileMutex, FileWriteLock
-#include <boost/filesystem/path.hpp> // for path
-#include <fstream> // for ofstream
-#include <memory> // for shared_ptr
-#include <string> // for string
+#include "caosdb/file_transmission/FileLock.h" // for FileMutex, FileWriteLock
+#include <boost/filesystem/path.hpp> // for path
+#include <fstream> // for ofstream
+#include <memory> // for shared_ptr
+#include <string> // for string
namespace FileExchange {
diff --git a/include/caosdb/filestreaming/HandlerInterface.h b/include/caosdb/file_transmission/HandlerInterface.h
similarity index 100%
rename from include/caosdb/filestreaming/HandlerInterface.h
rename to include/caosdb/file_transmission/HandlerInterface.h
diff --git a/include/caosdb/filestreaming/LICENSE b/include/caosdb/file_transmission/LICENSE
similarity index 100%
rename from include/caosdb/filestreaming/LICENSE
rename to include/caosdb/file_transmission/LICENSE
diff --git a/include/caosdb/filestreaming/UploadRequestHandler.h b/include/caosdb/file_transmission/UploadRequestHandler.h
similarity index 65%
rename from include/caosdb/filestreaming/UploadRequestHandler.h
rename to include/caosdb/file_transmission/UploadRequestHandler.h
index 1e83c432ee64fe39faeb1a16ddae01ac514675b3..6803a1ae6018f120065bca65a59ed7d82e4d9387 100644
--- a/include/caosdb/filestreaming/UploadRequestHandler.h
+++ b/include/caosdb/file_transmission/UploadRequestHandler.h
@@ -1,14 +1,14 @@
-#include "caosdb/entity.h" // for FileDescriptor
-#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for FileTransmissionS...
-#include "caosdb/entity/v1alpha1/main.pb.h" // for FileUploadRequest
-#include "caosdb/filestreaming/FileReader.h" // for FileReader
-#include "caosdb/filestreaming/HandlerInterface.h" // for HandlerTag, Handl...
-#include <cstdint> // for uint64_t
-#include <grpcpp/impl/codegen/async_stream.h> // for ClientAsyncWriter
-#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
-#include <grpcpp/impl/codegen/status.h> // for Status
-#include <memory> // for unique_ptr
+#include "caosdb/entity.h" // for FileDescriptor
+#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for FileTransmissionS...
+#include "caosdb/entity/v1alpha1/main.pb.h" // for FileUploadRequest
+#include "caosdb/file_transmission/FileReader.h" // for FileReader
+#include "caosdb/file_transmission/HandlerInterface.h" // for HandlerTag, Handl...
+#include <cstdint> // for uint64_t
+#include <grpcpp/impl/codegen/async_stream.h> // for ClientAsyncWriter
+#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
+#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
+#include <grpcpp/impl/codegen/status.h> // for Status
+#include <memory> // for unique_ptr
namespace FileExchange {
using caosdb::entity::FileDescriptor;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f447d60162f7b49125500767508af42c64d8fb5..57fc47ad5aac33d2aab2a591cfdd6d8696366e80 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,11 +28,11 @@ set(libcaosdb_SRC
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/configuration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/protobuf_helper.cpp
${CMAKE_CURRENT_SOURCE_DIR}/caosdb/transaction.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/Client.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/UploadRequestHandler.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/DownloadRequestHandler.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/FileWriter.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/filestreaming/FileReader.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/Client.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/UploadRequestHandler.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/DownloadRequestHandler.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileWriter.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/caosdb/file_transmission/FileReader.cpp
)
# pass variable to parent scope
diff --git a/src/caosdb/filestreaming/Client.cpp b/src/caosdb/file_transmission/Client.cpp
similarity index 73%
rename from src/caosdb/filestreaming/Client.cpp
rename to src/caosdb/file_transmission/Client.cpp
index 8c668da379744a5765bcb03a4120337a8078fd04..769cbb9c18891c5a0edad7589904b31d056f835c 100644
--- a/src/caosdb/filestreaming/Client.cpp
+++ b/src/caosdb/file_transmission/Client.cpp
@@ -1,13 +1,13 @@
-#include "caosdb/filestreaming/Client.h"
-#include "caosdb/filestreaming/DownloadRequestHandler.h" // for DownloadReq...
-#include "caosdb/filestreaming/UploadRequestHandler.h" // for UploadReque...
-#include "caosdb/logging.h" // for CAOSDB_LOG_...
-#include "caosdb/status_code.h" // for StatusCode
-#include <boost/log/core/record.hpp> // for record
-#include <boost/log/sources/record_ostream.hpp> // for basic_recor...
-#include <boost/preprocessor/seq/limits/enum_256.hpp> // for BOOST_PP_SE...
-#include <boost/preprocessor/seq/limits/size_256.hpp> // for BOOST_PP_SE...
-#include <exception> // IWYU pragma: keep
+#include "caosdb/file_transmission/Client.h"
+#include "caosdb/file_transmission/DownloadRequestHandler.h" // for DownloadReq...
+#include "caosdb/file_transmission/UploadRequestHandler.h" // for UploadReque...
+#include "caosdb/logging.h" // for CAOSDB_LOG_...
+#include "caosdb/status_code.h" // for StatusCode
+#include <boost/log/core/record.hpp> // for record
+#include <boost/log/sources/record_ostream.hpp> // for basic_recor...
+#include <boost/preprocessor/seq/limits/enum_256.hpp> // for BOOST_PP_SE...
+#include <boost/preprocessor/seq/limits/size_256.hpp> // for BOOST_PP_SE...
+#include <exception> // IWYU pragma: keep
// IWYU pragma: no_include <bits/exception.h>
#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQ...
diff --git a/src/caosdb/filestreaming/DownloadRequestHandler.cpp b/src/caosdb/file_transmission/DownloadRequestHandler.cpp
similarity index 99%
rename from src/caosdb/filestreaming/DownloadRequestHandler.cpp
rename to src/caosdb/file_transmission/DownloadRequestHandler.cpp
index 6b59210a6525ff823942e56624f6c227f7660060..57ce85c92540098331f669df7d05575993f818d7 100644
--- a/src/caosdb/filestreaming/DownloadRequestHandler.cpp
+++ b/src/caosdb/file_transmission/DownloadRequestHandler.cpp
@@ -1,4 +1,4 @@
-#include "caosdb/filestreaming/DownloadRequestHandler.h"
+#include "caosdb/file_transmission/DownloadRequestHandler.h"
#include "caosdb/exceptions.h" // for Exception
#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
#include "caosdb/protobuf_helper.h" // for get_arena
diff --git a/src/caosdb/filestreaming/FileReader.cpp b/src/caosdb/file_transmission/FileReader.cpp
similarity index 80%
rename from src/caosdb/filestreaming/FileReader.cpp
rename to src/caosdb/file_transmission/FileReader.cpp
index c7d3648739d9965fff1e205ced5603c6864406bf..8ea983023f86cb8f71807fb0da3809696f92ab27 100644
--- a/src/caosdb/filestreaming/FileReader.cpp
+++ b/src/caosdb/file_transmission/FileReader.cpp
@@ -1,8 +1,8 @@
-#include "caosdb/filestreaming/FileReader.h"
-#include "caosdb/filestreaming/FileError.h" // for FileIOError, FileLockError
-#include <boost/filesystem/path.hpp> // for path
-#include <mutex> // for try_to_lock
-#include <utility> // for move
+#include "caosdb/file_transmission/FileReader.h"
+#include "caosdb/file_transmission/FileError.h" // for FileIOError, FileLockError
+#include <boost/filesystem/path.hpp> // for path
+#include <mutex> // for try_to_lock
+#include <utility> // for move
namespace FileExchange {
diff --git a/src/caosdb/filestreaming/FileWriter.cpp b/src/caosdb/file_transmission/FileWriter.cpp
similarity index 76%
rename from src/caosdb/filestreaming/FileWriter.cpp
rename to src/caosdb/file_transmission/FileWriter.cpp
index a832934726cd0b49c80000d98204ab3a1db0e6fa..3956ee22d26516b1aa7067451c1c2ff631bad9ca 100644
--- a/src/caosdb/filestreaming/FileWriter.cpp
+++ b/src/caosdb/file_transmission/FileWriter.cpp
@@ -1,8 +1,8 @@
-#include "caosdb/filestreaming/FileWriter.h"
-#include "caosdb/filestreaming/FileError.h" // for FileIOError, FileLockError
-#include <boost/filesystem/path.hpp> // for path
-#include <mutex> // for try_to_lock
-#include <utility> // for move
+#include "caosdb/file_transmission/FileWriter.h"
+#include "caosdb/file_transmission/FileError.h" // for FileIOError, FileLockError
+#include <boost/filesystem/path.hpp> // for path
+#include <mutex> // for try_to_lock
+#include <utility> // for move
namespace FileExchange {
diff --git a/src/caosdb/filestreaming/LICENSE b/src/caosdb/file_transmission/LICENSE
similarity index 100%
rename from src/caosdb/filestreaming/LICENSE
rename to src/caosdb/file_transmission/LICENSE
diff --git a/src/caosdb/filestreaming/UploadRequestHandler.cpp b/src/caosdb/file_transmission/UploadRequestHandler.cpp
similarity index 98%
rename from src/caosdb/filestreaming/UploadRequestHandler.cpp
rename to src/caosdb/file_transmission/UploadRequestHandler.cpp
index cefb63e4a39d89140623ce2aa6f08f500c3f76a2..526362c102d90f7431dc9871b927a06129b98821 100644
--- a/src/caosdb/filestreaming/UploadRequestHandler.cpp
+++ b/src/caosdb/file_transmission/UploadRequestHandler.cpp
@@ -1,4 +1,4 @@
-#include "caosdb/filestreaming/UploadRequestHandler.h"
+#include "caosdb/file_transmission/UploadRequestHandler.h"
#include "caosdb/exceptions.h" // for Exception
#include "caosdb/logging.h" // for CAOSDB_LOG_ERROR
#include "caosdb/protobuf_helper.h" // for get_arena
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index 895af7e533a77eaf9acbb1f76367cfc84e8ed9ac..810ffd738dd7352e56454995636a518e694e1e1b 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -20,7 +20,7 @@
#include "caosdb/transaction.h"
#include "caosdb/entity/v1alpha1/main.grpc.pb.h" // for EntityTransac...
#include "caosdb/entity/v1alpha1/main.pb.h" // for TransactionRe...
-#include "caosdb/filestreaming/Client.h" // for FileExchangeC...
+#include "caosdb/file_transmission/Client.h" // for FileExchangeC...
#include "caosdb/logging.h" // for CAOSDB_LOG_FATAL
#include "caosdb/protobuf_helper.h" // for get_arena
#include "caosdb/status_code.h" // for StatusCode
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5c67c637cb94460db7a465918a56bfac4e9d4dc6..0ecb50169e94b5f758a429054c80c80e9d420c4d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,7 +23,7 @@ set(test_cases
test_configuration
test_connection
test_entity
- test_file_streaming
+ test_file_transmission
test_info
test_protobuf
test_transaction
diff --git a/test/test_file_streaming.cpp b/test/test_file_transmission.cpp
similarity index 84%
rename from test/test_file_streaming.cpp
rename to test/test_file_transmission.cpp
index 2779faa3dbd5d5a08a63d241b72ba71777b600c8..80f08457665f42d61cb2463397bfb306ad1a0331 100644
--- a/test/test_file_streaming.cpp
+++ b/test/test_file_transmission.cpp
@@ -1,5 +1,5 @@
-#include "caosdb/filestreaming/FileWriter.h"
-#include "caosdb/filestreaming/FileReader.h"
+#include "caosdb/file_transmission/FileWriter.h"
+#include "caosdb/file_transmission/FileReader.h"
#include <boost/filesystem/operations.hpp> // for exists, file_size, remove
#include <boost/filesystem/path.hpp> // for path
#include <boost/filesystem/path_traits.hpp> // for filesystem
@@ -12,7 +12,7 @@ namespace fs = boost::filesystem;
namespace FileExchange {
-class test_file_streaming : public ::testing::Test {
+class test_file_transmission : public ::testing::Test {
protected:
fs::path test_file_name;
@@ -23,7 +23,7 @@ protected:
void TearDown() override { fs::remove(test_file_name); }
};
-TEST_F(test_file_streaming, test_file_writer_reader) {
+TEST_F(test_file_transmission, test_file_writer_reader) {
ASSERT_FALSE(fs::exists(test_file_name));
FileWriter writer(test_file_name);