Changing extension to avoid breaking contract

wmundev · Sep 21, 2018 · 482fb94 · 482fb94
1 parent 919679f
commit 482fb94
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 42 deletions.
diff --git a/csharp/PhoneNumbers/LeniencyExtensions.cs b/csharp/PhoneNumbers/LeniencyExtensions.cs
@@ -4,46 +4,7 @@ namespace PhoneNumbers
 {
     public static class LeniencyExtensions
     {
-        public static bool Verify(this Leniency leniency, PhoneNumber number, string candidate, PhoneNumberUtil util)
-        {
-            switch (leniency)
-            {
-                case Leniency.POSSIBLE:
-                    return util.IsPossibleNumber(number);
-                case Leniency.VALID:
-                {
-                    if (!util.IsValidNumber(number) ||
-                        !PhoneNumberMatcher.ContainsOnlyValidXChars(number, candidate, util))
-                        return false;
-                    return PhoneNumberMatcher.IsNationalPrefixPresentIfRequired(number, util);
-                }
-                case Leniency.STRICT_GROUPING:
-                {
-                    if (!util.IsValidNumber(number) ||
-                        !PhoneNumberMatcher.ContainsOnlyValidXChars(number, candidate, util) ||
-                        PhoneNumberMatcher.ContainsMoreThanOneSlash(candidate) ||
-                        !PhoneNumberMatcher.IsNationalPrefixPresentIfRequired(number, util))
-                    {
-                        return false;
-                    }
-                    return PhoneNumberMatcher.CheckNumberGroupingIsValid(
-                        number, candidate, util, PhoneNumberMatcher.AllNumberGroupsRemainGrouped);
-                }
-                case Leniency.EXACT_GROUPING:
-                {
-                    if (!util.IsValidNumber(number) ||
-                        !PhoneNumberMatcher.ContainsOnlyValidXChars(number, candidate, util) ||
-                        PhoneNumberMatcher.ContainsMoreThanOneSlash(candidate) ||
-                        !PhoneNumberMatcher.IsNationalPrefixPresentIfRequired(number, util))
-                    {
-                        return false;
-                    }
-                    return PhoneNumberMatcher.CheckNumberGroupingIsValid(
-                        number, candidate, util, PhoneNumberMatcher.AllNumberGroupsAreExactlyPresent);
-                }
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(leniency), leniency, null);
-            }
-        }
+        public static bool Verify(this Leniency leniency, PhoneNumber number, string candidate, PhoneNumberUtil util)=>
+            util.Verify(leniency, number, candidate, util);
     }
 }
diff --git a/csharp/PhoneNumbers/PhoneNumberUtil.cs b/csharp/PhoneNumbers/PhoneNumberUtil.cs
@@ -17,8 +17,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace PhoneNumbers
 {
@@ -480,6 +482,47 @@ public enum Leniency
             EXACT_GROUPING
         }
 
+        public bool Verify(Leniency leniency, PhoneNumber number, string candidate, PhoneNumberUtil util)
+        {
+            switch (leniency)
+            {
+                case Leniency.POSSIBLE:
+                    return IsPossibleNumber(number);
+                case Leniency.VALID:
+                    {
+                        if (!util.IsValidNumber(number) ||
+                            !PhoneNumberMatcher.ContainsOnlyValidXChars(number, candidate, util))
+                            return false;
+                        return PhoneNumberMatcher.IsNationalPrefixPresentIfRequired(number, util);
+                    }
+                case Leniency.STRICT_GROUPING:
+                    {
+                        if (!util.IsValidNumber(number) ||
+                           !PhoneNumberMatcher.ContainsOnlyValidXChars(number, candidate, util) ||
+                           PhoneNumberMatcher.ContainsMoreThanOneSlash(candidate) ||
+                           !PhoneNumberMatcher.IsNationalPrefixPresentIfRequired(number, util))
+                        {
+                            return false;
+                        }
+                        return PhoneNumberMatcher.CheckNumberGroupingIsValid(
+                            number, candidate, util, PhoneNumberMatcher.AllNumberGroupsRemainGrouped);
+                    }
+                case Leniency.EXACT_GROUPING:
+                    {
+                        if (!util.IsValidNumber(number) ||
+                                !PhoneNumberMatcher.ContainsOnlyValidXChars(number, candidate, util) ||
+                                PhoneNumberMatcher.ContainsMoreThanOneSlash(candidate) ||
+                                !PhoneNumberMatcher.IsNationalPrefixPresentIfRequired(number, util))
+                        {
+                            return false;
+                        }
+                        return PhoneNumberMatcher.CheckNumberGroupingIsValid(
+                            number, candidate, util, PhoneNumberMatcher.AllNumberGroupsAreExactlyPresent);
+                    }
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(leniency), leniency, null);
+            }
+        }
 
         // This class implements a singleton, so the only constructor is private.
         private PhoneNumberUtil()
@@ -3296,4 +3339,4 @@ public bool CanBeInternationallyDialled(PhoneNumber number)
             return !IsNumberMatchingDesc(nationalSignificantNumber, metadata.NoInternationalDialling);
         }
     }
-}
+}