From fab54adac57dd1fcdf1b304603600599b7e1e5f9 Mon Sep 17 00:00:00 2001
From: Aleksander Zdyb <a.zdyb@samsung.com>
Date: Wed, 29 Oct 2014 09:42:33 +0100
Subject: [PATCH] Add convenient typedefs in admin ApiInterface

Change-Id: I9cd8b674a00aba90432609a4cf351e4c8fae3e66
---
 src/admin/api/ApiInterface.h | 9 ++++++---
 src/admin/logic/Logic.cpp    | 4 ++--
 src/admin/logic/Logic.h      | 4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/admin/api/ApiInterface.h b/src/admin/api/ApiInterface.h
index 62c40e5..4f7eed0 100644
--- a/src/admin/api/ApiInterface.h
+++ b/src/admin/api/ApiInterface.h
@@ -38,15 +38,18 @@ namespace Cynara {
 
 class ApiInterface {
 public:
+
+    typedef std::map<PolicyBucketId, std::vector<Policy>> PoliciesByBucket;
+    typedef std::map<PolicyBucketId, std::vector<PolicyKey>> KeysByBucket;
+
     ApiInterface() = default;
     virtual ~ApiInterface() {};
 
-    virtual int setPolicies(const std::map<PolicyBucketId, std::vector<Policy>> &insertOrUpdate,
-                            const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) = 0;
+    virtual int setPolicies(const PoliciesByBucket &insertOrUpdate,
+                            const KeysByBucket &remove) = 0;
     virtual int insertOrUpdateBucket(const PolicyBucketId &bucket,
                                      const PolicyResult &policyResult) = 0;
     virtual int removeBucket(const PolicyBucketId &bucket) = 0;
-
     virtual int adminCheck(const PolicyBucketId &startBucket, bool recursive,
                            const PolicyKey &key, PolicyResult &result) = 0;
 
diff --git a/src/admin/logic/Logic.cpp b/src/admin/logic/Logic.cpp
index 506ecbf..67f7172 100644
--- a/src/admin/logic/Logic.cpp
+++ b/src/admin/logic/Logic.cpp
@@ -106,8 +106,8 @@ int Logic::askCynaraAndInterpreteCodeResponse(Args... args) {
     }
 }
 
-int Logic::setPolicies(const std::map<PolicyBucketId, std::vector<Policy>> &insertOrUpdate,
-                       const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove) {
+int Logic::setPolicies(const ApiInterface::PoliciesByBucket &insertOrUpdate,
+                       const ApiInterface::KeysByBucket &remove) {
     return askCynaraAndInterpreteCodeResponse<SetPoliciesRequest>(insertOrUpdate, remove);
 }
 
diff --git a/src/admin/logic/Logic.h b/src/admin/logic/Logic.h
index a8688c2..c0b3999 100644
--- a/src/admin/logic/Logic.h
+++ b/src/admin/logic/Logic.h
@@ -43,8 +43,8 @@ public:
     Logic();
     virtual ~Logic() {};
 
-    virtual int setPolicies(const std::map<PolicyBucketId, std::vector<Policy>> &insertOrUpdate,
-                            const std::map<PolicyBucketId, std::vector<PolicyKey>> &remove);
+    virtual int setPolicies(const ApiInterface::PoliciesByBucket &insertOrUpdate,
+                            const ApiInterface::KeysByBucket &remove);
     virtual int insertOrUpdateBucket(const PolicyBucketId &bucket,
                                      const PolicyResult &policyResult);
     virtual int removeBucket(const PolicyBucketId &bucket);
-- 
2.7.4