Merge pull request #383 from lduchosal/feat/v4-nullable

feat/v4-nullable

Author: lduchosal

src/ConsoleApplication/Program.cs

@@ -45,7 +45,7 @@ public static class Program
             }
 
             ac.CidrParse = CidrParse.Value;
-            ac.CidrParsed = (byte)cidr!;
+            ac.CidrParsed = (byte)cidr;
         }),
         new ArgParsed('s', (ac, arg) =>
         {
@@ -57,7 +57,7 @@ public static class Program
             }
 
             ac.Action = Action.Subnet;
-            ac.SubnetCidr = (byte)cidr!;
+            ac.SubnetCidr = (byte)cidr;
         }),
         new ArgParsed('C', (ac, arg) =>
         {

src/System.Net.IPNetwork/CidrClassFull.cs

@@ -27,10 +27,9 @@ public sealed class CidrClassFull : ICidrGuess
     /// <param name="ip">A string representing the CIDR to convert.</param>
     /// <param name="cidr">A byte representing the netmask in cidr format (/24).</param>
     /// <returns>true if ip was converted successfully; otherwise, false.</returns>
-    public bool TryGuessCidr(string ip, out byte cidr)
+    public bool TryGuessCidr(string? ip, out byte cidr)
     {
-        bool parsed = IPAddress.TryParse($"{ip}", out var ipaddress);
-        if (!parsed)
+        if (!IPAddress.TryParse($"{ip}", out var ipaddress))
         {
             cidr = 0;
             return false;

src/System.Net.IPNetwork/CidrClassLess.cs

@@ -20,10 +20,9 @@ public sealed class CidrClassLess : ICidrGuess
     /// <param name="ip">A string representing an IPAddress that will be used to guess CIDR.</param>
     /// <param name="cidr">A byte representing the netmask in cidr format (/24).</param>
     /// <returns>true if ip was converted successfully; otherwise, false.</returns>
-    public bool TryGuessCidr(string ip, out byte cidr)
+    public bool TryGuessCidr(string? ip, out byte cidr)
     {
-        bool parsed = IPAddress.TryParse($"{ip}", out IPAddress ipaddress);
-        if (!parsed)
+        if (!IPAddress.TryParse($"{ip}", out IPAddress? ipaddress))
         {
             cidr = 0;
             return false;

src/System.Net.IPNetwork/CidrNetworkAware.cs

@@ -61,15 +61,15 @@ public sealed class CidrNetworkAware : ICidrGuess
     /// <param name="ip">IP address as string (no slash). Example: "192.0.43.0" or "2001:db8::".</param>
     /// <param name="cidr">Guessed CIDR (0..32 for IPv4, 0..128 for IPv6).</param>
     /// <returns>true if parsed and guessed; false if input is not a valid IP address.</returns>
-    public bool TryGuessCidr(string ip, out byte cidr)
+    public bool TryGuessCidr(string? ip, out byte cidr)
     {
         cidr = 0;
         if (string.IsNullOrWhiteSpace(ip))
             return false;
 
         // Reject if user passed a slash - this API expects a plain address.
         // (You can relax this if you want to honor an explicitly supplied prefix.)
-        if (ip.Contains("/"))
+        if (ip.Contains('/'))
             return false;
 
         if (!IPAddress.TryParse(ip.Trim(), out var ipAddress))

src/System.Net.IPNetwork/Filter.cs

@@ -19,7 +19,6 @@ public enum Filter
 /// <summary>
 /// Represents different filters for a collection of items.
 /// </summary>
-[Obsolete("Use Filter instead")]
 public enum FilterEnum
 {
     /// <summary>

src/System.Net.IPNetwork/ICidrGuess.cs

@@ -15,5 +15,5 @@ public interface ICidrGuess
     /// <param name="ip">An IPAddress to guess the ip network CIDR.</param>
     /// <param name="cidr">A byte representing the netmask in cidr format (/24).</param>
     /// <returns>true if ip was converted successfully; otherwise, false.</returns>
-    bool TryGuessCidr(string ip, out byte cidr);
+    bool TryGuessCidr(string? ip, out byte cidr);
 }

src/System.Net.IPNetwork/IPNetwork2Contains.cs

@@ -12,44 +12,6 @@ namespace System.Net;
 /// </summary>
 public sealed partial class IPNetwork2
 {
-    /// <summary>
-    /// Determines whether the given IP address is part of the given IP network.
-    /// </summary>
-    /// <param name="network">The IP network.</param>
-    /// <param name="ipaddress">The IP address.</param>
-    /// <returns>
-    /// <c>true</c> if the IP address is part of the IP network; otherwise, <c>false</c>.
-    /// </returns>
-    [Obsolete("static Contains is deprecated, please use instance Contains.")]
-    public static bool Contains(IPNetwork2 network, IPAddress ipaddress)
-    {
-        if (network == null)
-        {
-            throw new ArgumentNullException(nameof(network));
-        }
-
-        return network.Contains(ipaddress);
-    }
-
-    /// <summary>
-    /// Determines if the given <paramref name="network"/> contains the specified <paramref name="network2"/>.
-    /// </summary>
-    /// <param name="network">The network to check for containment.</param>
-    /// <param name="network2">The network to check if it is contained.</param>
-    /// <returns>
-    /// <c>true</c> if the <paramref name="network"/> contains the <paramref name="network2"/>; otherwise, <c>false</c>.
-    /// </returns>
-    [Obsolete("static Contains is deprecated, please use instance Contains.")]
-    public static bool Contains(IPNetwork2 network, IPNetwork2 network2)
-    {
-        if (network == null)
-        {
-            throw new ArgumentNullException(nameof(network));
-        }
-
-        return network.Contains(network2);
-    }
-
     /// <summary>
     /// return true if ipaddress is contained in network.
     /// </summary>
@@ -106,6 +68,38 @@ public bool Contains(IPNetwork2 contains)
         return result;
     }
 
+    /// <summary>
+    /// return true if ipaddress is contained in network.
+    /// </summary>
+    /// <param name="network">The network.</param>
+    /// <param name="ipaddress">The ip address to test.</param>
+    /// <returns>true if ipaddress is contained into the IP Network; otherwise, false.</returns>
+    public static bool Contains(IPNetwork2 network, IPAddress ipaddress)
+    {
+        if (network == null)
+        {
+            throw new ArgumentNullException(nameof(network));
+        }
+
+        return network.Contains(ipaddress);
+    }
+
+    /// <summary>
+    /// return true is network2 is fully contained in network.
+    /// </summary>
+    /// <param name="network">The network.</param>
+    /// <param name="network2">The network to test.</param>
+    /// <returns>true if network2 is contained into the IP Network; otherwise, false.</returns>
+    public static bool Contains(IPNetwork2 network, IPNetwork2 network2)
+    {
+        if (network == null)
+        {
+            throw new ArgumentNullException(nameof(network));
+        }
+
+        return network.Contains(network2);
+    }
+
     private static BigInteger CreateBroadcast(ref BigInteger network, BigInteger netmask, AddressFamily family)
     {
         int width = family == AddressFamily.InterNetwork ? 4 : 16;

src/System.Net.IPNetwork/IPNetwork2IANAblock.cs

@@ -68,21 +68,11 @@ public static bool IsIANAReserved(IPAddress ipaddress)
     }
 
     /// <summary>
-    /// Determines whether the specified IP network is reserved according to the IANA Reserved ranges.
+    /// return true if ipnetwork is contained in
+    /// IANA_ABLK_RESERVED1, IANA_BBLK_RESERVED1, IANA_CBLK_RESERVED1.
     /// </summary>
-    /// <param name="ipnetwork">The IP network to check.</param>
-    /// <returns>
-    /// <c>true</c> if the specified IP network is reserved according to the IANA Reserved ranges; otherwise, <c>false</c>.
-    /// </returns>
-    /// <remarks>
-    /// <para>
-    /// This method is obsolete and should not be used. Please use the instance method, see IsIANAReserved" instead.
-    /// </para>
-    /// <para>
-    /// Throws an <see cref="ArgumentNullException"/> if <paramref name="ipnetwork"/> is <c>null</c>.
-    /// </para>
-    /// </remarks>
-    [Obsolete("static IsIANAReserved is deprecated, please use instance IsIANAReserved.")]
+    /// <param name="ipnetwork">The IPNetwork to test.</param>
+    /// <returns>true if the ipnetwork is a IANA reserverd IP Netowkr ; otherwise, false.</returns>
     public static bool IsIANAReserved(IPNetwork2 ipnetwork)
     {
         if (ipnetwork == null)

src/System.Net.IPNetwork/IPNetwork2IComparableIPNetworkMembers.cs

@@ -20,10 +20,10 @@ public sealed partial class IPNetwork2
     /// A negative value if <paramref name="left"/> is less than <paramref name="right"/>.
     /// A positive value if <paramref name="left"/> is greater than <paramref name="right"/>.
     /// </returns>
-    public static int Compare(IPNetwork2 left, IPNetwork2 right)
+    public static int Compare(IPNetwork2? left, IPNetwork2? right)
     {
         // two null IPNetworks are equal
-        if (ReferenceEquals(left, null) && ReferenceEquals(right, null))
+        if (left is null && right is null)
         {
             return 0;
         }
@@ -35,12 +35,12 @@ public static int Compare(IPNetwork2 left, IPNetwork2 right)
         }
 
         // null is always sorted first
-        if (ReferenceEquals(left, null))
+        if (left is null)
         {
             return -1;
         }
 
-        if (ReferenceEquals(right, null))
+        if (right is null)
         {
             return 1;
         }
@@ -69,7 +69,7 @@ public static int Compare(IPNetwork2 left, IPNetwork2 right)
     /// </summary>
     /// <param name="other">The other network to compare to.</param>
     /// <returns>A signed number indicating the relative values of this instance and value.</returns>
-    public int CompareTo(IPNetwork2 other)
+    public int CompareTo(IPNetwork2? other)
     {
         return Compare(this, other);
     }
@@ -79,7 +79,7 @@ public int CompareTo(IPNetwork2 other)
     /// </summary>
     /// <param name="obj">The other object to compare to.</param>
     /// <returns>A signed number indicating the relative values of this instance and value.</returns>
-    public int CompareTo(object obj)
+    public int CompareTo(object? obj)
     {
         // null is at less
         if (obj == null)
@@ -88,10 +88,7 @@ public int CompareTo(object obj)
         }
 
         // convert to a proper Cidr object
-        var other = obj as IPNetwork2;
-
-        // type problem if null
-        if (other == null)
+        if (obj is not IPNetwork2 other)
         {
             throw new ArgumentException(
                 "The supplied parameter is an invalid type. Please supply an IPNetwork type.",

src/System.Net.IPNetwork/IPNetwork2IEquatableIPNetworkMembers.cs

@@ -15,7 +15,7 @@ public sealed partial class IPNetwork2 : IComparable<IPNetwork2>, IEquatable<IPN
     /// <param name="left">An IPNetwork to compare.</param>
     /// <param name="right">An other IPNetwork to compare to.</param>
     /// <returns>true if obj has the same value as this instance; otherwise, false.</returns>
-    public static bool Equals(IPNetwork2 left, IPNetwork2 right)
+    public static bool Equals(IPNetwork2? left, IPNetwork2? right)
     {
         return Compare(left, right) == 0;
     }
@@ -25,7 +25,7 @@ public static bool Equals(IPNetwork2 left, IPNetwork2 right)
     /// </summary>
     /// <param name="other">An IPNetwork to compare to this instance.</param>
     /// <returns>true if obj has the same value as this instance; otherwise, false.</returns>
-    public bool Equals(IPNetwork2 other)
+    public bool Equals(IPNetwork2? other)
     {
         return Equals(this, other);
     }
@@ -35,7 +35,7 @@ public bool Equals(IPNetwork2 other)
     /// </summary>
     /// <param name="obj">An object value to compare to this instance.</param>
     /// <returns>true if obj has the same value as this instance; otherwise, false.</returns>
-    public override bool Equals(object obj)
+    public override bool Equals(object? obj)
     {
         return Equals(this, obj as IPNetwork2);
     }