diff --git a/src/main/java/de/hftstuttgart/dtabackend/utils/RepoUtil.java b/src/main/java/de/hftstuttgart/dtabackend/utils/RepoUtil.java
index 334bcd71850290ce017715d3cc6b5ddee9f65719..073e05509e2f7b4d742dbaeeeec9906f3fb98556 100644
--- a/src/main/java/de/hftstuttgart/dtabackend/utils/RepoUtil.java
+++ b/src/main/java/de/hftstuttgart/dtabackend/utils/RepoUtil.java
@@ -13,9 +13,6 @@ import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager;
-import org.tmatesoft.svn.core.io.SVNRepository;
-import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
-import org.tmatesoft.svn.core.wc.SVNUpdateClient;
import org.tmatesoft.svn.core.wc.SVNWCUtil;
import org.tmatesoft.svn.core.wc2.SvnCheckout;
import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
@@ -23,7 +20,6 @@ import org.tmatesoft.svn.core.wc2.SvnTarget;
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.regex.Matcher;
@@ -35,85 +31,86 @@ public class RepoUtil {
public RepoUtil() {}
public void cloneRepository(Matcher config, String targetPath, String subDir) {
- LOG.debug(String.format("cloning repository: %s", config.group(1)));
-
+ if (!config.matches()) {
+ LOG.error("Invalid repository URL format.");
+ return;
+ }
+
+ String repoUrl = config.group(1);
+ String username = config.group(2);
+ String password = config.group(3);
+
+ LOG.debug(String.format("Cloning repository: %s", repoUrl));
+
File targetDirectory = new File(targetPath);
if (targetDirectory.exists()) {
- LOG.debug("clone target directory existing yet, deleting now");
+ LOG.debug("Target directory exists, deleting it.");
FileSystemUtils.deleteRecursively(targetDirectory);
}
-
+
File checkoutDirectory = targetDirectory;
- //if an optional directory parameter was given
- if(subDir!="")
- {
- //create companion checkout dir "targetPath"+"_checkout"
- checkoutDirectory = new File(targetPath+"_checkout");
+ if (!subDir.isEmpty()) {
+ checkoutDirectory = new File(targetPath + "_checkout");
if (checkoutDirectory.exists()) {
- LOG.debug("clone checkout directory existing yet, deleting now");
- FileSystemUtils.deleteRecursively(checkoutDirectory);
+ LOG.debug("Checkout directory exists, deleting it.");
+ FileSystemUtils.deleteRecursively(checkoutDirectory);
}
}
-
+
try {
- LOG.debug("preparing clone");
-
- if (config.group(1).endsWith(".git")) {
- CloneCommand cloneCommand = Git.cloneRepository()
- .setDirectory(checkoutDirectory)
- .setURI(config.group(1));
-
- if (!config.group(2).equals("none") && !config.group(3).equals("none")) {
- LOG.debug("setting credentials");
- cloneCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(config.group(2), config.group(3)));
- }
-
- LOG.debug("cloning...");
- cloneCommand.call().close();
- }
- else {
- URL sourceUrl=new URL(config.group(1));
- SVNURL url = SVNURL.create(sourceUrl.getProtocol(), null, sourceUrl.getHost(), sourceUrl.getPort(), sourceUrl.getPath(), false);
+ LOG.debug("Preparing clone...");
+ if (repoUrl.endsWith(".git")) {
+ CloneCommand cloneCommand = Git.cloneRepository()
+ .setDirectory(checkoutDirectory)
+ .setURI(repoUrl);
+
+ if (!"none".equals(username) && !"none".equals(password)) {
+ LOG.debug("Setting Git credentials.");
+ cloneCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(username, password));
+ }
+
+ LOG.debug("Cloning Git repository...");
+ cloneCommand.call().close();
+ } else {
SvnOperationFactory operationFactory = new SvnOperationFactory();
- SvnCheckout checkout = operationFactory.createCheckout();
- checkout.setSingleTarget(SvnTarget.fromFile(new File(targetPath)));
- checkout.setSource(SvnTarget.fromURL(url));
-
- String protocol = url.getProtocol();
-
- if (!config.group(2).equals("none") && !config.group(3).equals("none")) {
- if (protocol.equals("https")) {
- LOG.debug("Setting SVN credentials for HTTPS checkout with username/password");
- operationFactory.setAuthenticationManager(new BasicAuthenticationManager(config.group(2), config.group(3)));
- }
- else if (protocol.equals("svn+ssh")) {
- LOG.debug("Setting credentials for SVN+SSH Authentication with username/password");
- //ISVNAuthenticationManager authManager = new BasicAuthenticationManager(new SVNAuthentication[] { new SVNSSHAuthentication(username, password, -1, false)});//SVNWCUtil.createDefaultAuthenticationManager(username, password);
- ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(config.group(2), config.group(3).toCharArray());
- operationFactory.setAuthenticationManager(authManager);
- }
+ try {
+ URL sourceUrl = new URL(repoUrl);
+ SVNURL svnUrl = SVNURL.create(sourceUrl.getProtocol(), null, sourceUrl.getHost(), sourceUrl.getPort(), sourceUrl.getPath(), false);
+ SvnCheckout checkout = operationFactory.createCheckout();
+ checkout.setSingleTarget(SvnTarget.fromFile(new File(targetPath)));
+ checkout.setSource(SvnTarget.fromURL(svnUrl));
+ checkout.setDepth(SVNDepth.INFINITY);
+
+ if (!"none".equals(username) && !"none".equals(password)) {
+ if (repoUrl.startsWith("https")) {
+ LOG.debug("Setting SVN credentials for HTTPS.");
+ operationFactory.setAuthenticationManager(new BasicAuthenticationManager(username, password));
+ } else if (repoUrl.startsWith("svn+ssh")) {
+ LOG.debug("Setting SVN credentials for SSH.");
+ ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(username, password.toCharArray());
+ operationFactory.setAuthenticationManager(authManager);
+ }
+ }
+
+ LOG.debug("Performing SVN checkout...");
+ checkout.run();
+ } finally {
+ operationFactory.dispose();
}
-
- checkout.run();
- LOG.debug("SVN checkout completed successfully.");
- }
-
- //if an optional directory parameter was given
- if(subDir!="")
- {
- //copy appropriate path from checkout directory to target directory
- FileSystemUtils.copyRecursively(new File(checkoutDirectory+subDir), new File(targetPath));
}
- LOG.debug(String.format("cloned from %s via %s to %s", config.group(1), checkoutDirectory+subDir, targetDirectory));
- }
- catch (IOException e) {
- LOG.error(String.format("Error while cloning from %s: could not copy to unit test dir", config.group(1)), e);
- }
- catch (GitAPIException e) {
- LOG.error(String.format("Error while cloning from %s: could not read from Git", config.group(1)), e);
- }
- catch (SVNException e) {
- LOG.error(String.format("Error while cloning from %s: could not read from Svn", config.group(1)), e);
+
+ if (!subDir.isEmpty()) {
+ File sourceSubDir = new File(checkoutDirectory, subDir);
+ if (sourceSubDir.exists()) {
+ FileSystemUtils.copyRecursively(sourceSubDir, targetDirectory);
+ } else {
+ LOG.error("Specified subdirectory does not exist.");
+ }
+ }
+
+ LOG.debug(String.format("Repository cloned from %s to %s", repoUrl, targetDirectory));
+ } catch (IOException | GitAPIException | SVNException e) {
+ LOG.error("Error while cloning repository: " + repoUrl, e);
}
- }
+ }
}