Rename admin's Logic to OnlineLogic

This is a preparation to implement OfflineLogic.

Change-Id: Ica6e7dfe12ac9bc921f77e2c5d08bc539373ed07

diff --git a/src/admin/CMakeLists.txt b/src/admin/CMakeLists.txt
index f58c751..321ca92 100644 (file)
--- a/src/admin/CMakeLists.txt
+++ b/src/admin/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(CYNARA_LIB_CYNARA_ADMIN_PATH ${CYNARA_PATH}/admin)
 
 SET(LIB_CYNARA_ADMIN_SOURCES
     ${CYNARA_LIB_CYNARA_ADMIN_PATH}/api/admin-api.cpp
-    ${CYNARA_LIB_CYNARA_ADMIN_PATH}/logic/Logic.cpp
+    ${CYNARA_LIB_CYNARA_ADMIN_PATH}/logic/OnlineLogic.cpp
     )
 
 INCLUDE_DIRECTORIES(

diff --git a/src/admin/api/admin-api.cpp b/src/admin/api/admin-api.cpp
index 401df51..1dfeb90 100644 (file)
--- a/src/admin/api/admin-api.cpp
+++ b/src/admin/api/admin-api.cpp
@@ -43,7 +43,7 @@
 #include <cynara-error.h>
 
 #include <api/ApiInterface.h>
-#include <logic/Logic.h>
+#include <logic/OnlineLogic.h>
 
 struct cynara_admin {
     Cynara::ApiInterface *impl;
@@ -61,7 +61,7 @@ int cynara_admin_initialize(struct cynara_admin **pp_cynara_admin) {
         return CYNARA_API_INVALID_PARAM;
 
     return Cynara::tryCatch([&]() {
-        *pp_cynara_admin = new cynara_admin(new Cynara::Logic);
+        *pp_cynara_admin = new cynara_admin(new Cynara::OnlineLogic);
 
         init_log();
 

diff --git a/src/admin/logic/Logic.cpp b/src/admin/logic/OnlineLogic.cpp
similarity index 86%
rename from src/admin/logic/Logic.cpp
rename to src/admin/logic/OnlineLogic.cpp
index b0ea895..9aa1831 100644 (file)
--- a/src/admin/logic/Logic.cpp
+++ b/src/admin/logic/OnlineLogic.cpp
@@ -14,10 +14,11 @@
  *  limitations under the License
  */
 /**
- * @file        src/admin/logic/Logic.cpp
+ * @file        src/admin/logic/OnlineLogic.cpp
  * @author      Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
+ * @author      Aleksander Zdyb <a.zdyb@samsung.com>
  * @version     1.0
- * @brief       This file contains implementation of Logic class - main libcynara-admin class
+ * @brief       This file contains implementation of online version of Logic class
  */
 
 #include <cinttypes>
@@ -45,11 +46,11 @@
 #include <sockets/SocketClient.h>
 #include <types/ProtocolFields.h>
 
-#include "Logic.h"
+#include "OnlineLogic.h"
 
 namespace Cynara {
 
-Logic::Logic() {
+OnlineLogic::OnlineLogic() {
     m_socketClient = std::make_shared<SocketClient>(PathConfig::SocketPath::admin,
                                                     std::make_shared<ProtocolAdmin>());
 }
@@ -59,12 +60,12 @@ ProtocolFrameSequenceNumber generateSequenceNumber(void) {
     return ++sequenceNumber;
 }
 
-bool Logic::ensureConnection(void) {
+bool OnlineLogic::ensureConnection(void) {
     return m_socketClient->isConnected() || m_socketClient->connect();
 }
 
 template<typename T, typename... Args>
-int Logic::askCynaraAndInterpreteCodeResponse(Args... args) {
+int OnlineLogic::askCynaraAndInterpreteCodeResponse(Args... args) {
     if (!ensureConnection()) {
         LOGE("Cannot connect to cynara. Service not available.");
         return CYNARA_API_SERVICE_NOT_AVAILABLE;
@@ -109,22 +110,22 @@ int Logic::askCynaraAndInterpreteCodeResponse(Args... args) {
     }
 }
 
-int Logic::setPolicies(const ApiInterface::PoliciesByBucket &insertOrUpdate,
-                       const ApiInterface::KeysByBucket &remove) {
+int OnlineLogic::setPolicies(const ApiInterface::PoliciesByBucket &insertOrUpdate,
+                             const ApiInterface::KeysByBucket &remove) {
     return askCynaraAndInterpreteCodeResponse<SetPoliciesRequest>(insertOrUpdate, remove);
 }
 
-int Logic::insertOrUpdateBucket(const PolicyBucketId &bucket,
-                                const PolicyResult &policyResult) {
+int OnlineLogic::insertOrUpdateBucket(const PolicyBucketId &bucket,
+                                      const PolicyResult &policyResult) {
     return askCynaraAndInterpreteCodeResponse<InsertOrUpdateBucketRequest>(bucket, policyResult);
 }
 
-int Logic::removeBucket(const PolicyBucketId &bucket) {
+int OnlineLogic::removeBucket(const PolicyBucketId &bucket) {
     return askCynaraAndInterpreteCodeResponse<RemoveBucketRequest>(bucket);
 }
 
-int Logic::adminCheck(const PolicyBucketId &startBucket, bool recursive, const PolicyKey &key,
-                      PolicyResult &result) {
+int OnlineLogic::adminCheck(const PolicyBucketId &startBucket, bool recursive, const PolicyKey &key,
+                            PolicyResult &result) {
     if (!ensureConnection()) {
         LOGE("Cannot connect to cynara. Service not available.");
         return CYNARA_API_SERVICE_NOT_AVAILABLE;
@@ -163,7 +164,7 @@ int Logic::adminCheck(const PolicyBucketId &startBucket, bool recursive, const P
     return CYNARA_API_SUCCESS;
 }
 
-int Logic::listPolicies(const PolicyBucketId &bucket, const PolicyKey &filter,
+int OnlineLogic::listPolicies(const PolicyBucketId &bucket, const PolicyKey &filter,
                         std::vector<Policy> &policies) {
     if (!ensureConnection()) {
         LOGE("Cannot connect to cynara. Service not available.");
@@ -199,7 +200,7 @@ int Logic::listPolicies(const PolicyBucketId &bucket, const PolicyKey &filter,
     return CYNARA_API_SUCCESS;
 }
 
-int Logic::erasePolicies(const PolicyBucketId &startBucket, bool recursive,
+int OnlineLogic::erasePolicies(const PolicyBucketId &startBucket, bool recursive,
                          const PolicyKey &filter) {
     return askCynaraAndInterpreteCodeResponse<EraseRequest>(startBucket, recursive, filter);
 }

diff --git a/src/admin/logic/Logic.h b/src/admin/logic/OnlineLogic.h
similarity index 84%
rename from src/admin/logic/Logic.h
rename to src/admin/logic/OnlineLogic.h
index 584d35d..19e3304 100644 (file)
--- a/src/admin/logic/Logic.h
+++ b/src/admin/logic/OnlineLogic.h
@@ -14,16 +14,14 @@
  *  limitations under the License
  */
 /**
- * @file        src/admin/logic/Logic.h
+ * @file        src/admin/logic/OnlineLogic.h
  * @author      Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
  * @version     1.0
- * @brief       This file contains definition of Logic class - main libcynara-admin class
+ * @brief       This file contains definition of online version of Logic class
  */
 
-#ifndef SRC_ADMIN_LOGIC_LOGIC_H_
-#define SRC_ADMIN_LOGIC_LOGIC_H_
-
-#include <string>
+#ifndef SRC_ADMIN_LOGIC_ONLINELOGIC_H_
+#define SRC_ADMIN_LOGIC_ONLINELOGIC_H_
 
 #include <sockets/SocketClient.h>
 
@@ -31,7 +29,7 @@
 
 namespace Cynara {
 
-class Logic : public ApiInterface {
+class OnlineLogic : public ApiInterface {
 private:
     SocketClientPtr m_socketClient;
 
@@ -40,8 +38,8 @@ private:
     int askCynaraAndInterpreteCodeResponse(Args... args);
 
 public:
-    Logic();
-    virtual ~Logic() {};
+    OnlineLogic();
+    virtual ~OnlineLogic() {};
 
     virtual int setPolicies(const ApiInterface::PoliciesByBucket &insertOrUpdate,
                             const ApiInterface::KeysByBucket &remove);
@@ -59,4 +57,4 @@ public:
 
 } // namespace Cynara
 
-#endif /* SRC_ADMIN_LOGIC_LOGIC_H_ */
+#endif /* SRC_ADMIN_LOGIC_ONLINELOGIC_H_ */