progress, tests implemented

Author: Denis

src/main/java/com/projectkaiser/scm/vcs/GitVCS.java

@@ -141,6 +141,7 @@ public void deleteBranch(String branchName, String commitMessage) {
 	}
 
 	public Git getLocalGit(VCSWorkspace workspace) {
+		
 		Repository repo;
 		try {
 			repo = new FileRepositoryBuilder()
@@ -288,34 +289,23 @@ public String getFileContent(String branchName, String filePath, String encoding
 			try {
 				try (Git git = getLocalGit(workspace)) {
 
-					checkout(branchName, git);
+					git
+							.pull()
+							.setCredentialsProvider(credentials)
+							.call();
 
-					Repository repository = git.getRepository();
-					// find the HEAD
-					ObjectId lastCommitId = repository.resolve(Constants.HEAD);
-					// now we have to get the commit
-					RevCommit commit;
-					try (RevWalk revWalk = new RevWalk(repository)) {
-						commit = revWalk.parseCommit(lastCommitId);
-					}
-					// and using commit's tree find the path
-					RevTree tree = commit.getTree();
-					ObjectId objectId;
-					try (TreeWalk treeWalk = new TreeWalk(repository)) {
-						treeWalk.addTree(tree);
-						treeWalk.setRecursive(true);
-						treeWalk.setFilter(PathFilter.create(filePath));
-						if (!treeWalk.next()) {
-							return null;
-						}
-						objectId = treeWalk.getObjectId(0);
-					}
-					ObjectLoader loader = repository.open(objectId);
-
-					InputStream in = loader.openStream();
-					String res = IOUtils.toString(in, encoding);
+					git
+							.checkout()
+							.setCreateBranch(false)
+							.setForce(true)
+							.addPath(filePath)
+							.setName(branchName)
+							//.setStartPoint("origin/" + destBranchUrl)
+							//.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
+							.call();
+					File file = new File(workspace.getFolder(), filePath);
 
-					return res;
+					return IOUtils.toString(file.toURI(), encoding);
 				}
 
 			} finally {
@@ -335,7 +325,20 @@ public void setFileContent(String branchName, String filePath, String content, S
 			try {
 				try (Git git = getLocalGit(workspace)) {
 
-					checkout(branchName, git);
+					git
+							.pull()
+							.setCredentialsProvider(credentials)
+							.call();
+			
+					git
+							.checkout()
+							.setCreateBranch(false)
+							.setForce(true)
+							.addPath(filePath)
+							.setName(branchName)
+							//.setStartPoint("origin/" + destBranchUrl)
+							//.setUpstreamMode(CreateBranchCommand.SetupUpstreamMode.SET_UPSTREAM)
+							.call();
 
 					File file = new File(workspace.getFolder(), filePath);
 					FileWriter fw = new FileWriter(file, false);
@@ -344,15 +347,14 @@ public void setFileContent(String branchName, String filePath, String content, S
 
 					git
 							.commit()
+							.setOnly(filePath)
 							.setMessage(commitMessage)
-							.setAll(true)
 							.call();
 
-					RefSpec refSpec = new RefSpec( ":refs/heads/" + branchName);
+					RefSpec refSpec = new RefSpec(branchName + ":" + branchName);
 
 					git
 							.push()
-							.setPushAll()
 							.setForce(true)
 							.setRefSpecs(refSpec)
 							.setRemote("origin")
@@ -363,12 +365,12 @@ public void setFileContent(String branchName, String filePath, String content, S
 			} finally {
 				workspace.unlock();
 			}
+			
 		} catch (GitAPIException e) {
 			throw new EVCSException(e);
 		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
-		
 	}
 
 	@Override

src/test/java/com/projectkaiser/scm/vcs/GitVCSTest.java

@@ -1,11 +1,13 @@
 package com.projectkaiser.scm.vcs;
 
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.UUID;
 import java.util.function.Consumer;
 
@@ -14,6 +16,7 @@
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.NoFilepatternException;
 import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.transport.RefSpec;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -36,10 +39,13 @@ public class GitVCSTest  {
 	private static final String SRC_BRANCH = "master";
 	private static final String INITIAL_COMMIT_MESSAGE = "Initial commit";
 	private static final String CREATED_DST_BRANCH_COMMIT_MESSAGE = "created dst branch";
+	private static final String CONTENT_CHANGED_COMMIT_MESSAGE = "changed file content";
 	private static final String MERGE_COMMIT_MESSAGE = "merged.";
 	private static final String DELETE_BRANCH_COMMIT_MESSAGE = "deleted";
 	private static final String PROXY_HOST = "localhost";
 	private static final Integer PROXY_PORT = 3128;
+	private static final String LINE_1 = "line 1";
+	private static final String LINE_2 = "line 2";
 
 	private IVCS vcs;
 	private GitHub github;
@@ -98,6 +104,48 @@ public void testGitCreateAndDeleteBranch() throws InterruptedException, IOExcept
 		assertTrue (repo.getBranches().size() == 1);
 	}
 
+	@Test
+	public void testGetSetFileContent() throws NoFilepatternException, GitAPIException, IOException {
+		VCSWorkspace w = VCSWorkspace.getLockedWorkspace(gitVCS.getRepoFolder());
+		try {
+			try (Git git = gitVCS.getLocalGit(w)) {
+				File file = new File(w.getFolder(), "folder/file1.txt");
+				file.getParentFile().mkdirs();
+				file.createNewFile();
+				PrintWriter out = new PrintWriter(file);
+				out.println(LINE_1);
+				out.close();
+
+				git
+						.add()
+						.addFilepattern("folder/file1.txt")
+						.call();
+				
+				git
+						.commit()
+						.setMessage(FILE1_ADDED_COMMIT_MESSAGE)
+						.call();
+				
+				RefSpec spec = new RefSpec("master:master");
+				git
+						.push()
+						.setRefSpecs(spec)
+						.setForce(true)
+						.setRemote("origin")
+						.setCredentialsProvider(gitVCS.getCredentials())
+						.call();
+				
+				vcs.setFileContent("master", "folder/file1.txt", LINE_2, CONTENT_CHANGED_COMMIT_MESSAGE);
+				
+				assertEquals(vcs.getFileContent("master", "folder/file1.txt"), LINE_2);
+				assertEquals(vcs.getFileContent("master", "folder/file1.txt", "UTF-8"), LINE_2);
+				
+			}
+		} finally {
+			w.unlock();
+		}
+	}
+	
 	@Test
 	public void testGitMerge() throws IOException, NoFilepatternException, GitAPIException, InterruptedException {
 		vcs.createBranch(SRC_BRANCH, NEW_BRANCH, CREATED_DST_BRANCH_COMMIT_MESSAGE);
@@ -141,7 +189,7 @@ public void testGitMerge() throws IOException, NoFilepatternException, GitAPIExc
 				git
 						.push()
 						.setPushAll()
-						.setForce(true)
+						//.setForce(true)
 						.setRemote("origin")
 						.setCredentialsProvider(gitVCS.getCredentials())
 						.call();