refactor: Remove obsolete import and export functions

Author: vla

src/BloomFilter/Configurations/FilterMemoryOptions.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 namespace BloomFilter.Configurations;
@@ -26,35 +25,11 @@ public class FilterMemoryOptions
     /// </summary>
     public HashMethod Method { get; set; } = HashMethod.Murmur3;
 
-    /// <summary>
-    /// Sets the bit value
-    /// </summary>
-    [Obsolete("Use Buckets")]
-    public BitArray Bits { get; set; } = default!;
-
-    /// <summary>
-    /// Sets more the bit value
-    /// </summary>
-    [Obsolete("Use Buckets")]
-    public BitArray? BitsMore { get; set; }
-
     /// <summary>
     /// Multiple bitmap
     /// </summary>
     public BitArray[]? Buckets { get; set; }
 
-    /// <summary>
-    /// Sets the bit value
-    /// </summary>
-    [Obsolete("Use BucketBytes")]
-    public byte[] Bytes { get; set; } = default!;
-
-    /// <summary>
-    /// Sets more the bit value
-    /// </summary>
-    [Obsolete("Use BucketBytes")]
-    public byte[]? BytesMore { get; set; }
-
     /// <summary>
     /// Multiple bitmap from bytes
     /// </summary>

src/BloomFilter/FilterMemory.cs

@@ -27,7 +27,6 @@ public class FilterMemory : Filter
     public FilterMemory(FilterMemoryOptions options)
         : base(options.Name, options.ExpectedElements, options.ErrorRate, HashFunction.Functions[options.Method])
     {
-
         if (options.Buckets is not null)
         {
             Import(options.Buckets);
@@ -36,28 +35,6 @@ public FilterMemory(FilterMemoryOptions options)
         {
             Import(options.BucketBytes);
         }
-        else if (options.Bits is not null)
-        {
-            if (options.BitsMore is not null)
-            {
-                Import([options.Bits, options.BitsMore]);
-            }
-            else
-            {
-                Import([options.Bits]);
-            }
-        }
-        else if (options.Bytes is not null)
-        {
-            if (options.BytesMore is not null)
-            {
-                Import([options.Bytes, options.BytesMore]);
-            }
-            else
-            {
-                Import([options.Bytes]);
-            }
-        }
         else
         {
             Init();
@@ -140,25 +117,6 @@ public void Import(BitArray[] buckets)
         }
     }
 
-    /// <summary>
-    /// Importing bitmap
-    /// </summary>
-    /// <param name="bits">Sets the bit value</param>
-    /// <param name="bits2">Sets the bit value</param>
-    [Obsolete("Use Import(BitArray[])")]
-    [MemberNotNull(nameof(_buckets))]
-    public void Import(BitArray bits, BitArray? bits2 = null)
-    {
-        if (bits2 is null)
-        {
-            Import([bits]);
-        }
-        else
-        {
-            Import([bits, bits2]);
-        }
-    }
-
     /// <summary>
     /// Importing bitmap
     /// </summary>
@@ -175,26 +133,6 @@ public void Import(IList<byte[]> bucketBytes)
         Import(bucketBytes.Select(s => new BitArray(s)).ToArray());
     }
 
-    /// <summary>
-    /// Importing bitmap
-    /// </summary>
-    /// <param name="bits">Sets the bit value</param>
-    /// <param name="more">Sets more the bit value</param>
-    [MemberNotNull(nameof(_buckets))]
-    [Obsolete("Use Import(IList<byte[]>)")]
-    public void Import(byte[] bits, byte[]? more = null)
-    {
-        if (more is null)
-        {
-            Import([bits]);
-        }
-        else
-        {
-            Import([bits, more]);
-        }
-    }
-
-
     /// <summary>
     /// Exporting bitmap
     /// </summary>
@@ -206,29 +144,6 @@ public BitArray[] Export()
         }
     }
 
-    /// <summary>
-    /// Exporting bitmap
-    /// </summary>
-    /// <param name="bits">Gets the bit value</param>
-    /// <param name="more">Gets more the bit value</param>
-    [Obsolete("Use Export()")]
-    public void Export(out BitArray bits, out BitArray? more)
-    {
-        more = null;
-
-        lock (sync)
-        {
-            bits = new BitArray(_buckets[0]);
-
-            if (_buckets.Length > 1)
-            {
-                more = new BitArray(_buckets[1]);
-            }
-        }
-    }
-
-
-
     /// <summary>
     /// Exporting bitmap
     /// </summary>
@@ -251,23 +166,6 @@ public IList<byte[]> ExportToBytes()
         return result;
     }
 
-    /// <summary>
-    /// Exporting bitmap
-    /// </summary>
-    /// <param name="bits">Gets the bit value</param>
-    /// <param name="more">Gets more the bit value</param>
-    [Obsolete("Use ExportToBytes()")]
-    public void Export(out byte[] bits, out byte[]? more)
-    {
-        more = null;
-        var result = ExportToBytes();
-        bits = result[0];
-        if (result.Count > 1)
-        {
-            more = result[1];
-        }
-    }
-
     /// <summary>
     /// Adds the passed value to the filter.
     /// </summary>

test/BloomFilterTest/ImportExportTest.cs

@@ -10,58 +10,6 @@ namespace BloomFilterTest
 {
     public class ImportExportTest
     {
-        [Fact]
-        public void Bytes_Import_OutOfRangeExceptione()
-        {
-            var bits1 = new byte[11981];
-
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-            {
-                var bf2 = (FilterMemory)FilterBuilder.Build(new FilterMemoryOptions
-                {
-                    Bytes = bits1,
-                    ExpectedElements = 10000,
-                    ErrorRate = 0.01
-                });
-            });
-        }
-
-        [Fact]
-        public void BitArray_Import_OutOfRangeException()
-        {
-            var bits1 = new BitArray(95850);
-
-            Assert.Throws<ArgumentOutOfRangeException>(() =>
-            {
-                var bf2 = (FilterMemory)FilterBuilder.Build(new FilterMemoryOptions
-                {
-                    Bits = bits1,
-                    ExpectedElements = 10000,
-                    ErrorRate = 0.01
-                });
-            });
-        }
-
-        [Fact]
-        public void Bytes_Export_And_Import()
-        {
-            var bf = (FilterMemory)FilterBuilder.Build(10000, 0.01);
-
-            bf.Add("Export_And_Import");
-
-            bf.Export(out byte[] bits, out byte[] more);
-
-            var bf2 = (FilterMemory)FilterBuilder.Build(new FilterMemoryOptions
-            {
-                Bytes = bits,
-                BytesMore = more,
-                ExpectedElements = 10000,
-                ErrorRate = 0.01
-            });
-
-
-            Assert.True(bf2.Contains("Export_And_Import"));
-        }
 
         [Fact]
         public void ExportToBytes_And_Import()
@@ -83,28 +31,6 @@ public void ExportToBytes_And_Import()
             Assert.True(bf2.Contains("ExportToBytes_And_Import"));
         }
 
-
-        [Fact]
-        public void BitArray_Export_And_Import()
-        {
-            var bf = (FilterMemory)FilterBuilder.Build(10000, 0.01);
-
-            bf.Add("Export_And_Import");
-
-            bf.Export(out BitArray bits, out BitArray more);
-
-            var bf2 = (FilterMemory)FilterBuilder.Build(new FilterMemoryOptions
-            {
-                Bits = bits,
-                BitsMore = more,
-                ExpectedElements = 10000,
-                ErrorRate = 0.01
-            });
-
-
-            Assert.True(bf2.Contains("Export_And_Import"));
-        }
-
         [Fact]
         public void Export_BitArray_And_Import()
         {