Issue 7285 - Abstract caching logic

lib/matcher.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 787 matching lines @@
 
   /**
    * @see Matcher#matchesAny
    * @inheritdoc
    */
   matchesAny(location, typeMask, docDomain, thirdParty, sitekey, specificOnly)
   {
     let key = location + " " + typeMask + " " + docDomain + " " + thirdParty +
               " " + sitekey + " " + specificOnly;
 
-    let result = this._resultCache.read(key);
+    let result = this._resultCache.get(key);
     if (typeof result != "undefined")
       return result;
 
     result = this._matchesAnyInternal(location, typeMask, docDomain,
                                       thirdParty, sitekey, specificOnly);
 
-    this._resultCache.save(key, result);
+    this._resultCache.set(key, result);
 
     return result;
   }
 
   /**
    * @typedef {object} MatcherSearchResults
    * @property {Array.<BlockingFilter>} [blocking] List of blocking filters
    *   found.
    * @property {Array.<WhitelistFilter>} [whitelist] List of whitelist filters
    *   found.
@@ skipping 15 matching lines @@
    *
    * @returns {MatcherSearchResults}
    */
   search(location, typeMask, docDomain, thirdParty, sitekey, specificOnly,
          filterType = "all")
   {
     let key = "* " + location + " " + typeMask + " " + docDomain + " " +
               thirdParty + " " + sitekey + " " + specificOnly + " " +
               filterType;
 
-    let result = this._resultCache.read(key);
+    let result = this._resultCache.get(key);
     if (typeof result != "undefined")
       return result;
 
     result = this._searchInternal(location, typeMask, docDomain, thirdParty,
                                   sitekey, specificOnly, filterType);
 
-    this._resultCache.save(key, result);
+    this._resultCache.set(key, result);
 
     return result;
   }
 
   /**
    * Tests whether the URL is whitelisted
    * @see Matcher#matchesAny
    * @inheritdoc
    * @returns {boolean}
    */
   isWhitelisted(location, typeMask, docDomain, thirdParty, sitekey)
   {
     return !!this._whitelist.matchesAny(location, typeMask, docDomain,
                                         thirdParty, sitekey);
   }
 }
 
 exports.CombinedMatcher = CombinedMatcher;
 
 /**
  * Shared {@link CombinedMatcher} instance that should usually be used.
  * @type {CombinedMatcher}
  */
 let defaultMatcher = new CombinedMatcher();
 
 exports.defaultMatcher = defaultMatcher;