Simplify GitObjectIsNotNull implementation

nulltoken · nulltoken · commit 02264deffbcc · 2015-06-11T12:13:48.000+02:00
diff --git a/LibGit2Sharp/Core/Ensure.cs b/LibGit2Sharp/Core/Ensure.cs
@@ -250,44 +250,21 @@ public static void ArgumentPositiveInt32(long argumentValue, string argumentName
         /// <param name="identifier">The <see cref="GitObject"/> identifier to examine.</param>
         public static void GitObjectIsNotNull(GitObject gitObject, string identifier)
         {
-            Func<string, LibGit2SharpException> exceptionBuilder;
-
-            if (string.Equals("HEAD", identifier, StringComparison.Ordinal))
-            {
-                exceptionBuilder = m => new UnbornBranchException(m);
-            }
-            else
+            if (gitObject != null)
             {
-                exceptionBuilder = m => new NotFoundException(m);
+                return;
             }
 
-            GitObjectIsNotNull(gitObject, identifier, exceptionBuilder);
-        }
-
+            var message = string.Format(CultureInfo.InvariantCulture,
+                "No valid git object identified by '{0}' exists in the repository.",
+                identifier);
 
-        /// <summary>
-        /// Check that the result of a C call that returns a non-null GitObject
-        /// using the default exception builder.
-        /// <para>
-        ///   The native function is expected to return a valid object value.
-        /// </para>
-        /// </summary>
-        /// <param name="gitObject">The <see cref="GitObject"/> to examine.</param>
-        /// <param name="identifier">The <see cref="GitObject"/> identifier to examine.</param>
-        /// <param name="exceptionBuilder">The builder which constructs an <see cref="LibGit2SharpException"/> from a message.</param>
-        public static void GitObjectIsNotNull(
-            GitObject gitObject,
-            string identifier,
-            Func<string, LibGit2SharpException> exceptionBuilder)
-        {
-            if (gitObject != null)
+            if (string.Equals("HEAD", identifier, StringComparison.Ordinal))
             {
-                return;
+                throw new UnbornBranchException(message);
             }
 
-            throw exceptionBuilder(string.Format(CultureInfo.InvariantCulture,
-                                                     "No valid git object identified by '{0}' exists in the repository.",
-                                                     identifier));
+            throw new NotFoundException(message);
         }
     }
 }
