Moved Data class to an own utils package in blobstore

src/blobstore/CMakeLists.txt

@@ -1 +1,2 @@
+add_subdirectory(utils)
 add_subdirectory(implementations)

src/blobstore/implementations/ondisk/CMakeLists.txt

@@ -1,3 +1,3 @@
-add_library(blobstore_ondisk Data.cpp OnDiskBlob.cpp OnDiskBlobStore.cpp RandomKeyGenerator.cpp FileAlreadyExistsException.cpp FileDoesntExistException.cpp)
+add_library(blobstore_ondisk OnDiskBlob.cpp OnDiskBlobStore.cpp RandomKeyGenerator.cpp FileAlreadyExistsException.cpp)
 
-target_link_libraries(blobstore_ondisk boost_filesystem boost_system cryptopp)
+target_link_libraries(blobstore_ondisk blobstore_utils boost_filesystem boost_system cryptopp)

src/blobstore/implementations/ondisk/OnDiskBlob.h

@@ -3,7 +3,7 @@
 #define BLOBSTORE_IMPLEMENTATIONS_ONDISK_ONDISKBLOB_H_
 
 #include "blobstore/interface/Blob.h"
-#include "Data.h"
+#include "blobstore/utils/Data.h"
 
 #include <boost/filesystem/path.hpp>
 #include <iostream>

src/blobstore/implementations/ondisk/RandomKeyGenerator.h

@@ -2,8 +2,6 @@
 #ifndef BLOBSTORE_IMPLEMENTATIONS_ONDISK_RANDOMKEYGENERATOR_H_
 #define BLOBSTORE_IMPLEMENTATIONS_ONDISK_RANDOMKEYGENERATOR_H_
 
-#include "Data.h"
-
 #include "fspp/utils/macros.h"
 #include <memory>
 

src/blobstore/utils/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(blobstore_utils Data.cpp FileDoesntExistException.cpp)
+

src/blobstore/utils/FileDoesntExistException.cpp

@@ -1,4 +1,4 @@
-#include <blobstore/implementations/ondisk/FileDoesntExistException.h>
+#include "FileDoesntExistException.h"
 
 namespace bf = boost::filesystem;
 

src/test/blobstore/ondisk/OnDiskBlobTest/OnDiskBlobLoadTest.cpp

@@ -4,8 +4,8 @@
 #include "test/testutils/VirtualTestFile.h"
 
 #include "blobstore/implementations/ondisk/OnDiskBlob.h"
-#include "blobstore/implementations/ondisk/Data.h"
-#include "blobstore/implementations/ondisk/FileDoesntExistException.h"
+#include "blobstore/utils/FileDoesntExistException.h"
+#include "blobstore/utils/Data.h"
 
 #include <fstream>
 

src/test/blobstore/utils/DataTest.cpp

@@ -1,7 +1,7 @@
 #include "gtest/gtest.h"
 
-#include "blobstore/implementations/ondisk/Data.h"
-#include "blobstore/implementations/ondisk/FileDoesntExistException.h"
+#include "blobstore/utils/Data.h"
+#include "blobstore/utils/FileDoesntExistException.h"
 
 #include "test/testutils/VirtualTestFile.h"
 #include "test/testutils/TempFile.h"