Slight code optimizations

mdesalvo · Nov 26, 2023 · 096a0e2 · 096a0e2
1 parent 21a2bb4
commit 096a0e2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 21 deletions.
diff --git a/RDFSharp/Model/Validation/RDFValidationHelper.cs b/RDFSharp/Model/Validation/RDFValidationHelper.cs
@@ -143,19 +143,13 @@ internal static List<RDFPatternMember> GetInstancesOfClass(this RDFGraph dataGra
             {
                 #region visitContext
                 if (visitContext == null)
-                {
                     visitContext = new HashSet<long>() { { className.PatternMemberID } };
-                }
                 else
                 {
                     if (!visitContext.Contains(className.PatternMemberID))
-                    {
                         visitContext.Add(className.PatternMemberID);
-                    }
                     else
-                    {
                         return result;
-                    }
                 }
                 #endregion
 

diff --git a/RDFSharp/Store/RDFContext.cs b/RDFSharp/Store/RDFContext.cs
@@ -45,30 +45,22 @@ public RDFContext() : this(RDFNamespaceRegister.DefaultNamespace.NamespaceUri) {
         public RDFContext(string ctxUri)
         {
             Uri tempUri = RDFModelUtilities.GetUriFromString(ctxUri);
+
+            #region Guards
             if (tempUri == null)
                 throw new RDFStoreException("Cannot create RDFContext because given \"ctxUri\" parameter is null or does not represent a valid Uri.");
-            if (tempUri.ToString().StartsWith("bnode:", StringComparison.OrdinalIgnoreCase) || tempUri.ToString().StartsWith("xmlns:", StringComparison.OrdinalIgnoreCase))
+            if (tempUri.ToString().StartsWith("bnode:", StringComparison.OrdinalIgnoreCase) 
+                 || tempUri.ToString().StartsWith("xmlns:", StringComparison.OrdinalIgnoreCase))
                 throw new RDFStoreException("Cannot create RDFContext because given \"ctxUri\" parameter represents a blank node Uri.");
-
+            #endregion
+
             Context = tempUri;
         }
 
         /// <summary>
         /// Uri-based ctor to build a context from the given Uri
         /// </summary>
-        public RDFContext(Uri ctxUri)
-        {
-            if (ctxUri == null)
-                throw new RDFStoreException("Cannot create RDFContext because given \"ctxUri\" parameter is null.");
-
-            Uri tempUri = RDFModelUtilities.GetUriFromString(ctxUri.ToString());
-            if (tempUri == null)
-                throw new RDFStoreException("Cannot create RDFContext because given \"ctxUri\" parameter does not represent a valid Uri.");
-            if (tempUri.ToString().StartsWith("bnode:", StringComparison.OrdinalIgnoreCase) || tempUri.ToString().StartsWith("xmlns:", StringComparison.OrdinalIgnoreCase))
-                throw new RDFStoreException("Cannot create RDFContext because given \"ctxUri\" parameter represents a blank node Uri.");
-
-            Context = tempUri;
-        }
+        public RDFContext(Uri ctxUri) : this(ctxUri?.ToString()) { }
         #endregion
 
         #region Interfaces