Rename StorageDeserializer to BucketDeserializer

The name StorageDeserializer will be taken by
more general class loading whole db.

TODO: Rename StorageSerializer

Change-Id: I66f5c34c3c47b712f104bc2013da23ef84e4bdd9

diff --git a/src/service/storage/StorageDeserializer.cpp b/src/service/storage/BucketDeserializer.cpp
similarity index 85%
rename from src/service/storage/StorageDeserializer.cpp
rename to src/service/storage/BucketDeserializer.cpp
index c3d255b..f067c69 100644 (file)
--- a/src/service/storage/StorageDeserializer.cpp
+++ b/src/service/storage/BucketDeserializer.cpp
@@ -14,14 +14,14 @@
  *    limitations under the License.
  */
 /*
- * @file        StorageDeserializer.cpp
+ * @file        BucketDeserializer.cpp
  * @author      Aleksander Zdyb <a.zdyb@partner.samsung.com>
  * @version     1.0
- * @brief       Methods implementation of Cynara::StorageDeserializer
+ * @brief       Methods implementation of Cynara::BucketDeserializer
  */
 
 #include <exceptions/BucketRecordCorruptedException.h>
-#include <storage/StorageDeserializer.h>
+#include <storage/BucketDeserializer.h>
 #include <storage/StorageSerializer.h>
 #include <types/Policy.h>
 
@@ -31,7 +31,7 @@
 
 namespace Cynara {
 
-PolicyCollection StorageDeserializer::loadPolicies(std::istream &is) {
+PolicyCollection BucketDeserializer::loadPolicies(std::istream &is) {
     PolicyCollection policies;
 
     // TODO: Get someone smart to do error checking on stream
@@ -57,7 +57,7 @@ PolicyCollection StorageDeserializer::loadPolicies(std::istream &is) {
     return policies;
 }
 
-PolicyKey StorageDeserializer::parseKey(const std::string &line, std::size_t &beginToken) {
+PolicyKey BucketDeserializer::parseKey(const std::string &line, std::size_t &beginToken) {
     std::array<std::string, 3> keyFeatures;
 
     for(std::size_t tokenNum = 0; tokenNum < keyFeatures.size(); ++tokenNum) {
@@ -73,7 +73,7 @@ PolicyKey StorageDeserializer::parseKey(const std::string &line, std::size_t &be
     return PolicyKey(keyFeatures[0], keyFeatures[1], keyFeatures[2]);
 }
 
-PolicyType StorageDeserializer::parsePolicyType(const std::string &line, std::size_t &beginToken) {
+PolicyType BucketDeserializer::parsePolicyType(const std::string &line, std::size_t &beginToken) {
     PolicyType policyType;
     try {
         size_t newBegin = 0;
@@ -86,7 +86,7 @@ PolicyType StorageDeserializer::parsePolicyType(const std::string &line, std::si
     return policyType;
 }
 
-PolicyResult::PolicyMetadata StorageDeserializer::parseMetadata(const std::string &line,
+PolicyResult::PolicyMetadata BucketDeserializer::parseMetadata(const std::string &line,
                                                                 std::size_t &beginToken) {
     if (beginToken < line.size()) {
         auto ret = line.substr(beginToken + 1);

diff --git a/src/service/storage/StorageDeserializer.h b/src/service/storage/BucketDeserializer.h
similarity index 82%
rename from src/service/storage/StorageDeserializer.h
rename to src/service/storage/BucketDeserializer.h
index 66804c5..16ccaa3 100644 (file)
--- a/src/service/storage/StorageDeserializer.h
+++ b/src/service/storage/BucketDeserializer.h
@@ -14,13 +14,13 @@
  *    limitations under the License.
  */
 /*
- * @file        StorageDeserializer.h
+ * @file        BucketDeserializer.h
  * @author      Aleksander Zdyb <a.zdyb@partner.samsung.com>
  * @version     1.0
- * @brief       Headers for Cynara::StorageDeserializer
+ * @brief       Headers for Cynara::BucketDeserializer
  */
-#ifndef SRC_SERVICE_STORAGE_STORAGEDESERIALIZER_H_
-#define SRC_SERVICE_STORAGE_STORAGEDESERIALIZER_H_
+#ifndef SRC_SERVICE_STORAGE_BUCKETDESERIALIZER_H_
+#define SRC_SERVICE_STORAGE_BUCKETDESERIALIZER_H_
 
 #include <types/PolicyCollection.h>
 #include <types/PolicyKey.h>
@@ -31,7 +31,7 @@
 
 namespace Cynara {
 
-class StorageDeserializer {
+class BucketDeserializer {
 public:
     static PolicyCollection loadPolicies(std::istream &is);
 
@@ -44,4 +44,4 @@ protected:
 
 } /* namespace Cynara */
 
-#endif /* SRC_SERVICE_STORAGE_STORAGEDESERIALIZER_H_ */
+#endif /* SRC_SERVICE_STORAGE_BUCKETDESERIALIZER_H_ */

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6da8da4..4f43fdb 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -28,7 +28,7 @@ SET(CYNARA_SOURCES_FOR_TESTS
     ${CYNARA_SRC}/service/storage/Storage.cpp
     ${CYNARA_SRC}/common/types/PolicyBucket.cpp
     ${CYNARA_SRC}/service/storage/InMemoryStorageBackend.cpp
-    ${CYNARA_SRC}/service/storage/StorageDeserializer.cpp
+    ${CYNARA_SRC}/service/storage/BucketDeserializer.cpp
     ${CYNARA_SRC}/service/storage/StorageSerializer.cpp
     ${CYNARA_SRC}/common/types/PolicyKey.cpp
     ${CYNARA_SRC}/common/types/PolicyType.cpp
@@ -43,8 +43,8 @@ SET(CYNARA_TESTS_SOURCES
     storage/inmemorystoragebackend/inmemorystoragebackend.cpp
     storage/inmemorystoragebackend/search.cpp
     storage/inmemorystoragebackend/buckets.cpp
+    storage/serializer/bucket_load.cpp
     storage/serializer/dump.cpp
-    storage/serializer/load.cpp
     common/types/policybucket.cpp
     helpers.cpp
 )

diff --git a/test/storage/serializer/load.cpp b/test/storage/serializer/bucket_load.cpp
similarity index 76%
rename from test/storage/serializer/load.cpp
rename to test/storage/serializer/bucket_load.cpp
index d67af08..0c2dcf6 100644 (file)
--- a/test/storage/serializer/load.cpp
+++ b/test/storage/serializer/bucket_load.cpp
@@ -17,7 +17,7 @@
  * @file        load.cpp
  * @author      Aleksander Zdyb <a.zdyb@partner.samsung.com>
  * @version     1.0
- * @brief       Tests for Cynara::StorageDeserializer
+ * @brief       Tests for Cynara::BucketDeserializer
  */
 
 
@@ -25,7 +25,7 @@
 #include <gtest/gtest.h>
 
 #include <exceptions/BucketRecordCorruptedException.h>
-#include <service/storage/StorageDeserializer.h>
+#include <service/storage/BucketDeserializer.h>
 #include <types/Policy.h>
 
 #include "../../helpers.h"
@@ -42,9 +42,9 @@ MATCHER_P(PolicyPtrEq, policy, "") {
         == std::tie(arg->key(), arg->result());
 }
 
-class DeserializerFixture : public ::testing::Test {
+class BucketDeserializerFixture : public ::testing::Test {
 public:
-    virtual ~DeserializerFixture() = default;
+    virtual ~BucketDeserializerFixture() = default;
 
     PolicyPtr createPolicy(const PolicyKey &pk, const PolicyResult &pr) {
         return std::make_shared<Policy>(pk, pr);
@@ -53,11 +53,11 @@ public:
     void checkCorruptedData(const std::string &data, const std::string &corruptedLine,
             size_t corruptedLineNumber) {
         std::istringstream ss(data);
-        EXPECT_THROW(StorageDeserializer::loadPolicies(ss), BucketRecordCorruptedException);
+        EXPECT_THROW(BucketDeserializer::loadPolicies(ss), BucketRecordCorruptedException);
 
         ss.seekg(0);
         try {
-            StorageDeserializer::loadPolicies(ss);
+            BucketDeserializer::loadPolicies(ss);
         } catch (const BucketRecordCorruptedException &ex) {
             ASSERT_EQ(corruptedLine, ex.line());
             ASSERT_EQ(corruptedLineNumber, ex.lineNumber());
@@ -65,73 +65,73 @@ public:
     }
 };
 
-TEST_F(DeserializerFixture, load_empty) {
+TEST_F(BucketDeserializerFixture, load_empty) {
     using ::testing::IsEmpty;
 
     std::istringstream ss;
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     ASSERT_THAT(policies, IsEmpty());
 }
 
-TEST_F(DeserializerFixture, load_1) {
+TEST_F(BucketDeserializerFixture, load_1) {
     using ::testing::UnorderedElementsAre;
 
     std::istringstream ss("c;u;p;0;meta");
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     auto expectedPolicy = createPolicy({ "c", "u", "p" }, { PredefinedPolicyType::DENY, "meta" });
 
     ASSERT_THAT(policies, UnorderedElementsAre(PolicyPtrEq(expectedPolicy)));
 }
 
-TEST_F(DeserializerFixture, load_1_allow) {
+TEST_F(BucketDeserializerFixture, load_1_allow) {
     using ::testing::UnorderedElementsAre;
 
     std::istringstream ss("c;u;p;0xFFFF;meta");
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     auto expectedPolicy = createPolicy({ "c", "u", "p" }, { PredefinedPolicyType::ALLOW, "meta" });
 
     ASSERT_THAT(policies, UnorderedElementsAre(PolicyPtrEq(expectedPolicy)));
 }
 
-TEST_F(DeserializerFixture, load_1_no_meta_sep) {
+TEST_F(BucketDeserializerFixture, load_1_no_meta_sep) {
     using ::testing::UnorderedElementsAre;
 
     std::istringstream ss("c;u;p;0;");
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     auto expectedPolicy = createPolicy({ "c", "u", "p" }, { PredefinedPolicyType::DENY, "" });
 
     ASSERT_THAT(policies, UnorderedElementsAre(PolicyPtrEq(expectedPolicy)));
 }
 
-TEST_F(DeserializerFixture, load_1_no_meta_no_sep) {
+TEST_F(BucketDeserializerFixture, load_1_no_meta_no_sep) {
     using ::testing::UnorderedElementsAre;
 
     std::istringstream ss("c;u;p;0");
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     auto expectedPolicy = createPolicy({ "c", "u", "p" }, { PredefinedPolicyType::DENY, "" });
 
     ASSERT_THAT(policies, UnorderedElementsAre(PolicyPtrEq(expectedPolicy)));
 }
 
-TEST_F(DeserializerFixture, load_2) {
+TEST_F(BucketDeserializerFixture, load_2) {
     using ::testing::UnorderedElementsAre;
 
     std::istringstream ss("c;u;p;0;meta\n"
                           "c;u;p;0;meta\n");
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     auto expectedPolicy = createPolicy({ "c", "u", "p" }, { PredefinedPolicyType::DENY, "meta" });
 
     ASSERT_THAT(policies, UnorderedElementsAre(PolicyPtrEq(expectedPolicy),
             PolicyPtrEq(expectedPolicy)));
 }
 
-TEST_F(DeserializerFixture, load_mixed) {
+TEST_F(BucketDeserializerFixture, load_mixed) {
     using ::testing::UnorderedElementsAre;
     using ::testing::UnorderedElementsAreArray;
 
@@ -140,7 +140,7 @@ TEST_F(DeserializerFixture, load_mixed) {
                           "c2;u2;p2;0xFFFF;\n"
                           "c1;u1;p3;0xFFFE;bucket\n");
 
-    auto policies = StorageDeserializer::loadPolicies(ss);
+    auto policies = BucketDeserializer::loadPolicies(ss);
     PolicyCollection expectedPolices = {
         createPolicy({ "c1", "u1", "p1" }, { PredefinedPolicyType::DENY, "meta" }),
         createPolicy({ "c2", "u2", "p2" }, { PredefinedPolicyType::ALLOW, "meta2" }),
@@ -157,27 +157,27 @@ TEST_F(DeserializerFixture, load_mixed) {
     ));
 }
 
-TEST_F(DeserializerFixture, load_no_client) {
+TEST_F(BucketDeserializerFixture, load_no_client) {
     auto data = "u;p;0;meta";
     checkCorruptedData(data, data, 1);
 }
 
-TEST_F(DeserializerFixture, load_no_type) {
+TEST_F(BucketDeserializerFixture, load_no_type) {
     auto data = "c;u;p;meta";
     checkCorruptedData(data, data, 1);
 }
 
-TEST_F(DeserializerFixture, load_all_missing) {
+TEST_F(BucketDeserializerFixture, load_all_missing) {
     auto data = ";;;";
     checkCorruptedData(data, data, 1);
 }
 
-TEST_F(DeserializerFixture, load_invalid_type) {
+TEST_F(BucketDeserializerFixture, load_invalid_type) {
     auto data = "c;u;p;X";
     checkCorruptedData(data, data, 1);
 }
 
-TEST_F(DeserializerFixture, load_invalid_multiline) {
+TEST_F(BucketDeserializerFixture, load_invalid_multiline) {
     auto data = "c1;u1;p1;0;meta\n"
                 "c;u;p;X\n"
                 "c1;u1;p1;0;meta\n";