Skip to content
GitLab
Commit 09af96c7 authored by mamunozgil's avatar mamunozgil
Browse files

repoUtil refactoring

parent f8255ef9
amg-svn+ssh
No related merge requests found
Pipeline #10979 passed with stage
in 18 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 69 additions and 72 deletions
+69 -72
src/main/java/de/hftstuttgart/dtabackend/utils/RepoUtil.java
+ 69
- 72
View file @ 09af96c7
...@@ -13,9 +13,6 @@ import org.tmatesoft.svn.core.SVNException; ...@@ -13,9 +13,6 @@ import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.auth.BasicAuthenticationManager; import org.tmatesoft.svn.core.auth.BasicAuthenticationManager;
import org.tmatesoft.svn.core.auth.ISVNAuthenticationManager; 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.wc.SVNWCUtil;
import org.tmatesoft.svn.core.wc2.SvnCheckout; import org.tmatesoft.svn.core.wc2.SvnCheckout;
import org.tmatesoft.svn.core.wc2.SvnOperationFactory; import org.tmatesoft.svn.core.wc2.SvnOperationFactory;
...@@ -23,7 +20,6 @@ import org.tmatesoft.svn.core.wc2.SvnTarget; ...@@ -23,7 +20,6 @@ import org.tmatesoft.svn.core.wc2.SvnTarget;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.regex.Matcher; import java.util.regex.Matcher;
...@@ -35,85 +31,86 @@ public class RepoUtil { ...@@ -35,85 +31,86 @@ public class RepoUtil {
public RepoUtil() {} public RepoUtil() {}
public void cloneRepository(Matcher config, String targetPath, String subDir) { 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); File targetDirectory = new File(targetPath);
if (targetDirectory.exists()) { if (targetDirectory.exists()) {
LOG.debug("clone target directory existing yet, deleting now"); LOG.debug("Target directory exists, deleting it.");
FileSystemUtils.deleteRecursively(targetDirectory); FileSystemUtils.deleteRecursively(targetDirectory);
} }
File checkoutDirectory = targetDirectory; File checkoutDirectory = targetDirectory;
//if an optional directory parameter was given if (!subDir.isEmpty()) {
if(subDir!="") checkoutDirectory = new File(targetPath + "_checkout");
{
//create companion checkout dir "targetPath"+"_checkout"
checkoutDirectory = new File(targetPath+"_checkout");
if (checkoutDirectory.exists()) { if (checkoutDirectory.exists()) {
LOG.debug("clone checkout directory existing yet, deleting now"); LOG.debug("Checkout directory exists, deleting it.");
FileSystemUtils.deleteRecursively(checkoutDirectory); FileSystemUtils.deleteRecursively(checkoutDirectory);
} }
} }
try { try {
LOG.debug("preparing clone"); LOG.debug("Preparing clone...");
if (repoUrl.endsWith(".git")) {
if (config.group(1).endsWith(".git")) { CloneCommand cloneCommand = Git.cloneRepository()
CloneCommand cloneCommand = Git.cloneRepository() .setDirectory(checkoutDirectory)
.setDirectory(checkoutDirectory) .setURI(repoUrl);
.setURI(config.group(1));
if (!"none".equals(username) && !"none".equals(password)) {
if (!config.group(2).equals("none") && !config.group(3).equals("none")) { LOG.debug("Setting Git credentials.");
LOG.debug("setting credentials"); cloneCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(username, password));
cloneCommand.setCredentialsProvider(new UsernamePasswordCredentialsProvider(config.group(2), config.group(3))); }
}
LOG.debug("Cloning Git repository...");
LOG.debug("cloning..."); cloneCommand.call().close();
cloneCommand.call().close(); } else {
}
else {
URL sourceUrl=new URL(config.group(1));
SVNURL url = SVNURL.create(sourceUrl.getProtocol(), null, sourceUrl.getHost(), sourceUrl.getPort(), sourceUrl.getPath(), false);
SvnOperationFactory operationFactory = new SvnOperationFactory(); SvnOperationFactory operationFactory = new SvnOperationFactory();
SvnCheckout checkout = operationFactory.createCheckout(); try {
checkout.setSingleTarget(SvnTarget.fromFile(new File(targetPath))); URL sourceUrl = new URL(repoUrl);
checkout.setSource(SvnTarget.fromURL(url)); SVNURL svnUrl = SVNURL.create(sourceUrl.getProtocol(), null, sourceUrl.getHost(), sourceUrl.getPort(), sourceUrl.getPath(), false);
SvnCheckout checkout = operationFactory.createCheckout();
String protocol = url.getProtocol(); checkout.setSingleTarget(SvnTarget.fromFile(new File(targetPath)));
checkout.setSource(SvnTarget.fromURL(svnUrl));
if (!config.group(2).equals("none") && !config.group(3).equals("none")) { checkout.setDepth(SVNDepth.INFINITY);
if (protocol.equals("https")) {
LOG.debug("Setting SVN credentials for HTTPS checkout with username/password"); if (!"none".equals(username) && !"none".equals(password)) {
operationFactory.setAuthenticationManager(new BasicAuthenticationManager(config.group(2), config.group(3))); if (repoUrl.startsWith("https")) {
} LOG.debug("Setting SVN credentials for HTTPS.");
else if (protocol.equals("svn+ssh")) { operationFactory.setAuthenticationManager(new BasicAuthenticationManager(username, password));
LOG.debug("Setting credentials for SVN+SSH Authentication with username/password"); } else if (repoUrl.startsWith("svn+ssh")) {
//ISVNAuthenticationManager authManager = new BasicAuthenticationManager(new SVNAuthentication[] { new SVNSSHAuthentication(username, password, -1, false)});//SVNWCUtil.createDefaultAuthenticationManager(username, password); LOG.debug("Setting SVN credentials for SSH.");
ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(config.group(2), config.group(3).toCharArray()); ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(username, password.toCharArray());
operationFactory.setAuthenticationManager(authManager); 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));
} if (!subDir.isEmpty()) {
catch (IOException e) { File sourceSubDir = new File(checkoutDirectory, subDir);
LOG.error(String.format("Error while cloning from %s: could not copy to unit test dir", config.group(1)), e); if (sourceSubDir.exists()) {
} FileSystemUtils.copyRecursively(sourceSubDir, targetDirectory);
catch (GitAPIException e) { } else {
LOG.error(String.format("Error while cloning from %s: could not read from Git", config.group(1)), e); LOG.error("Specified subdirectory does not exist.");
} }
catch (SVNException e) { }
LOG.error(String.format("Error while cloning from %s: could not read from Svn", config.group(1)), e);
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);
} }
} }
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Dies ist die Gitlab-Instanz des Transferportals der Hochschule für Technik Stuttgart. Hier geht es zurück zum Portal