refactoring: move Serializer to ldp_serializer namespace

Change-Id: I75fb678335aee17bcf6c13792f5124da4d0ad422

diff --git a/src/dbuspolicy_serializer.cpp b/src/dbuspolicy_serializer.cpp
index 0b9d788..c6f2bf4 100644 (file)
--- a/src/dbuspolicy_serializer.cpp
+++ b/src/dbuspolicy_serializer.cpp
@@ -34,7 +34,7 @@ static int check(const char *input_filename, const std::string &output_filename)
        bool ok = false;
 
        cout << "Read from: " << input_filename << ", checking " << output_filename << "..." << endl;
-       ldp_xml_parser::Serializer serializer;
+       ldp_serializer::Serializer serializer;
        ostringstream output;
        serializer.serialize(input_filename, output);
 
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
                return check(input_filename, output_filename);
 
        cout << "Read from: " << input_filename << " write to: " << output_filename << endl;
-       ldp_xml_parser::Serializer serializer;
+       ldp_serializer::Serializer serializer;
        ofstream output(output_filename, ofstream::binary);
 
        uint8_t *data = serializer.serialize(input_filename, output);

diff --git a/src/internal/serializer.cpp b/src/internal/serializer.cpp
index f5cee57..4bd1d35 100644 (file)
--- a/src/internal/serializer.cpp
+++ b/src/internal/serializer.cpp
@@ -20,7 +20,9 @@
 #include <iostream>
 #include <string>
 
-namespace ldp_xml_parser {
+using namespace ldp_xml_parser;
+
+namespace ldp_serializer {
 
 std::map<Decision, FB::Decision> decisions_map {
        { Decision::ANY, FB::Decision_ANY },

diff --git a/src/internal/serializer.hpp b/src/internal/serializer.hpp
index f7f5bfd..fc27dad 100644 (file)
--- a/src/internal/serializer.hpp
+++ b/src/internal/serializer.hpp
@@ -26,7 +26,7 @@
 #include "storage_backend_xml.hpp"
 #include "policy_containers.hpp"
 
-namespace ldp_xml_parser
+namespace ldp_serializer
 {
        enum class SetType : uint8_t {
                OWN,
@@ -55,9 +55,9 @@ namespace ldp_xml_parser
                template <typename T>
                auto get_create_item() -> decltype(type_helper<T>::create_item);
 
-               FbOff<FB::PolicyOwn> serialize_tree(const OwnershipTree &tree);
-               FbOff<FB::PolicyOwnNode> serialize_tree(const std::shared_ptr<TreeNode> &node);
-               FbOff<FB::DecisionItem> serialize_decision(const DecisionItem &item);
+               FbOff<FB::PolicyOwn> serialize_tree(const ldp_xml_parser::OwnershipTree &tree);
+               FbOff<FB::PolicyOwnNode> serialize_tree(const std::shared_ptr<ldp_xml_parser::TreeNode> &node);
+               FbOff<FB::DecisionItem> serialize_decision(const ldp_xml_parser::DecisionItem &item);
 
                template <typename T, typename P>
                auto serialize_item(const P &item) -> FbOff<typename type_helper<T>::item>;

diff --git a/src/internal/storage_backend_serialized.cpp b/src/internal/storage_backend_serialized.cpp
index 4df4e36..450949f 100644 (file)
--- a/src/internal/storage_backend_serialized.cpp
+++ b/src/internal/storage_backend_serialized.cpp
@@ -129,7 +129,7 @@ class StorageBackendSerialized::StorageBackendSerializedImpl {
        size_t length{0};
        const FB::File *file{nullptr};
 
-       std::unique_ptr<ldp_xml_parser::Serializer> serializer;
+       std::unique_ptr<ldp_serializer::Serializer> serializer;
 
        void releaseMMap();
        void releaseFD();
@@ -318,7 +318,7 @@ bool StorageBackendSerialized::StorageBackendSerializedImpl::initFromXML(const c
        assert(nullptr == file);
        assert(nullptr == serializer.get());
 
-       serializer.reset(new ldp_xml_parser::Serializer());
+       serializer.reset(new ldp_serializer::Serializer());
 
        size_t serialized_size;
        uint8_t *data = serializer->serialize(config_name, serialized_size);

diff --git a/src/stest_load_perf.cpp b/src/stest_load_perf.cpp
index 45f5cad..61b5399 100644 (file)
--- a/src/stest_load_perf.cpp
+++ b/src/stest_load_perf.cpp
@@ -13,8 +13,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-using namespace ldp_xml_parser;
 using namespace ldp_serialized;
+using namespace ldp_serializer;
 
 enum class Choice {
        NONE,

diff --git a/src/stest_performance.cpp b/src/stest_performance.cpp
index 09003e5..594f9f0 100644 (file)
--- a/src/stest_performance.cpp
+++ b/src/stest_performance.cpp
@@ -13,8 +13,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-using namespace ldp_xml_parser;
 using namespace ldp_serialized;
+using namespace ldp_serializer;
+using namespace ldp_xml_parser;
 
 std::map<Decision, const char*> DECISIONS {
        { Decision::ANY,   "ANY"   },

diff --git a/src/test-libdbuspolicy1-access-deny-gdi.cpp b/src/test-libdbuspolicy1-access-deny-gdi.cpp
index db4de34..ad11668 100644 (file)
--- a/src/test-libdbuspolicy1-access-deny-gdi.cpp
+++ b/src/test-libdbuspolicy1-access-deny-gdi.cpp
@@ -11,7 +11,6 @@
 #include <vector>
 
 using namespace ldp_xml_parser;
-using namespace ldp_serialized;
 
 struct AccessTest {
        Decision expected_result;
@@ -137,7 +136,7 @@ bool run_policy_db(const std::pair<TestBusSetup, TestBusSetup> access_test) {
 bool run_fb(const std::pair<TestBusSetup, TestBusSetup> access_test) {
        bool passed = true;
        int i = 0;
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
 
        const auto& system_bus_setup = access_test.first;
        const auto& session_bus_setup = access_test.second;
@@ -149,7 +148,7 @@ bool run_fb(const std::pair<TestBusSetup, TestBusSetup> access_test) {
        if (session_bus_setup.first == "")
                buff_ses = serializer.serialize(session_bus_setup.first.c_str(), size);
 
-       StorageBackendSerialized storage_sys, storage_ses;
+       ldp_serialized::StorageBackendSerialized storage_sys, storage_ses;
 
        printf("FLATBUFFERS:\n");
 

diff --git a/src/test-libdbuspolicy1-method-gdi.cpp b/src/test-libdbuspolicy1-method-gdi.cpp
index 7350a18..9bbe0b7 100644 (file)
--- a/src/test-libdbuspolicy1-method-gdi.cpp
+++ b/src/test-libdbuspolicy1-method-gdi.cpp
@@ -8,7 +8,6 @@
 #include <map>
 
 using namespace ldp_xml_parser;
-using namespace ldp_serialized;
 
 std::map<Decision, const char*> DECISIONS {
                {Decision::ANY,   "ANY"   },
@@ -123,12 +122,12 @@ bool run_policy_db() {
 }
 
 bool run_fb() {
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
 
        size_t size;
        const uint8_t *buff = serializer.serialize("tests/default_allow/system.conf", size);
 
-       StorageBackendSerialized storage;
+       ldp_serialized::StorageBackendSerialized storage;
        storage.initFromData(buff);
        printf("FLATBUFFERS:\n");
        bool ret = method_test(storage);

diff --git a/src/test-libdbuspolicy1-ownership-deny-gdi.cpp b/src/test-libdbuspolicy1-ownership-deny-gdi.cpp
index 0427f20..a950220 100644 (file)
--- a/src/test-libdbuspolicy1-ownership-deny-gdi.cpp
+++ b/src/test-libdbuspolicy1-ownership-deny-gdi.cpp
@@ -8,7 +8,6 @@
 #include <map>
 
 using namespace ldp_xml_parser;
-using namespace ldp_serialized;
 
 struct OwnershipTest {
        Decision expected_result;
@@ -179,11 +178,11 @@ bool run_policy_db() {
 }
 
 bool run_fb() {
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
        size_t size;
        uint8_t *buff = serializer.serialize("tests/default_deny/system.conf", size);
 
-       StorageBackendSerialized storage;
+       ldp_serialized::StorageBackendSerialized storage;
        storage.initFromData(buff);
 
        printf("FRAMEBUFFERS:\n");

diff --git a/src/test-libdbuspolicy1-ownership-gdi.cpp b/src/test-libdbuspolicy1-ownership-gdi.cpp
index c7138bb..a2e190c 100644 (file)
--- a/src/test-libdbuspolicy1-ownership-gdi.cpp
+++ b/src/test-libdbuspolicy1-ownership-gdi.cpp
@@ -7,7 +7,6 @@
 #include <map>
 
 using namespace ldp_xml_parser;
-using namespace ldp_serialized;
 
 struct OwnershipTest {
        Decision expected_result;
@@ -102,11 +101,11 @@ bool run_policy_db() {
 }
 
 bool run_fb() {
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
        size_t size;
        uint8_t *buff = serializer.serialize("tests/default_allow/system.conf", size);
 
-       StorageBackendSerialized storage;
+       ldp_serialized::StorageBackendSerialized storage;
        storage.initFromData(buff);
        printf("FLATBUFFERS:\n");
        return ownership_test(storage);

diff --git a/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp b/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp
index fc0ac57..dadd224 100644 (file)
--- a/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp
+++ b/src/test-libdbuspolicy1-send_destination_prefix-deny-gdi.cpp
@@ -8,7 +8,6 @@
 #include <map>
 
 using namespace ldp_xml_parser;
-using namespace ldp_serialized;
 
 std::map<Decision, const char*> DECISIONS {
        { Decision::ANY,   "ANY"   },
@@ -186,11 +185,11 @@ bool run_policy_db() {
 }
 
 bool run_fb() {
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
        size_t size;
        uint8_t *buff = serializer.serialize("tests/default_deny/system.conf", size);
 
-       StorageBackendSerialized storage;
+       ldp_serialized::StorageBackendSerialized storage;
        storage.initFromData(buff);
 
        printf("FLATBUFFERS:\n");

diff --git a/src/test-libdbuspolicy1-signal-gdi.cpp b/src/test-libdbuspolicy1-signal-gdi.cpp
index 0bcdfcb..d7127cb 100644 (file)
--- a/src/test-libdbuspolicy1-signal-gdi.cpp
+++ b/src/test-libdbuspolicy1-signal-gdi.cpp
@@ -8,7 +8,6 @@
 #include <map>
 
 using namespace ldp_xml_parser;
-using namespace ldp_serialized;
 
 struct SignalTest {
        Decision expected_result;
@@ -81,11 +80,11 @@ bool run_policy_db() {
 }
 
 bool run_fb() {
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
        size_t size;
        uint8_t *buff = serializer.serialize("tests/default_allow/system.conf", size);
 
-       StorageBackendSerialized storage;
+       ldp_serialized::StorageBackendSerialized storage;
        storage.initFromData(buff);
 
        printf("FLATBUFFERS:\n");

diff --git a/src/test-serializer.cpp b/src/test-serializer.cpp
index 9f8c89e..876ef52 100644 (file)
--- a/src/test-serializer.cpp
+++ b/src/test-serializer.cpp
@@ -317,7 +317,7 @@ std::vector<ItemAccessTest> item_access_context_mandatory_test {
 };
 
 class SerializerTests {
-       Serializer serializer;
+       ldp_serializer::Serializer serializer;
        const FB::File *file;
 
        void serialize_xml(const std::string &file_name) {