fileExists() method implemented

Author: host6

src/main/java/org/scm4j/vcs/GitVCS.java

@@ -11,7 +11,11 @@
 import java.net.SocketAddress;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -26,12 +30,14 @@
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.diff.DiffEntry.Side;
 import org.eclipse.jgit.diff.DiffFormatter;
-import org.eclipse.jgit.errors.IncorrectObjectTypeException;
-import org.eclipse.jgit.errors.MissingObjectException;
-import org.eclipse.jgit.errors.StopWalkException;
-import org.eclipse.jgit.lib.*;
-import org.eclipse.jgit.revwalk.*;
-import org.eclipse.jgit.revwalk.filter.RevFilter;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectReader;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevSort;
+import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.RefSpec;
@@ -286,33 +292,36 @@ public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
 	public String getRepoUrl() {
 		return repo.getRepoUrl(); 
 	}
-
-	@Override
-	public String getFileContent(String branchName, String fileRelativePath, String encoding) {
-		File file;
+	
+	private File getFileFromRepo(String branchName, String fileRelativePath, String encoding) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
-			 Git git = getLocalGit(wc);
-			 Repository gitRepo = git.getRepository()) {
+				 Git git = getLocalGit(wc);
+				 Repository gitRepo = git.getRepository()) {
 
-			String bn = getRealBranchName(branchName);
-			git
-					.pull()
-					.setCredentialsProvider(credentials)
-					.call();
+				String bn = getRealBranchName(branchName);
+				git
+						.pull()
+						.setCredentialsProvider(credentials)
+						.call();
 
-			git
-					.checkout()
-					.setCreateBranch(gitRepo.exactRef("refs/heads/" + bn) == null)
-					.addPath(fileRelativePath)
-					.setName(bn)
-					.call();
+				git
+						.checkout()
+						.setCreateBranch(gitRepo.exactRef("refs/heads/" + bn) == null)
+						.addPath(fileRelativePath)
+						.setName(bn)
+						.call();
 
-			file = new File(wc.getFolder(), fileRelativePath);
-		} catch (GitAPIException e) {
-			throw new EVCSException(e);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
+				return new File(wc.getFolder(), fileRelativePath);
+			} catch (GitAPIException e) {
+				throw new EVCSException(e);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+	}
+
+	@Override
+	public String getFileContent(String branchName, String fileRelativePath, String encoding) {
+		File file = getFileFromRepo(branchName, fileRelativePath, encoding);
 		if (!file.exists()) {
 			throw new EVCSFileNotFound(String.format("File %s is not found", fileRelativePath));
 		}
@@ -657,7 +666,7 @@ public List<VCSCommit> getCommitsRange(String branchName, String startFromCommit
 		}
 	}
 
-	private RevCommit getBranchHeadCommit (String branchName) {
+	private RevCommit getHeadRevCommit (String branchName) {
 		try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy();
 			 Git git = getLocalGit(wc);
 			 Repository gitRepo = git.getRepository();
@@ -681,7 +690,7 @@ private RevCommit getBranchHeadCommit (String branchName) {
 
 	@Override
 	public VCSCommit getHeadCommit(String branchName) {
-		RevCommit branchHeadCommit = getBranchHeadCommit(getRealBranchName(branchName));
+		RevCommit branchHeadCommit = getHeadRevCommit(getRealBranchName(branchName));
 		return new VCSCommit(branchHeadCommit.getName(), branchHeadCommit.getFullMessage(),
 				branchHeadCommit.getAuthorIdent().getName());
 	}
@@ -693,7 +702,6 @@ public String toString() {
 
 	@Override
 	public Boolean fileExists(String branchName, String filePath) {
-		// TODO Auto-generated method stub
-		return null;
+		return getFileFromRepo(branchName, filePath,  StandardCharsets.UTF_8.name()).exists();
 	}
 }

src/test/java/org/scm4j/vcs/GitVCSTest.java

@@ -1,15 +1,12 @@
 package org.scm4j.vcs;
 
-
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.lib.Repository;
 import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
 import org.mockito.Mockito;
 import org.scm4j.vcs.api.IVCS;
 import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
@@ -64,12 +61,5 @@ protected void setMakeFailureOnVCSReset(Boolean doMakeFailure) {
 	protected String getVCSTypeString() {
 		return GitVCS.GIT_VCS_TYPE_STRING;
 	}
-	
-	@Override 
-	@Test
-	@Ignore
-	public void testGetCommitsRange() {
-		
-	}
 }