cleanup

Author: Alexander Bainczyk

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/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

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

@@ -30,6 +30,12 @@
 import de.learnlib.alex.testing.events.TestEvent;
 import de.learnlib.alex.testing.events.TestExecutionStartedEventData;
 import de.learnlib.alex.webhooks.services.WebhookService;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -40,15 +46,6 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.stream.Collectors;
-
 /**
  * The thread that executes tests. There should ever only be one test per project.
  */

backend/src/main/java/de/learnlib/alex/websocket/WebSocketConfig.java

@@ -30,7 +30,6 @@
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
 import org.springframework.web.socket.handler.WebSocketHandlerDecorator;
-import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
 
 @Configuration
 @EnableWebSocketMessageBroker