#363 - Continue applying shims to RDFModelUtilities

Author: mdesalvo

RDFSharp.Test/Model/RDFModelUtilitiesTest.cs

@@ -94,14 +94,14 @@ public void ShouldNotMatchRegexU4(string input)
     [DataTestMethod]
     [DataRow("09AFaf09")]
     public void ShouldMatchHexBinary(string input)
-        => Assert.IsTrue(RDFModelUtilities.hexBinary.Value.IsMatch(input));
+        => Assert.IsTrue(RDFModelShims.HexBinaryRegexShim.IsMatch(input));
 
     [DataTestMethod]
     [DataRow("0")]
     [DataRow("09A")]
     [DataRow("000P")]
     public void ShouldNotMatchHexBinary(string input)
-        => Assert.IsFalse(RDFModelUtilities.hexBinary.Value.IsMatch(input));
+        => Assert.IsFalse(RDFModelShims.HexBinaryRegexShim.IsMatch(input));
 
     [DataTestMethod]
     [DataRow("http://xmlns.com/foaf/0.1/")]

RDFSharp/Model/RDFModelShims.cs

@@ -30,6 +30,7 @@ internal static partial class RDFModelShims
         internal const string TurtleLongLiteralCharsRegexMask = "[\n\r\t\"]";
         internal const string EightByteUnicodeRegexMask = @"\\U([0-9A-Fa-f]{8})";
         internal const string FourByteUnicodeRegexMask = @"\\u([0-9A-Fa-f]{4})";
+        internal const string HexBinaryRegexMask = "^([0-9a-fA-F]{2})*$";
         #endregion
 
         #region Ctors
@@ -41,43 +42,40 @@ static RDFModelShims()
             TurtleLongLiteralCharsRegexShim = TurtleLongLiteralCharsRegex();
             EightByteUnicodeRegexShim = EightByteUnicodeRegex();
             FourByteUnicodeRegexShim = FourByteUnicodeRegex();
+            HexBinaryRegexShim = HexBinaryRegex();
 #else
             PrefixRegexShim = new Regex(PrefixRegexMask, RegexOptions.Compiled);
             LanguageTagRegexShim = new Regex("^" + LanguageTagRegexMask + "$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
             TurtleLongLiteralCharsRegexShim = new Regex(TurtleLongLiteralCharsRegexMask, RegexOptions.Compiled);
             EightByteUnicodeRegexShim = new Regex(EightByteUnicodeRegexMask, RegexOptions.Compiled);
             FourByteUnicodeRegexShim = new Regex(FourByteUnicodeRegexMask, RegexOptions.Compiled);
+            HexBinaryRegexShim = new Regex(HexBinaryRegexMask, RegexOptions.Compiled);
 #endif
         }
         #endregion
 
         #region Properties
         internal static Regex PrefixRegexShim { get; }
-
         internal static Regex LanguageTagRegexShim { get; }
-
         internal static Regex TurtleLongLiteralCharsRegexShim { get; }
-
         internal static Regex EightByteUnicodeRegexShim { get; }
-
         internal static Regex FourByteUnicodeRegexShim { get; }
+        internal static Regex HexBinaryRegexShim { get; }
         #endregion
 
 #if NET8_0_OR_GREATER
         [GeneratedRegex(PrefixRegexMask)]
         private static partial Regex PrefixRegex();
-
         [GeneratedRegex("^" + LanguageTagRegexMask + "$", RegexOptions.IgnoreCase)]
         private static partial Regex LanguageTagRegex();
-
         [GeneratedRegex(TurtleLongLiteralCharsRegexMask)]
         private static partial Regex TurtleLongLiteralCharsRegex();
-
         [GeneratedRegex(EightByteUnicodeRegexMask)]
         private static partial Regex EightByteUnicodeRegex();
-
         [GeneratedRegex(FourByteUnicodeRegexMask)]
         private static partial Regex FourByteUnicodeRegex();
+        [GeneratedRegex(HexBinaryRegexMask)]
+        private static partial Regex HexBinaryRegex();
 #endif
     }
 }

RDFSharp/Model/RDFModelUtilities.cs

@@ -56,10 +56,6 @@ public static long CreateHash(string input)
         /// </summary>
         internal static readonly UTF8Encoding UTF8_NoBOM = new UTF8Encoding(false);
 
-        /// <summary>
-        /// Regex to catch xsd:hexBinary typed literals
-        /// </summary>
-        internal static readonly Lazy<Regex> hexBinary = new Lazy<Regex>(() => new Regex("^([0-9a-fA-F]{2})*$", RegexOptions.Compiled));
         /// <summary>
         /// Regex to catch owl:rational typed literals
         /// </summary>
@@ -668,7 +664,7 @@ internal static (bool,string) ValidateTypedLiteral(string literalValue, RDFModel
                     catch { return (false, literalValue); }
 
                 case RDFModelEnums.RDFDatatypes.XSD_HEXBINARY:
-                    return (hexBinary.Value.Match(literalValue).Success, literalValue);
+                    return (RDFModelShims.HexBinaryRegexShim.Match(literalValue).Success, literalValue);
                 #endregion
 
                 #region GEOGRAPHIC CATEGORY