refactoring: eliminate NaivePolicyDb::getPolicy()

Change-Id: I4378947432a01974f27ebf115e785556e52155d5

diff --git a/src/internal/naive_policy_db.cpp b/src/internal/naive_policy_db.cpp
index 304664e..8fb4609 100755 (executable)
--- a/src/internal/naive_policy_db.cpp
+++ b/src/internal/naive_policy_db.cpp
@@ -129,7 +129,7 @@ template <typename T>
 DecisionItem NaivePolicyDb::getDecisionItem(PolicyType policy_type,
                                                                                        PolicyTypeValue policy_type_value,
                                                                                        const T &item) const {
-       auto policy = getPolicy<typename MatchPolicy<T>::policy_type>(policy_type, policy_type_value);
+       auto policy = getPolicySet<T>().getPolicy(policy_type, policy_type_value);
        if (nullptr == policy)
                return Decision::ANY;
 
@@ -138,38 +138,6 @@ DecisionItem NaivePolicyDb::getDecisionItem(PolicyType policy_type,
        return policy->getDecisionItem(item);
 }
 
-template <typename P>
-const P *NaivePolicyDb::getPolicy(const PolicyType policy_type,
-                                                                 const PolicyTypeValue policy_type_value) const {
-       return nullptr;
-}
-
-namespace ldp_xml_parser {
-template <>
-const NaivePolicyDb::PolicyOwn *NaivePolicyDb::getPolicy<NaivePolicyDb::PolicyOwn>(const PolicyType policy_type,
-                                                                 const PolicyTypeValue policy_type_value) const {
-       return m_own_set.getPolicy(policy_type, policy_type_value);
-}
-
-template <>
-const NaivePolicyDb::PolicySend *NaivePolicyDb::getPolicy<NaivePolicyDb::PolicySend>(const PolicyType policy_type,
-                                                                 const PolicyTypeValue policy_type_value) const {
-       return m_send_set.getPolicy(policy_type, policy_type_value);
-}
-
-template <>
-const NaivePolicyDb::PolicyReceive *NaivePolicyDb::getPolicy<NaivePolicyDb::PolicyReceive>(const PolicyType policy_type,
-                                                                 const PolicyTypeValue policy_type_value) const {
-       return m_receive_set.getPolicy(policy_type, policy_type_value);
-}
-
-template <>
-const NaivePolicyDb::PolicyAccess *NaivePolicyDb::getPolicy<NaivePolicyDb::PolicyAccess>(const PolicyType policy_type,
-                                                                 const PolicyTypeValue policy_type_value) const {
-       return m_access_set.getPolicy(policy_type, policy_type_value);
-}
-}
-
 void NaivePolicyDb::updateSupplementaryGroups(const VGid &groups, uid_t uid, gid_t gid) const
 {
        auto &vsend = m_send_set.getMapGroup(uid);

diff --git a/src/internal/naive_policy_db.hpp b/src/internal/naive_policy_db.hpp
index 68d4dd2..29782f3 100755 (executable)
--- a/src/internal/naive_policy_db.hpp
+++ b/src/internal/naive_policy_db.hpp
@@ -93,10 +93,6 @@ namespace ldp_xml_parser
                        static constexpr const char *name = "access";
                };
 
-               template <typename P>
-               const P *getPolicy(const PolicyType policy_type,
-                                                  const PolicyTypeValue policy_type_value) const;
-
                typedef std::vector<gid_t> VGid;
 
                template<typename P>