feat: rename the filtered-file-adapter and change the inheritance hierarchy.

Author: divy9881

casbin/persist/adapter.cpp

@@ -23,18 +23,19 @@
 
 // LoadPolicyLine loads a text line as a policy rule to model.
 void LoadPolicyLine(string line, Model* model) {
-    if(line == "" || line.find("#")==0) {
+    if(line == "" || line.find("#")==0)
         return;
-    }
 
     vector<string> tokens = Split(line, ",", -1);
-    for (int i = 0; i < tokens.size(); i++) {
+    for (int i = 0; i < tokens.size(); i++)
         tokens[i] = Trim(tokens[i]);
-    }
 
     string key = tokens[0];
     string sec = key.substr(0,1);
     vector<string> new_tokens(tokens.begin()+1, tokens.end());
-    
+
+    if (model->m.find(sec) == model->m.end())
+        model->m[sec] = AssertionMap();
+
     (model->m[sec].assertion_map[key]->policy).push_back(new_tokens);
 }

casbin/persist/file_adapter/filtered_adapter.cpp renamed to casbin/persist/file_adapter/filtered_file_adapter.cpp

@@ -4,14 +4,14 @@
 
 #include <fstream>
 
-#include "./filtered_adapter.h"
+#include "./filtered_file_adapter.h"
 #include "../../exception/io_exception.h"
 #include "../../exception/casbin_adapter_exception.h"
 #include "../../util/util.h"
 
 using namespace std;
 
-bool FilteredAdapter :: filterLine(string line, Filter* filter) {
+bool FilteredFileAdapter :: filterLine(string line, Filter* filter) {
     if (filter == NULL)
         return false;
 
@@ -29,7 +29,7 @@ bool FilteredAdapter :: filterLine(string line, Filter* filter) {
     return filterWords(p, filter_slice);
 }
 
-bool FilteredAdapter :: filterWords(vector<string> line, vector<string> filter) {
+bool FilteredFileAdapter :: filterWords(vector<string> line, vector<string> filter) {
     if (line.size() < filter.size()+1)
         return true;
 
@@ -44,7 +44,7 @@ bool FilteredAdapter :: filterWords(vector<string> line, vector<string> filter)
     return skip_line;
 }
 
-void FilteredAdapter :: loadFilteredPolicyFile(Model* model, Filter* filter, void (*handler)(string, Model*)) {
+void FilteredFileAdapter :: loadFilteredPolicyFile(Model* model, Filter* filter, void (*handler)(string, Model*)) {
     ifstream out_file;
     try {
         out_file.open(this->file_path);
@@ -66,21 +66,21 @@ void FilteredAdapter :: loadFilteredPolicyFile(Model* model, Filter* filter, voi
 }
 
 // NewFilteredAdapter is the constructor for FilteredAdapter.
-FilteredAdapter* FilteredAdapter :: NewFilteredAdapter(string file_path) {
-    FilteredAdapter* a = new FilteredAdapter;
+FilteredFileAdapter* FilteredFileAdapter :: NewFilteredAdapter(string file_path) {
+    FilteredFileAdapter* a = new FilteredFileAdapter;
     a->filtered = true;
     a->file_path = file_path;
     return a;
 }
 
 // LoadPolicy loads all policy rules from the storage.
-void FilteredAdapter :: LoadPolicy(Model* model) {
+void FilteredFileAdapter :: LoadPolicy(Model* model) {
     this->filtered = false;
     this->FileAdapter::LoadPolicy(model);
 }
 
 // LoadFilteredPolicy loads only policy rules that match the filter.
-void FilteredAdapter :: LoadFilteredPolicy(Model* model, Filter* filter) {
+void FilteredFileAdapter :: LoadFilteredPolicy(Model* model, Filter* filter) {
     if (filter == NULL) {
         this->LoadPolicy(model);
     }
@@ -94,12 +94,12 @@ void FilteredAdapter :: LoadFilteredPolicy(Model* model, Filter* filter) {
 }
 
 // IsFiltered returns true if the loaded policy has been filtered.
-bool FilteredAdapter :: IsFiltered() {
+bool FilteredFileAdapter :: IsFiltered() {
     return this->filtered;
 }
 
 // SavePolicy saves all policy rules to the storage.
-void FilteredAdapter :: SavePolicy(Model* model) {
+void FilteredFileAdapter :: SavePolicy(Model* model) {
     if (this->filtered) {
         throw CasbinAdapterException("Cannot save a filtered policy");
     }

casbin/persist/file_adapter/filtered_adapter.h renamed to casbin/persist/file_adapter/filtered_file_adapter.h

@@ -2,16 +2,9 @@
 #define CASBIN_CPP_PERSIST_FILE_ADAPTER_FILTERED_ADAPTER
 
 #include "file_adapter.h"
+#include "../filtered_adapter.h"
 
-// Filter defines the filtering rules for a FilteredAdapter's policy. Empty values
-// are ignored, but all others must match the filter.
-class Filter{
-    public:
-        vector<string> P;
-        vector<string> G;
-};
-
-class FilteredAdapter : public FileAdapter {
+class FilteredFileAdapter : public FileAdapter, public FilteredAdapter {
     private:
 
         static bool filterLine(string line, Filter* filter);
@@ -23,7 +16,7 @@ class FilteredAdapter : public FileAdapter {
     public:
 
         // NewFilteredAdapter is the constructor for FilteredAdapter.
-        static FilteredAdapter* NewFilteredAdapter(string file_path);
+        static FilteredFileAdapter* NewFilteredAdapter(string file_path);
 
         // LoadPolicy loads all policy rules from the storage.
         void LoadPolicy(Model* model);

casbin/persist/Adapter_Filtered.h renamed to casbin/persist/filtered_adapter.h

@@ -19,13 +19,20 @@
 
 #include "./adapter.h"
 
+// Filter defines the filtering rules for a FilteredAdapter's policy. Empty values
+// are ignored, but all others must match the filter.
+class Filter{
+    public:
+        vector<string> P;
+        vector<string> G;
+};
+
 // FilteredAdapter is the interface for Casbin adapters supporting filtered policies.
-class FilteredAdapter : public Adapter {
+class FilteredAdapter : virtual public Adapter {
     public:
 
         // LoadFilteredPolicy loads only policy rules that match the filter.
-        template <typename Filter>
-        void LoadFilteredPolicy(Model model, Filter filter);
+        void LoadFilteredPolicy(Model* model, Filter* filter);
         // IsFiltered returns true if the loaded policy has been filtered.
         virtual bool IsFiltered() = 0;
 };