add base rule provider

src/Nager.PublicSuffix/RuleProviders/BaseRuleProvider.cs

@@ -0,0 +1,39 @@
+using Nager.PublicSuffix.Extensions;
+using Nager.PublicSuffix.Models;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Nager.PublicSuffix.RuleProviders
+{
+    /// <summary>
+    /// BaseRuleProvider
+    /// </summary>
+    public abstract class BaseRuleProvider : IRuleProvider
+    {
+        protected DomainDataStructure _domainDataStructure;
+
+        /// <inheritdoc/>
+        public abstract Task<bool> BuildAsync(
+            bool ignoreCache = false,
+            CancellationToken cancellationToken = default);
+
+        /// <summary>
+        /// Create a DomainDataStructure
+        /// </summary>
+        /// <param name="rules"></param>
+        protected void CreareDomainDataStructure(IEnumerable<TldRule> rules)
+        {
+            var domainDataStructure = new DomainDataStructure("*", new TldRule("*"));
+            domainDataStructure.AddRules(rules);
+
+            this._domainDataStructure = domainDataStructure;
+        }
+
+        /// <inheritdoc/>
+        public DomainDataStructure? GetDomainDataStructure()
+        {
+            return this._domainDataStructure;
+        }
+    }
+}

src/Nager.PublicSuffix/RuleProviders/CachedHttpRuleProvider.cs

@@ -1,8 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Nager.PublicSuffix.Exceptions;
-using Nager.PublicSuffix.Extensions;
-using Nager.PublicSuffix.Models;
 using Nager.PublicSuffix.RuleParsers;
 using Nager.PublicSuffix.RuleProviders.CacheProviders;
 using System;
@@ -15,13 +13,12 @@ namespace Nager.PublicSuffix.RuleProviders
     /// <summary>
     /// CachedHttp RuleProvider
     /// </summary>
-    public class CachedHttpRuleProvider : IRuleProvider
+    public class CachedHttpRuleProvider : BaseRuleProvider
     {
         private readonly string _dataFileUrl;
         private readonly ILogger<CachedHttpRuleProvider> _logger;
         private readonly ICacheProvider _cacheProvider;
         private readonly HttpClient _httpClient;
-        private DomainDataStructure? _domainDataStructure;
 
         /// <summary>
         /// Returns the cache provider
@@ -58,7 +55,7 @@ HttpClient httpClient
         }
 
         /// <inheritdoc/>
-        public async Task<bool> BuildAsync(
+        public override async Task<bool> BuildAsync(
             bool ignoreCache = false,
             CancellationToken cancellationToken = default)
         {
@@ -93,20 +90,11 @@ public async Task<bool> BuildAsync(
             var ruleParser = new TldRuleParser();
             var rules = ruleParser.ParseRules(ruleData);
 
-            var domainDataStructure = new DomainDataStructure("*", new TldRule("*"));
-            domainDataStructure.AddRules(rules);
-
-            this._domainDataStructure  = domainDataStructure;
+            base.CreareDomainDataStructure(rules);
 
             return true;
         }
 
-        /// <inheritdoc/>
-        public DomainDataStructure? GetDomainDataStructure()
-        {
-            return this._domainDataStructure;
-        }
-
         /// <summary>
         /// Load the public suffix data from the given url
         /// </summary>

src/Nager.PublicSuffix/RuleProviders/LocalFileRuleProvider.cs

@@ -10,10 +10,9 @@ namespace Nager.PublicSuffix.RuleProviders
     /// <summary>
     /// LocalFile RuleProvider
     /// </summary>
-    public class LocalFileRuleProvider : IRuleProvider
+    public class LocalFileRuleProvider : BaseRuleProvider
     {
         private readonly string _filePath;
-        private DomainDataStructure? _domainDataStructure;
 
         /// <summary>
         /// LocalFile RuleProvider
@@ -25,7 +24,7 @@ public LocalFileRuleProvider(string filePath)
         }
 
         /// <inheritdoc/>
-        public async Task<bool> BuildAsync(
+        public override async Task<bool> BuildAsync(
             bool ignoreCache = false,
             CancellationToken cancellationToken = default)
         {
@@ -37,17 +36,11 @@ public async Task<bool> BuildAsync(
             var domainDataStructure = new DomainDataStructure("*", new TldRule("*"));
             domainDataStructure.AddRules(rules);
 
-            this._domainDataStructure = domainDataStructure;
+            base.CreareDomainDataStructure(rules);
 
             return true;
         }
 
-        /// <inheritdoc/>
-        public DomainDataStructure? GetDomainDataStructure()
-        {
-            return this._domainDataStructure;
-        }
-
         private async Task<string> LoadFromFile()
         {
             if (!File.Exists(this._filePath))

src/Nager.PublicSuffix/RuleProviders/SimpleHttpRuleProvider.cs

@@ -2,8 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Nager.PublicSuffix.Exceptions;
-using Nager.PublicSuffix.Extensions;
-using Nager.PublicSuffix.Models;
 using Nager.PublicSuffix.RuleParsers;
 using System;
 using System.Net.Http;
@@ -15,14 +13,13 @@ namespace Nager.PublicSuffix.RuleProviders
     /// <summary>
     /// Simple Http RuleProvider
     /// </summary>
-    public class SimpleHttpRuleProvider : IRuleProvider, IDisposable
+    public class SimpleHttpRuleProvider : BaseRuleProvider, IDisposable
     {
         private bool _disposed;
         private readonly string _dataFileUrl;
         private readonly ILogger<SimpleHttpRuleProvider> _logger;
         private readonly HttpClient _httpClient;
         private readonly bool _disposeHttpClient;
-        private DomainDataStructure? _domainDataStructure;
 
         /// <summary>
         /// Simple Http RuleProvider<br/>
@@ -78,7 +75,7 @@ protected virtual void Dispose(bool disposing)
         }
 
         /// <inheritdoc/>
-        public async Task<bool> BuildAsync(
+        public override async Task<bool> BuildAsync(
             bool ignoreCache = false,
             CancellationToken cancellationToken = default)
         {
@@ -105,20 +102,11 @@ public async Task<bool> BuildAsync(
             var ruleParser = new TldRuleParser();
             var rules = ruleParser.ParseRules(ruleData);
 
-            var domainDataStructure = new DomainDataStructure("*", new TldRule("*"));
-            domainDataStructure.AddRules(rules);
-
-            this._domainDataStructure  = domainDataStructure;
+            base.CreareDomainDataStructure(rules);
 
             return true;
         }
 
-        /// <inheritdoc/>
-        public DomainDataStructure? GetDomainDataStructure()
-        {
-            return this._domainDataStructure;
-        }
-
         /// <summary>
         /// Load the public suffix data from the given url
         /// </summary>

src/Nager.PublicSuffix/RuleProviders/StaticRuleProvider.cs

@@ -1,5 +1,4 @@
-using Nager.PublicSuffix.Extensions;
-using Nager.PublicSuffix.Models;
+using Nager.PublicSuffix.Models;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -9,10 +8,8 @@ namespace Nager.PublicSuffix.RuleProviders
     /// <summary>
     /// Static RuleProvider
     /// </summary>
-    public class StaticRuleProvider : IRuleProvider
+    public class StaticRuleProvider : BaseRuleProvider
     {
-        private readonly DomainDataStructure _domainDataStructure;
-
         /// <summary>
         /// Static RuleProvider
         /// </summary>
@@ -25,27 +22,18 @@ public StaticRuleProvider(DomainDataStructure domainDataStructure)
         /// <summary>
         /// Static RuleProvider
         /// </summary>
-        /// <param name="tldRules"></param>
-        public StaticRuleProvider(IEnumerable<TldRule> tldRules)
+        /// <param name="rules"></param>
+        public StaticRuleProvider(IEnumerable<TldRule> rules)
         {
-            var domainDataStructure = new DomainDataStructure("*", new TldRule("*"));
-            domainDataStructure.AddRules(tldRules);
-
-            this._domainDataStructure = domainDataStructure;
+            base.CreareDomainDataStructure(rules);
         }
 
         /// <inheritdoc/>
-        public Task<bool> BuildAsync(
+        public override Task<bool> BuildAsync(
             bool ignoreCache = false,
             CancellationToken cancellationToken = default)
         {
             return Task.FromResult(true);
         }
-
-        /// <inheritdoc/>
-        public DomainDataStructure GetDomainDataStructure()
-        {
-            return this._domainDataStructure;
-        }
     }
 }