Merge branch 'streamline-testing' of https://github.com/LearnLib/alex into streamline-testing

Author: mkrumrey

backend/src/main/java/de/learnlib/alex/data/dao/ProjectEnvironmentDAO.java

@@ -34,17 +34,16 @@
 import de.learnlib.alex.learning.repositories.LearnerSetupRepository;
 import de.learnlib.alex.testing.repositories.TestExecutionConfigRepository;
 import de.learnlib.alex.testing.repositories.TestReportRepository;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.ValidationException;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.validation.ValidationException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class ProjectEnvironmentDAO {

backend/src/main/java/de/learnlib/alex/data/services/export/ProjectExporter.java

@@ -34,12 +34,11 @@
 import de.learnlib.alex.testing.entities.export.TestExecutionConfigExportableEntity;
 import de.learnlib.alex.testing.entities.export.TestsExportableEntity;
 import de.learnlib.alex.testing.services.export.TestsExporter;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Service
 @Transactional(rollbackFor = Exception.class, readOnly = true)
 public class ProjectExporter extends EntityExporter {

backend/src/main/java/de/learnlib/alex/learning/repositories/LearnerSetupRepository.java

@@ -16,24 +16,20 @@
 
 package de.learnlib.alex.learning.repositories;
 
-import de.learnlib.alex.data.entities.ProjectEnvironment;
 import de.learnlib.alex.learning.entities.LearnerSetup;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
-
 @Repository
 public interface LearnerSetupRepository extends JpaRepository<LearnerSetup, Long> {
 
     List<LearnerSetup> findAllByProject_Id(Long projectId);
 
     void deleteAllByProject_Id(Long projectId);
 
-    List<LearnerSetup> findAllByEnvironmentsContains(ProjectEnvironment environment);
-
     @Query(value = "select ls "
             +      "from LearnerSetup ls join ls.environments e "
             +      "where ls.project.id = :projectId and e.id = :environmentId")

backend/src/main/java/de/learnlib/alex/learning/rest/LearnerSetupResource.java

@@ -32,7 +32,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,7 +44,6 @@
 
 @RestController
 @RequestMapping("/rest/projects/{projectId}/learner/setups")
-@Transactional(rollbackFor = Exception.class)
 public class LearnerSetupResource {
 
     private final AuthContext authContext;

backend/src/main/java/de/learnlib/alex/learning/services/LearnerService.java

@@ -64,12 +64,12 @@
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 /**
  * Basic class to control and monitor a learn process. This class is a high level abstraction of the LearnLib.
  */
 @Service
-@Transactional(rollbackFor = Exception.class)
 public class LearnerService {
 
     private static final Logger logger = LoggerFactory.getLogger(LearnerService.class);
@@ -91,6 +91,7 @@ public enum LearnerPhase {
     private final ApplicationContext applicationContext;
     private final TestService testService;
     private final UserDAO userDAO;
+    private final TransactionTemplate transactionTemplate;
 
     /** The learner threads for users (userId -> thread). */
     private final Map<Long, LearnerThread> learnerThreads;
@@ -102,14 +103,16 @@ public LearnerService(LearnerSetupDAO learnerSetupDAO,
                           PreparedConnectorContextHandlerFactory contextHandlerFactory,
                           ProjectDAO projectDAO,
                           @Lazy TestService testService,
-                          UserDAO userDAO) {
+                          UserDAO userDAO,
+                          TransactionTemplate transactionTemplate) {
         this.learnerSetupDAO = learnerSetupDAO;
         this.learnerResultDAO = learnerResultDAO;
         this.contextHandlerFactory = contextHandlerFactory;
         this.projectDAO = projectDAO;
         this.applicationContext = applicationContext;
         this.testService = testService;
         this.userDAO = userDAO;
+        this.transactionTemplate = transactionTemplate;
 
         this.learnerThreads = new HashMap<>();
     }
@@ -131,22 +134,27 @@ public LearnerService(LearnerSetupDAO learnerSetupDAO,
      *         If the symbols specified in the configuration could not be found.
      */
     public LearnerResult start(User user, Project project, LearnerStartConfiguration startConfiguration) {
-        User userInDb = this.userDAO.getByID(user.getId());
+        final var userInDb = this.userDAO.getByID(user.getId());
         checkRunningProcesses(userInDb, project.getId());
 
-        final var setup = startConfiguration.getSetup();
-        final var createdSetup = setup.getId() != null ? setup : learnerSetupDAO.create(user, project.getId(), setup);
+        final var createdResult = transactionTemplate.execute(t -> {
+            final var setup = startConfiguration.getSetup();
+            final var createdSetup = setup.getId() != null ? setup : learnerSetupDAO.create(user, project.getId(), setup);
 
-        final var options = startConfiguration.getOptions();
-        if (options.getComment() == null || options.getComment().trim().equals("")) {
-            options.setComment(createdSetup.getName());
-        }
+            final var options = startConfiguration.getOptions();
+            if (options.getComment() == null || options.getComment().trim().equals("")) {
+                options.setComment(createdSetup.getName());
+            }
 
-        final var result = new LearnerResult();
-        result.setSetup(createdSetup);
-        result.setComment(startConfiguration.getOptions().getComment());
+            final var result = new LearnerResult();
+            result.setSetup(createdSetup);
+            result.setComment(startConfiguration.getOptions().getComment());
 
-        final var createdResult = learnerResultDAO.create(user, project.getId(), result);
+            final var r = learnerResultDAO.create(user, project.getId(), result);
+            t.flush();
+
+            return r;
+        });
 
         enqueueLearningProcess(
                 project.getId(),
@@ -168,8 +176,9 @@ public LearnerResult start(User user, Project project, LearnerStartConfiguration
      * @param configuration
      *         The configuration to use for the next learning steps.
      */
+    @Transactional(rollbackFor = Exception.class)
     public LearnerResult resume(User user, Long projectId, Long testNo, LearnerResumeConfiguration configuration) {
-        User userInDb = this.userDAO.getByID(user.getId());
+        final var userInDb = this.userDAO.getByID(user.getId());
         checkRunningProcesses(userInDb, projectId);
 
         configuration.checkConfiguration();
@@ -266,6 +275,7 @@ private void validateCounterexample(User user, LearnerResult result, LearnerResu
      * @param projectId
      *         The id of the project that is learned.
      */
+    @Transactional(rollbackFor = Exception.class)
     public void abort(User user, Long projectId, Long testNo) {
         final var project = projectDAO.getByID(user, projectId); // access check
         final var result = learnerResultDAO.getByTestNo(user, projectId, testNo);
@@ -294,10 +304,12 @@ public boolean isActive(Long projectId) {
         return learnerThreads.containsKey(projectId);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public boolean hasRunningOrPendingTasks(User user, Long projectId) {
         if (!isActive(projectId)) {
             return false;
         }
+
         LearnerStatus learnerStatus = this.getStatus(user, projectId);
 
         List<LearnerResult> currentProcessSingletonList = Optional.ofNullable(learnerStatus.getCurrentProcess())
@@ -326,6 +338,7 @@ public long getNumberOfUserOwnedLearnProcesses(User user) {
      *         The id of the project.
      * @return A snapshot of the Learner status.
      */
+    @Transactional(rollbackFor = Exception.class)
     public LearnerStatus getStatus(User user, Long projectId) {
         if (isActive(projectId)) {
             final var thread = learnerThreads.get(projectId);
@@ -373,6 +386,7 @@ public LearnerStatus getStatus(User user, Long projectId) {
      * @throws LearnerException
      *         If something went wrong while testing the symbols.
      */
+    @Transactional(rollbackFor = Exception.class)
     public List<ExecuteResult> readOutputs(User user, Project project, ProjectEnvironment environment, ParameterizedSymbol resetSymbol,
                                            List<ParameterizedSymbol> symbols, ParameterizedSymbol postSymbol, WebDriverConfig driverConfig)
             throws LearnerException {
@@ -399,6 +413,7 @@ public List<ExecuteResult> readOutputs(User user, Project project, ProjectEnviro
      *         The config to use.
      * @return The outputs of the SUL.
      */
+    @Transactional(rollbackFor = Exception.class)
     public List<ExecuteResult> readOutputs(
             User user,
             Project project,

backend/src/main/java/de/learnlib/alex/learning/services/export/TestExecutionConfigsExporter.java

@@ -28,12 +28,11 @@
 import de.learnlib.alex.testing.entities.Test;
 import de.learnlib.alex.testing.entities.TestExecutionConfig;
 import de.learnlib.alex.testing.entities.export.TestExecutionConfigExportableEntity;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @Service
 @Transactional(rollbackFor = Exception.class, readOnly = true)
 public class TestExecutionConfigsExporter extends EntityExporter {

backend/src/main/java/de/learnlib/alex/testing/dao/TestExecutionConfigDAO.java

@@ -33,15 +33,13 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import javax.persistence.EntityManager;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityManager;
-
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class TestExecutionConfigDAO {

backend/src/main/java/de/learnlib/alex/testing/rest/TestExecutionConfigResource.java

@@ -20,11 +20,10 @@
 import de.learnlib.alex.security.AuthContext;
 import de.learnlib.alex.testing.dao.TestExecutionConfigDAO;
 import de.learnlib.alex.testing.entities.TestExecutionConfig;
-import java.util.List;
-import javax.ws.rs.core.MediaType;
-
 import de.learnlib.alex.testing.entities.TestQueueItem;
 import de.learnlib.alex.testing.services.TestService;
+import java.util.List;
+import javax.ws.rs.core.MediaType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

backend/src/main/java/de/learnlib/alex/testing/rest/TestResource.java

@@ -32,7 +32,6 @@
 import de.learnlib.alex.testing.services.export.TestsExporter;
 import de.learnlib.alex.webhooks.services.WebhookService;
 import java.util.List;
-import javax.print.attribute.standard.Media;
 import javax.ws.rs.core.MediaType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

backend/src/main/java/de/learnlib/alex/testing/services/TestService.java

@@ -28,14 +28,6 @@
 import de.learnlib.alex.testing.entities.TestQueueItem;
 import de.learnlib.alex.testing.entities.TestReport;
 import de.learnlib.alex.testing.entities.TestStatus;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionTemplate;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -44,6 +36,13 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
 
 /** The service that executes tests. */
 @Service
@@ -93,7 +92,7 @@ public TestQueueItem start(User user, Long projectId, TestExecutionConfig config
         final var project = projectDAO.getByID(user, projectId);
         User userInDb = this.userDAO.getByID(user.getId());
 
-        final var createdReport = transactionTemplate.execute((t) -> {
+        final var createdReport = transactionTemplate.execute(t -> {
             checkRunningProcesses(userInDb, projectId);
 
             final var r = new TestReport();
@@ -102,7 +101,10 @@ public TestQueueItem start(User user, Long projectId, TestExecutionConfig config
             r.setProject(project);
             r.setDescription(config.getDescription());
 
-            return testReportDAO.create(user, projectId, r);
+            final var cr = testReportDAO.create(user, projectId, r);
+            t.flush();
+
+            return cr;
         });
 
         final var item = new TestProcessQueueItem(