Reorganize directory structure

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/plugins/bluetooth/bluetooth.cpp b/plugins/bluetooth/bluetooth.cpp
index 0caa39e..32da9bb 100644 (file)
--- a/plugins/bluetooth/bluetooth.cpp
+++ b/plugins/bluetooth/bluetooth.cpp
@@ -18,8 +18,8 @@
 #include <bluetooth-api.h>
 #include <bluetooth_internal.h>
 
-#include <vist/policy/sdk/policy-model.hpp>
-#include <vist/policy/sdk/policy-provider.hpp>
+#include <vist/sdk/policy-model.hpp>
+#include <vist/sdk/policy-provider.hpp>
 
 #include <memory>
 

diff --git a/plugins/wifi/wifi.cpp b/plugins/wifi/wifi.cpp
index 95ca32e..5dff58f 100644 (file)
--- a/plugins/wifi/wifi.cpp
+++ b/plugins/wifi/wifi.cpp
@@ -17,8 +17,8 @@
 #include <arpa/inet.h>
 #include <wifi-manager.h>
 
-#include <vist/policy/sdk/policy-model.hpp>
-#include <vist/policy/sdk/policy-provider.hpp>
+#include <vist/sdk/policy-model.hpp>
+#include <vist/sdk/policy-provider.hpp>
 
 #include <klay/dbus/connection.h>
 

diff --git a/src/vist/CMakeLists.txt b/src/vist/CMakeLists.txt
index fb12f6f..26157a9 100644 (file)
--- a/src/vist/CMakeLists.txt
+++ b/src/vist/CMakeLists.txt
@@ -31,6 +31,7 @@ ADD_DEFINITIONS(-DDB_PATH="${DB_INSTALL_DIR}/.vist.db"
 ADD_SUBDIRECTORY(client)
 ADD_SUBDIRECTORY(notification)
 ADD_SUBDIRECTORY(policy)
+ADD_SUBDIRECTORY(sdk)
 ADD_SUBDIRECTORY(service)
 
 ADD_LIBRARY(${TARGET_VIST_LIB} STATIC ${${TARGET_VIST_LIB}_SRCS})

diff --git a/src/vist/policy/CMakeLists.txt b/src/vist/policy/CMakeLists.txt
index fc29790..5387a8e 100644 (file)
--- a/src/vist/policy/CMakeLists.txt
+++ b/src/vist/policy/CMakeLists.txt
@@ -17,19 +17,16 @@ SET(${TARGET_VIST_POLICY_LIB}_SRCS "")
 
 PKG_CHECK_MODULES(VIST_POLICY_DEPS REQUIRED klay dlog)
 
-INCLUDE_DIRECTORIES(SYSTEM . common ${VIST_POLICY_DEPS_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(SYSTEM . ${VIST_POLICY_DEPS_INCLUDE_DIRS})
 
-ADD_VIST_POLICY_LIBRARY(vist_policy_core core/api.cpp
-                                                                                core/policy-manager.cpp
-                                                                                core/policy-loader.cpp
-                                                                                core/policy-storage.cpp)
+ADD_VIST_POLICY_LIBRARY(vist_policy_core api.cpp
+                                                                                policy-manager.cpp
+                                                                                policy-loader.cpp
+                                                                                policy-storage.cpp)
 
-FILE(GLOB POLICY_CORE_TESTS "core/tests/*.cpp")
+FILE(GLOB POLICY_CORE_TESTS "tests/*.cpp")
 ADD_VIST_TEST(${POLICY_CORE_TESTS})
 
-FILE(GLOB POLICY_SDK_TESTS "sdk/tests/*.cpp")
-ADD_VIST_TEST(${POLICY_SDK_TESTS})
-
 ADD_LIBRARY(${TARGET_VIST_POLICY_LIB} STATIC ${${TARGET_VIST_POLICY_LIB}_SRCS})
 TARGET_LINK_LIBRARIES(${TARGET_VIST_POLICY_LIB} ${VIST_POLICY_DEPS_LIBRARIES}
                                                                                                pthread

diff --git a/src/vist/policy/core/api.cpp b/src/vist/policy/api.cpp
similarity index 100%
rename from src/vist/policy/core/api.cpp
rename to src/vist/policy/api.cpp

diff --git a/src/vist/policy/api.hpp b/src/vist/policy/api.hpp
index bd8aa91..6c15af8 100644 (file)
--- a/src/vist/policy/api.hpp
+++ b/src/vist/policy/api.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-value.hpp>
+#include <vist/sdk/policy-value.hpp>
 
 #include <string>
 #include <unordered_map>

diff --git a/src/vist/policy/core/db-schema.hpp b/src/vist/policy/db-schema.hpp
similarity index 100%
rename from src/vist/policy/core/db-schema.hpp
rename to src/vist/policy/db-schema.hpp

diff --git a/src/vist/policy/core/policy-loader.cpp b/src/vist/policy/policy-loader.cpp
similarity index 100%
rename from src/vist/policy/core/policy-loader.cpp
rename to src/vist/policy/policy-loader.cpp

diff --git a/src/vist/policy/core/policy-loader.hpp b/src/vist/policy/policy-loader.hpp
similarity index 96%
rename from src/vist/policy/core/policy-loader.hpp
rename to src/vist/policy/policy-loader.hpp
index b463fd6..7221223 100644 (file)
--- a/src/vist/policy/core/policy-loader.hpp
+++ b/src/vist/policy/policy-loader.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-provider.hpp>
+#include <vist/sdk/policy-provider.hpp>
 
 #include <memory>
 #include <stdexcept>

diff --git a/src/vist/policy/core/policy-manager.cpp b/src/vist/policy/policy-manager.cpp
similarity index 100%
rename from src/vist/policy/core/policy-manager.cpp
rename to src/vist/policy/policy-manager.cpp

diff --git a/src/vist/policy/core/policy-manager.hpp b/src/vist/policy/policy-manager.hpp
similarity index 95%
rename from src/vist/policy/core/policy-manager.hpp
rename to src/vist/policy/policy-manager.hpp
index bdc364b..7523976 100644 (file)
--- a/src/vist/policy/core/policy-manager.hpp
+++ b/src/vist/policy/policy-manager.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-provider.hpp>
-#include <vist/policy/sdk/policy-value.hpp>
+#include <vist/sdk/policy-provider.hpp>
+#include <vist/sdk/policy-value.hpp>
 
 #include "policy-storage.hpp"
 

diff --git a/src/vist/policy/core/policy-storage.cpp b/src/vist/policy/policy-storage.cpp
similarity index 100%
rename from src/vist/policy/core/policy-storage.cpp
rename to src/vist/policy/policy-storage.cpp

diff --git a/src/vist/policy/core/policy-storage.hpp b/src/vist/policy/policy-storage.hpp
similarity index 97%
rename from src/vist/policy/core/policy-storage.hpp
rename to src/vist/policy/policy-storage.hpp
index cec538d..4ef524d 100644 (file)
--- a/src/vist/policy/core/policy-storage.hpp
+++ b/src/vist/policy/policy-storage.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-value.hpp>
+#include <vist/sdk/policy-value.hpp>
 
 #include "db-schema.hpp"
 

diff --git a/src/vist/policy/core/tests/core.cpp b/src/vist/policy/tests/core.cpp
similarity index 96%
rename from src/vist/policy/core/tests/core.cpp
rename to src/vist/policy/tests/core.cpp
index 2cf5bb8..c5c53d9 100644 (file)
--- a/src/vist/policy/core/tests/core.cpp
+++ b/src/vist/policy/tests/core.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <vist/policy/core/policy-manager.hpp>
+#include <vist/policy/policy-manager.hpp>
 
 namespace vist {
 namespace policy {

diff --git a/src/vist/policy/core/tests/storage.cpp b/src/vist/policy/tests/storage.cpp
similarity index 98%
rename from src/vist/policy/core/tests/storage.cpp
rename to src/vist/policy/tests/storage.cpp
index 369fb00..78fcc39 100644 (file)
--- a/src/vist/policy/core/tests/storage.cpp
+++ b/src/vist/policy/tests/storage.cpp
@@ -18,7 +18,7 @@
 
 #include <memory>
 
-#include <vist/policy/core/policy-storage.hpp>
+#include <vist/policy/policy-storage.hpp>
 
 using namespace vist::policy;
 

diff --git a/src/vist/sdk/CMakeLists.txt b/src/vist/sdk/CMakeLists.txt
new file mode 100644 (file)
index 0000000..5e233cf
--- /dev/null
+++ b/src/vist/sdk/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
+#
+# 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.
+#
+
+FILE(GLOB POLICY_SDK_TESTS "tests/*.cpp")
+ADD_VIST_TEST(${POLICY_SDK_TESTS})

diff --git a/src/vist/policy/sdk/policy-model.hpp b/src/vist/sdk/policy-model.hpp
similarity index 97%
rename from src/vist/policy/sdk/policy-model.hpp
rename to src/vist/sdk/policy-model.hpp
index 64580fc..2194953 100644 (file)
--- a/src/vist/policy/sdk/policy-model.hpp
+++ b/src/vist/sdk/policy-model.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-value.hpp>
+#include <vist/sdk/policy-value.hpp>
 
 #include <string>
 #include <stdexcept>

diff --git a/src/vist/policy/sdk/policy-provider.hpp b/src/vist/sdk/policy-provider.hpp
similarity index 97%
rename from src/vist/policy/sdk/policy-provider.hpp
rename to src/vist/sdk/policy-provider.hpp
index c55ff26..d228681 100644 (file)
--- a/src/vist/policy/sdk/policy-provider.hpp
+++ b/src/vist/sdk/policy-provider.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <vist/policy/sdk/policy-model.hpp>
+#include <vist/sdk/policy-model.hpp>
 
 #include <cstddef>
 #include <memory>

diff --git a/src/vist/policy/sdk/policy-value.hpp b/src/vist/sdk/policy-value.hpp
similarity index 100%
rename from src/vist/policy/sdk/policy-value.hpp
rename to src/vist/sdk/policy-value.hpp

diff --git a/src/vist/policy/sdk/tests/sdk.cpp b/src/vist/sdk/tests/sdk.cpp
similarity index 96%
rename from src/vist/policy/sdk/tests/sdk.cpp
rename to src/vist/sdk/tests/sdk.cpp
index 4be5d8d..d6773b3 100644 (file)
--- a/src/vist/policy/sdk/tests/sdk.cpp
+++ b/src/vist/sdk/tests/sdk.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include <vist/policy/sdk/policy-model.hpp>
-#include <vist/policy/sdk/policy-provider.hpp>
+#include <vist/sdk/policy-model.hpp>
+#include <vist/sdk/policy-provider.hpp>
 
 #include <exception>
 

diff --git a/src/vist/service/tests/core.cpp b/src/vist/service/tests/core.cpp
index 4153827..8ba411b 100644 (file)
--- a/src/vist/service/tests/core.cpp
+++ b/src/vist/service/tests/core.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 
 #include <vist/service/vist.hpp>
-#include <vist/policy/core/policy-manager.hpp>
+#include <vist/policy/api.hpp>
 
 #include <iostream>
 #include <chrono>
@@ -42,8 +42,7 @@ TEST_F(CoreTests, query_select)
 
 TEST_F(CoreTests, query_update)
 {
-       auto& manager = policy::PolicyManager::Instance();
-       manager.enroll("admin");
+       policy::API::Admin::Enroll("admin");
 
        std::string statement = "SELECT * FROM policy WHERE name = 'bluetooth'";
        auto rows = Vist::Query(statement);
@@ -58,5 +57,5 @@ TEST_F(CoreTests, query_update)
        rows = Vist::Query(statement);
        EXPECT_EQ(rows[0]["value"], std::to_string(3));
 
-       manager.disenroll("admin");
+       policy::API::Admin::Disenroll("admin");
 }