cleaned repo handling

src/main/java/de/hftstuttgart/dtabackend/rest/v1/task/TaskUpload.java

@@ -31,13 +31,13 @@ import jakarta.servlet.annotation.MultipartConfig;
 public class TaskUpload {
     private static final Logger LOG = LogManager.getLogger(TaskUpload.class);
 
-    private final JGitUtil jGitUtil;
+    private final RepoUtil jGitUtil;
     private final Path testTmpPath;
     private final ExecuteTestUtil executeTestUtil;
 
     public TaskUpload(
         Environment env,
-        JGitUtil jGitUtil,
+        RepoUtil jGitUtil,
         ExecuteTestUtil executeTestUtil
     ) {
         this.jGitUtil = jGitUtil;

src/main/java/de/hftstuttgart/dtabackend/rest/v1/unittest/UnitTestUpload.java

 package de.hftstuttgart.dtabackend.rest.v1.unittest;
 
-import de.hftstuttgart.dtabackend.utils.JGitUtil;
+import de.hftstuttgart.dtabackend.utils.RepoUtil;
 import de.hftstuttgart.dtabackend.utils.RegexUtil;
 
 import org.apache.logging.log4j.LogManager;
@@ -30,10 +30,10 @@ import java.util.regex.Pattern;
 public class UnitTestUpload {
 
     private static final Logger LOG = LogManager.getLogger(UnitTestUpload.class);
-    private final JGitUtil jGitUtil;
+    private final RepoUtil jGitUtil;
     private final String assignmentBasePath;
 
-    public UnitTestUpload(Environment env, JGitUtil jGitUtil) {
+    public UnitTestUpload(Environment env, RepoUtil jGitUtil) {
         this.jGitUtil = jGitUtil;
 
         Path p = Paths.get(env.getProperty("data.dir"), env.getProperty("data.dir.test.folder.name"));

src/main/java/de/hftstuttgart/dtabackend/utils/ExecuteTestUtil.java

@@ -26,7 +26,7 @@ import java.util.regex.Pattern;
 public class ExecuteTestUtil  {
     private static final Logger LOG = LogManager.getLogger(ExecuteTestUtil.class);
 
-    private final JGitUtil jGitUtil;
+    private final RepoUtil jGitUtil;
     private final DockerUtil dockerUtil;
     private final String assignmentBasePath;
     private final Path testTmpPathHost;
@@ -34,7 +34,7 @@ public class ExecuteTestUtil  {
 
     public ExecuteTestUtil(
         Environment env,
-        JGitUtil jGitUtil,
+        RepoUtil jGitUtil,
         DockerUtil dockerUtil
     ) {
         this.jGitUtil = jGitUtil;

src/main/java/de/hftstuttgart/dtabackend/utils/JGitUtil.java → src/main/java/de/hftstuttgart/dtabackend/utils/RepoUtil.java

@@ -8,17 +8,31 @@ import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
 import org.springframework.stereotype.Component;
 import org.springframework.util.FileSystemUtils;
+import org.tmatesoft.svn.core.SVNDepth;
+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;
+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;
 
 @Component
-public class JGitUtil {
+public class RepoUtil {
 
-    private static final Logger LOG = LogManager.getLogger(JGitUtil.class);
+    private static final Logger LOG = LogManager.getLogger(RepoUtil.class);
 
-    public JGitUtil() {}
+    public RepoUtil() {}
 
     public void cloneRepository(Matcher config, String targetPath, String subDir) {
         LOG.debug(String.format("cloning repository: %s", config.group(1)));
@@ -42,19 +56,48 @@ public class JGitUtil {
         }
         
         try {
-            LOG.debug("preparing clone");
-            CloneCommand cloneCommand = Git.cloneRepository()
-                .setDirectory(checkoutDirectory)
-                .setURI(config.group(1));
+        	LOG.debug("preparing clone");
 
-            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)));
-            }
+        	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);
+                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);
+                	}
+                }
 
-            LOG.debug("cloning...");
-            cloneCommand.call().close();
-            
+                checkout.run();
+                LOG.debug("SVN checkout completed successfully.");
+        	}
+        		
             //if an optional directory parameter was given
             if(subDir!="")
             {
@@ -69,5 +112,8 @@ public class JGitUtil {
         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);
+        }
     }
 }