Fixes

Author: VladislavKostyukevich

src/main/java/main/Session.java

@@ -12,7 +12,7 @@
 import main.model.dto.*;
 import main.model.email.TestRunEmails;
 
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -27,6 +27,7 @@ public Session(String sessionId) throws AqualityException {
         controllerFactory = new ControllerFactory(user);
     }
 
+    @Deprecated
     public Session(String importToken, int projectId) throws AqualityException {
         user = new UserDto();
         controllerFactory = new ControllerFactory(user);
@@ -35,9 +36,7 @@ public Session(String importToken, int projectId) throws AqualityException {
             projectUser.setProject_id(projectId);
             projectUser.setEngineer(1);
             projectUser.setViewer(1);
-            List<ProjectUserDto> projectUsers =  new ArrayList<>();
-            projectUsers.add(projectUser);
-            user.setProjectUsers(projectUsers);
+            user.setProjectUsers(Collections.singletonList(projectUser));
             controllerFactory = new ControllerFactory(user);
         }
     }

src/main/java/main/model/db/dao/project/UserDao.java

@@ -12,6 +12,7 @@
 import org.apache.commons.codec.binary.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -90,9 +91,7 @@ private UserDto IsAuthorizedToken(String sessionId) throws AqualityException {
             projectUser.setProject_id(projectId);
             projectUser.setViewer(1);
             projectUser.setEngineer(1);
-            List<ProjectUserDto> projectUsersList = new ArrayList<>();
-            projectUsersList.add(projectUser);
-            user.setProjectUsers(projectUsersList);
+            user.setProjectUsers(Collections.singletonList(projectUser));
             user.setApiSessionProjectId(projectId);
             return user;
         }

src/main/java/main/model/dto/TestResultDto.java

@@ -9,7 +9,7 @@
 
 import java.util.Date;
 
-@ Data@EqualsAndHashCode(callSuper = true)
+@Data @EqualsAndHashCode(callSuper = true)
 public class TestResultDto extends BaseDto {
     private String internalTestId;
     @DataBaseName(name="request_project_id")

src/main/java/main/view/BaseServlet.java

@@ -25,10 +25,9 @@ public class BaseServlet extends HttpServlet{
     protected DtoMapperGeneral mapper = new DtoMapperGeneral();
 
     protected Session createSession(HttpServletRequest req) throws AqualityException {
-        String apiToken = getStringQueryParameter(req, "apiToken");
         String importToken = getStringQueryParameter(req, "importToken");
         Integer projectId = getIntegerQueryParameter(req, "projectId");
-        if ((apiToken != null || importToken != null) && projectId != null) {
+        if (importToken != null && projectId != null) {
             return new Session(importToken, projectId);
         } else {
             return new Session(getSessionId(req));