move the logic if we should fail into the GitDirLocator

Author: TheSnoozer

src/main/java/pl/project13/core/GitCommitIdPlugin.java

@@ -359,28 +359,17 @@ protected static void loadGitData(@Nonnull Callback cb, @Nonnull Properties prop
     }
   }
 
-  private static File findDotGitDirectory(@Nonnull Callback cb) throws GitCommitIdExecutionException {
-    File dotGitDirectory = lookupGitDirectory(cb);
-    if (cb.shouldFailOnNoGitDirectory() && !directoryExists(dotGitDirectory)) {
-      throw new GitCommitIdExecutionException(
-        ".git directory is not found! Please specify a valid [dotGitDirectory] in your"
-          + " project");
-    }
-    return dotGitDirectory;
-  }
-
-  private static boolean directoryExists(@Nullable File fileLocation) {
-    return fileLocation != null && fileLocation.exists() && fileLocation.isDirectory();
-  }
-
   /**
    * Find the git directory of the currently used project. If it's not already specified, this
    * method will try to find it.
    *
    * @return the File representation of the .git directory
    */
-  private static File lookupGitDirectory(@Nonnull Callback cb) throws GitCommitIdExecutionException {
-    return new GitDirLocator(cb.getProjectBaseDir()).lookupGitDirectory(cb.getDotGitDirectory());
+  private static File findDotGitDirectory(@Nonnull Callback cb) throws GitCommitIdExecutionException {
+    return new GitDirLocator(
+      cb.getProjectBaseDir(),
+      cb.shouldFailOnNoGitDirectory()
+    ).lookupGitDirectory(cb.getDotGitDirectory());
   }
 
   private static void loadGitDataWithNativeGit(

src/main/java/pl/project13/core/util/GitDirLocator.java

@@ -25,22 +25,25 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.eclipse.jgit.lib.Constants;
+import pl.project13.core.GitCommitIdExecutionException;
 
 /**
  * This class encapsulates logic to locate a valid .git directory of the currently used project. If
  * it's not already specified, this logic will try to find it.
  */
 public class GitDirLocator {
   final File projectBasedir;
+  final boolean shouldFailOnNoGitDirectory;
 
   /**
    * Constructor to encapsulates all references required to locate a valid .git directory
    *
    * @param projectBasedir The project basedir that will be used as last resort to search
    *                       the parent project hierarchy until a .git directory is found.
    */
-  public GitDirLocator(File projectBasedir) {
+  public GitDirLocator(File projectBasedir, boolean shouldFailOnNoGitDirectory) {
     this.projectBasedir = projectBasedir;
+    this.shouldFailOnNoGitDirectory = shouldFailOnNoGitDirectory;
   }
 
   /**
@@ -53,7 +56,22 @@ public GitDirLocator(File projectBasedir) {
    *     location or within the project or it's reactor projects.
    */
   @Nullable
-  public File lookupGitDirectory(@Nonnull File manuallyConfiguredDir) {
+  public File lookupGitDirectory(@Nonnull File manuallyConfiguredDir) throws GitCommitIdExecutionException {
+    File dotGitDirectory = runSearch(manuallyConfiguredDir);
+    if (shouldFailOnNoGitDirectory && !directoryExists(dotGitDirectory)) {
+      throw new GitCommitIdExecutionException(
+        ".git directory is not found! Please specify a valid [dotGitDirectory] in your"
+          + " project");
+    }
+    return dotGitDirectory;
+  }
+
+  private static boolean directoryExists(@Nullable File fileLocation) {
+    return fileLocation != null && fileLocation.exists() && fileLocation.isDirectory();
+  }
+
+
+  private File runSearch(@Nonnull File manuallyConfiguredDir) {
     if (manuallyConfiguredDir.exists()) {
 
       // If manuallyConfiguredDir is a directory then we can use it as the git path.

src/test/java/pl/project13/core/util/GitDirLocatorTest.java

@@ -38,7 +38,7 @@ public void shouldUseTheManuallySpecifiedDirectory() throws Exception {
     File dotGitDir = folder.newFolder("temp");
     try {
       // when
-      GitDirLocator locator = new GitDirLocator(dotGitDir);
+      GitDirLocator locator = new GitDirLocator(dotGitDir, true);
       File foundDirectory = locator.lookupGitDirectory(dotGitDir);
 
       // then
@@ -71,7 +71,7 @@ public void shouldResolveRelativeSubmodule() throws Exception {
 
     try {
       // when
-      GitDirLocator locator = new GitDirLocator(dotGitDir);
+      GitDirLocator locator = new GitDirLocator(dotGitDir, true);
       File foundDirectory = locator.lookupGitDirectory(dotGitDir);
 
       // then