Merge branch 'master' of https://github.com/ProjectKaiser/scm4j-vcs-svn

Author: host6

.gitignore

@@ -14,3 +14,4 @@ hs_err_pid*
 /gradle
 build
 bin
+*.iml

build.gradle

@@ -6,7 +6,7 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
 group = 'org.scm4j'
-version = '2.0-SNAPSHOT'
+version = '3.0-SNAPSHOT'
 
 repositories {
 	mavenCentral()

src/main/java/org/scm4j/vcs/svn/SVNVCS.java

@@ -73,7 +73,7 @@ public class SVNVCS implements IVCS {
 	private SVNClientManager clientManager;
 	private SVNURL trunkSVNUrl;
 	private SVNAuthentication userPassAuth;
-	private IVCSRepositoryWorkspace repo;
+	private final IVCSRepositoryWorkspace repo;
 	private String repoUrl;
 
 	public static final String MASTER_PATH= "trunk/";
@@ -332,8 +332,8 @@ public String getRepoUrl() {
 		return repo.getRepoUrl();
 	}
 
-	private void fillUnifiedDiffs(final String srcBranchName, final String dstBranchName, List<VCSDiffEntry> entries, 
-			IVCSLockedWorkingCopy wc) throws SVNException {
+	private void fillUnifiedDiffs(final String srcBranchName, final String dstBranchName, List<VCSDiffEntry> entries)
+			throws SVNException {
 		for (VCSDiffEntry entry : entries) {
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -379,8 +379,8 @@ public void handleLogEntry(SVNLogEntry logEntry) throws SVNException {
 	}
 
 
-	private List<VCSDiffEntry> getDiffEntries(final String srcBranchName, final String dstBranchName, 
-			final IVCSLockedWorkingCopy wc) throws SVNException {
+	private List<VCSDiffEntry> getDiffEntries(final String srcBranchName, final String dstBranchName)
+			throws SVNException {
 		final SvnOperationFactory svnOperationFactory = new SvnOperationFactory();
 		final SvnDiffSummarize summarizeDiff = svnOperationFactory.createDiffSummarize();
 		final List<VCSDiffEntry> res = new ArrayList<>();
@@ -421,8 +421,8 @@ public List<VCSDiffEntry> getBranchesDiff(final String srcBranchName, final Stri
 		try {
 			try (IVCSLockedWorkingCopy wc = repo.getVCSLockedWorkingCopy()) {
 				checkout(getBranchUrl(dstBranchName), wc.getFolder());
-				List<VCSDiffEntry> entries = getDiffEntries(srcBranchName, dstBranchName, wc);
-				fillUnifiedDiffs(srcBranchName, dstBranchName, entries, wc);
+				List<VCSDiffEntry> entries = getDiffEntries(srcBranchName, dstBranchName);
+				fillUnifiedDiffs(srcBranchName, dstBranchName, entries);
 				return entries;
 			}
 		} catch (SVNException e) {

src/test/java/org/scm4j/vcs/svn/SVNVCSTest.java

@@ -1,52 +1,46 @@
 package org.scm4j.vcs.svn;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-
 import org.junit.After;
 import org.mockito.Mockito;
-import org.scm4j.vcs.svn.SVNVCS;
+import org.scm4j.vcs.api.IVCS;
+import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
+import org.scm4j.vcs.api.exceptions.EVCSException;
+import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
 import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
 import org.tmatesoft.svn.core.io.SVNRepository;
-import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
 import org.tmatesoft.svn.core.wc.SVNWCClient;
 
-import org.scm4j.vcs.api.IVCS;
-import org.scm4j.vcs.api.abstracttest.VCSAbstractTest;
-import org.scm4j.vcs.api.exceptions.EVCSException;
-import org.scm4j.vcs.api.workingcopy.IVCSRepositoryWorkspace;
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
 
 public class SVNVCSTest extends VCSAbstractTest {
 
 	private static final String TRUNK_CREATED_COMMIT_MESSAGE = "trunk/ created";
 	private static final String BRANCHES_CREATED_COMMIT_MESSAGE = "branches/ created";
 	private SVNVCS svn;
-	private SVNURL localRepoUrl;
 	private SVNRepository svnRepo;
 	private SVNWCClient mockedSVNRevertClient;
-	private RuntimeException testSvnRevertException = new RuntimeException("test exeption on svn revert");
+	private final RuntimeException testSvnRevertException = new RuntimeException("test exeption on svn revert");
 
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		localRepoUrl = SVNRepositoryFactory.createLocalRepository(new File(repoUrl.replace("file://", "")), true, true);
-		
-		svnRepo = SVNRepositoryFactory.create(localRepoUrl);
+		svnRepo = SVNVCSUtils.createRepository(new File(repoUrl.replace("file://", "")));
 
 		createFolder("/" + SVNVCS.MASTER_PATH, TRUNK_CREATED_COMMIT_MESSAGE);
 		createFolder("/" + SVNVCS.BRANCHES_PATH, BRANCHES_CREATED_COMMIT_MESSAGE);
 	}
-	
+
 	private void createFolder(String folderName, String commitMessage) {
 		try {
 			svn
 					.getClientManager()
 					.getCommitClient()
-					.doMkDir(new SVNURL[] {SVNURL.parseURIEncoded(svn.getRepoUrl() + folderName)}, 
+					.doMkDir(new SVNURL[] {SVNURL.parseURIEncoded(svn.getRepoUrl() + folderName)},
 							commitMessage);
 		} catch (SVNException e) {
 			throw new EVCSException(e);

src/test/java/org/scm4j/vcs/svn/SVNVCSUtils.java

@@ -0,0 +1,20 @@
+package org.scm4j.vcs.svn;
+
+import org.scm4j.vcs.api.exceptions.EVCSException;
+import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.SVNURL;
+import org.tmatesoft.svn.core.io.SVNRepository;
+import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
+
+import java.io.File;
+
+public class SVNVCSUtils {
+	public static SVNRepository createRepository(File repoDir) {
+		try {
+			SVNURL localRepoUrl = SVNRepositoryFactory.createLocalRepository(repoDir, true, true);
+			return SVNRepositoryFactory.create(localRepoUrl);
+		} catch (SVNException e) {
+			throw new EVCSException(e);
+		}
+	}
+}