removed dtt remnants

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

@@ -52,7 +52,7 @@ public class TaskUpload {
         LOG.info("submission for testing received");
 
         LOG.debug("creating new temporary directory");
-        Path workDirectory = Files.createTempDirectory(testTmpPath, "dtt");
+        Path workDirectory = Files.createTempDirectory(testTmpPath, "dta");
         LOG.debug(String.format("working dir for test is: %s", workDirectory.toAbsolutePath().toString()));
 
         // define paths for the test, the submission and where the result is to be expected afterwards
@@ -61,7 +61,7 @@ public class TaskUpload {
         String mimeInfo = new Tika().detect(taskFileRef.getInputStream());
         switch (mimeInfo) {
             case "text/plain":
-                LOG.debug("textfile uploaded, searching for dtt config");
+                LOG.debug("textfile uploaded, searching for dta config");
                 // find URI in config file
                 Matcher config = RegexUtil.findStudentConfig(taskFileRef.getInputStream());
 

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 org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.core.env.Environment;
-import org.springframework.util.FileSystemUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import jakarta.servlet.annotation.MultipartConfig;
-
-import java.io.*;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Rest controller for anything related to the TEST files.
- */
-@RestController
-@RequestMapping("/v1/unittest")
-@MultipartConfig
-public class UnitTestUpload {
-
-    private static final Logger LOG = LogManager.getLogger(UnitTestUpload.class);
-    public final static String TESTCONFIGREGEX = "^dtt::(.*)::(.*|none)::(.*|none)::(.*)$";
-    public final static String SUBMISSIONCONFIGREGEX = "^dtt::(.*)::(.*|none)::(.*|none)$";
-
-    private final JGitUtil jGitUtil;
-    private final String assignmentBasePath;
-
-    public UnitTestUpload(Environment env, JGitUtil jGitUtil) {
-        this.jGitUtil = jGitUtil;
-
-        Path p = Paths.get(env.getProperty("data.dir"), env.getProperty("data.dir.test.folder.name"));
-        this.assignmentBasePath = p.toAbsolutePath().toString();
-    }
-
-    /**
-     * Create a subfolder for the specific assignment.
-     * This is called when the teacher creates an assignment and uploads the JUnit test files
-     *
-     * @param unitTestFileRef The text file which contains the JUnit tests meta data
-     * @param assignmentId    ID of the created assignment. Generated by Moodle
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public void uploadUnitTestFile(
-        @RequestParam("unitTestFile") MultipartFile unitTestFileRef,
-        @RequestParam("assignmentId") String assignmentId
-    ) throws IOException {
-        LOG.info("received new assignment");
-
-        File file = Paths.get(
-                this.assignmentBasePath,
-                assignmentId + ".txt")
-            .toFile();
-        file.mkdirs();
-
-        // save assignment config
-        unitTestFileRef.transferTo(file);
-        LOG.debug(String.format("saved config file to: %s", file.getAbsolutePath()));
-
-        Pattern pattern = Pattern.compile(TESTCONFIGREGEX);
-        Matcher config = null;
-
-        LOG.debug("reading test configuration file");
-        // open saved config in a try-with
-        try (BufferedReader br = new BufferedReader(
-            new InputStreamReader(
-                new FileInputStream(file)))) {
-            String line;
-
-            // search for a URI while none is found and there are lines left
-            while (config == null && (line = br.readLine()) != null) {
-                Matcher matcher = pattern.matcher(line);
-                if (matcher.matches()) {
-                    LOG.debug(String.format("found dtt test line: %s", line));
-                    config = matcher;
-                }
-            }
-        } catch (IOException e) {
-            LOG.error("Error while reading repo config", e);
-        }
-        finally {
-            if (config == null) {
-                throw new RuntimeException("couldn't find repo config for unittest clone");
-            }
-        }
-
-        LOG.debug("calling test repo clone");
-        // cloning assignment repo to persistent space
-        jGitUtil.cloneRepository(
-            config,
-            Paths.get(this.assignmentBasePath, assignmentId).toAbsolutePath().toString());
-
-        LOG.info(String.format("stored new assignment: %s", file.getAbsolutePath()));
-    }
-
-    /**
-     * Delete the folder for the assignment.
-     * Called when the teacher deletes the JUnitTest assignment
-     * <p>
-     * {{url}}:8080/v1/unittest?assignmentId=111
-     *
-     * @param assignmentId ID of the assignment to delete. Generated by Moodle
-     */
-    @RequestMapping(method = RequestMethod.DELETE)
-    public void deleteUnitTestFiles(@RequestParam("assignmentId") String assignmentId) {
-        LOG.info(String.format("received deletion order for assignment %s", assignmentId));
-
-        // deleting config file
-        File file = Paths.get(
-            this.assignmentBasePath,
-            assignmentId + ".txt")
-            .toFile();
-        file.delete();
-
-        // deleting local copy of repository
-        file = Paths.get(
-            this.assignmentBasePath,
-            assignmentId).toFile();
-        FileSystemUtils.deleteRecursively(file);
-
-        LOG.info(String.format("assignment %s deletion complete", assignmentId));
-    }
-}
+package de.hftstuttgart.dtabackend.rest.v1.unittest;
+
+import de.hftstuttgart.dtabackend.utils.JGitUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.core.env.Environment;
+import org.springframework.util.FileSystemUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import jakarta.servlet.annotation.MultipartConfig;
+
+import java.io.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Rest controller for anything related to the TEST files.
+ */
+@RestController
+@RequestMapping("/v1/unittest")
+@MultipartConfig
+public class UnitTestUpload {
+
+    private static final Logger LOG = LogManager.getLogger(UnitTestUpload.class);
+    public final static String TESTCONFIGREGEX = "^dtt::(.*)::(.*|none)::(.*|none)::(.*)$";
+    public final static String SUBMISSIONCONFIGREGEX = "^dtt::(.*)::(.*|none)::(.*|none)$";
+
+    private final JGitUtil jGitUtil;
+    private final String assignmentBasePath;
+
+    public UnitTestUpload(Environment env, JGitUtil jGitUtil) {
+        this.jGitUtil = jGitUtil;
+
+        Path p = Paths.get(env.getProperty("data.dir"), env.getProperty("data.dir.test.folder.name"));
+        this.assignmentBasePath = p.toAbsolutePath().toString();
+    }
+
+    /**
+     * Create a subfolder for the specific assignment.
+     * This is called when the teacher creates an assignment and uploads the JUnit test files
+     *
+     * @param unitTestFileRef The text file which contains the JUnit tests meta data
+     * @param assignmentId    ID of the created assignment. Generated by Moodle
+     */
+    @RequestMapping(method = RequestMethod.POST)
+    public void uploadUnitTestFile(
+        @RequestParam("unitTestFile") MultipartFile unitTestFileRef,
+        @RequestParam("assignmentId") String assignmentId
+    ) throws IOException {
+        LOG.info("received new assignment");
+
+        File file = Paths.get(
+                this.assignmentBasePath,
+                assignmentId + ".txt")
+            .toFile();
+        file.mkdirs();
+
+        // save assignment config
+        unitTestFileRef.transferTo(file);
+        LOG.debug(String.format("saved config file to: %s", file.getAbsolutePath()));
+
+        Pattern pattern = Pattern.compile(TESTCONFIGREGEX);
+        Matcher config = null;
+
+        LOG.debug("reading test configuration file");
+        // open saved config in a try-with
+        try (BufferedReader br = new BufferedReader(
+            new InputStreamReader(
+                new FileInputStream(file)))) {
+            String line;
+
+            // search for a URI while none is found and there are lines left
+            while (config == null && (line = br.readLine()) != null) {
+                Matcher matcher = pattern.matcher(line);
+                if (matcher.matches()) {
+                    LOG.debug(String.format("found dta test line: %s", line));
+                    config = matcher;
+                }
+            }
+        } catch (IOException e) {
+            LOG.error("Error while reading repo config", e);
+        }
+        finally {
+            if (config == null) {
+                throw new RuntimeException("couldn't find repo config for unittest clone");
+            }
+        }
+
+        LOG.debug("calling test repo clone");
+        // cloning assignment repo to persistent space
+        jGitUtil.cloneRepository(
+            config,
+            Paths.get(this.assignmentBasePath, assignmentId).toAbsolutePath().toString());
+
+        LOG.info(String.format("stored new assignment: %s", file.getAbsolutePath()));
+    }
+
+    /**
+     * Delete the folder for the assignment.
+     * Called when the teacher deletes the JUnitTest assignment
+     * <p>
+     * {{url}}:8080/v1/unittest?assignmentId=111
+     *
+     * @param assignmentId ID of the assignment to delete. Generated by Moodle
+     */
+    @RequestMapping(method = RequestMethod.DELETE)
+    public void deleteUnitTestFiles(@RequestParam("assignmentId") String assignmentId) {
+        LOG.info(String.format("received deletion order for assignment %s", assignmentId));
+
+        // deleting config file
+        File file = Paths.get(
+            this.assignmentBasePath,
+            assignmentId + ".txt")
+            .toFile();
+        file.delete();
+
+        // deleting local copy of repository
+        file = Paths.get(
+            this.assignmentBasePath,
+            assignmentId).toFile();
+        FileSystemUtils.deleteRecursively(file);
+
+        LOG.info(String.format("assignment %s deletion complete", assignmentId));
+    }
+}

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

-package de.hftstuttgart.dtabackend.utils;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import de.hftstuttgart.dtabackend.rest.v1.unittest.UnitTestUpload;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class RegexUtil {
-
-    public enum ConfigType {
-        TEACHER,
-        STUDENT,
-    }
-
-    private static final Logger LOG = LogManager.getLogger(RegexUtil.class);
-
-    public static Matcher findStudentConfig(InputStream is) {
-        return findConfig(is, ConfigType.STUDENT);
-    }
-
-    public static Matcher findProfessorConfig(InputStream is) {
-        return findConfig(is, ConfigType.TEACHER);
-    }
-
-    public static Matcher findConfig(InputStream is, ConfigType configType) {
-        Pattern pattern;
-        switch (configType) {
-            case TEACHER:
-                pattern = Pattern.compile(UnitTestUpload.TESTCONFIGREGEX);
-                break;
-
-            case STUDENT:
-                pattern = Pattern.compile(UnitTestUpload.SUBMISSIONCONFIGREGEX);
-                break;
-
-            default:
-                String msg = String.format("unknown config type: %s", configType.name());
-                LOG.error(msg);
-                throw new RuntimeException(msg);
-        }
-
-        Matcher config = null;
-
-        LOG.debug("reading config file");
-        // open received file in a try-with
-        try (BufferedReader br = new BufferedReader(
-            new InputStreamReader(
-                is))) {
-            String line;
-
-            // as long as we haven't found a configuration and have lines left, search
-            while (config == null && (line = br.readLine()) != null) {
-                Matcher matcher = pattern.matcher(line);
-                if (matcher.matches()) {
-                    LOG.debug(String.format("found dtt line: %s", line));
-                    config = matcher;
-                }
-            }
-        } catch (IOException e) {
-            LOG.error("Error while reading repo config", e);
-        }
-        finally {
-            if (config == null) {
-                throw new RuntimeException("couldn't find repo config for clone");
-            }
-        }
-
-        return config;
-    }
-
-}
+package de.hftstuttgart.dtabackend.utils;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import de.hftstuttgart.dtabackend.rest.v1.unittest.UnitTestUpload;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class RegexUtil {
+
+    public enum ConfigType {
+        TEACHER,
+        STUDENT,
+    }
+
+    private static final Logger LOG = LogManager.getLogger(RegexUtil.class);
+
+    public static Matcher findStudentConfig(InputStream is) {
+        return findConfig(is, ConfigType.STUDENT);
+    }
+
+    public static Matcher findProfessorConfig(InputStream is) {
+        return findConfig(is, ConfigType.TEACHER);
+    }
+
+    public static Matcher findConfig(InputStream is, ConfigType configType) {
+        Pattern pattern;
+        switch (configType) {
+            case TEACHER:
+                pattern = Pattern.compile(UnitTestUpload.TESTCONFIGREGEX);
+                break;
+
+            case STUDENT:
+                pattern = Pattern.compile(UnitTestUpload.SUBMISSIONCONFIGREGEX);
+                break;
+
+            default:
+                String msg = String.format("unknown config type: %s", configType.name());
+                LOG.error(msg);
+                throw new RuntimeException(msg);
+        }
+
+        Matcher config = null;
+
+        LOG.debug("reading config file");
+        // open received file in a try-with
+        try (BufferedReader br = new BufferedReader(
+            new InputStreamReader(
+                is))) {
+            String line;
+
+            // as long as we haven't found a configuration and have lines left, search
+            while (config == null && (line = br.readLine()) != null) {
+                Matcher matcher = pattern.matcher(line);
+                if (matcher.matches()) {
+                    LOG.debug(String.format("found dta line: %s", line));
+                    config = matcher;
+                }
+            }
+        } catch (IOException e) {
+            LOG.error("Error while reading repo config", e);
+        }
+        finally {
+            if (config == null) {
+                throw new RuntimeException("couldn't find repo config for clone");
+            }
+        }
+
+        return config;
+    }
+
+}

src/main/resources/application.properties

@@ -7,7 +7,7 @@ spring.http.multipart.max-file-size=5Mb
 ###############################################
 
 # Holds the uploaded Zip-Files
-tests.tmp.dir=/tmp/dta-tests
+tests.tmp.dir=~/dta-tests
 host.tests.tmp.dir=${tests.tmp.dir}
 data.dir=/data
 data.dir.test.folder.name=UnitTests