refactor

Author: host6

.gitignore

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

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/";
@@ -335,8 +335,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();
 
@@ -382,8 +382,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<>();
@@ -424,8 +424,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

@@ -25,15 +25,14 @@ 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);
+		SVNURL localRepoUrl = SVNRepositoryFactory.createLocalRepository(new File(repoUrl.replace("file://", "")), true, true);
 
 		svnRepo = SVNRepositoryFactory.create(localRepoUrl);