Clean code

Author: Aaron-Detre

src/main/java/org/wise/portal/presentation/web/controllers/survey/SurveyAPIController.java

@@ -21,8 +21,6 @@
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -67,7 +65,16 @@ public void launchSurveyRun(@PathVariable String code, HttpServletResponse respo
     Projectcode projectCode = new Projectcode(code.replaceAll("\\+\\+", " "));
     Run run = runService.retrieveRunByRuncode(projectCode.getRuncode());
     if (run.getIsSurvey()) {
-      if (!SecurityContextHolder.getContext().getAuthentication().getPrincipal().equals("anonymousUser")) { // Already signed in
+      handleSurveyLaunched(response, request, run, projectCode);
+          } else {
+      response.sendRedirect("/");
+    }
+  }
+
+  private void handleSurveyLaunched(HttpServletResponse response, HttpServletRequest request, Run run, Projectcode projectCode)
+    throws AuthorityNotFoundException, IOException, DuplicateUsernameException, ObjectNotFoundException, 
+           PeriodNotFoundException, StudentUserAlreadyAssociatedWithRunException, RunHasEndedException {
+    if (userAlreadySignedIn()) {
         response.sendRedirect("/survey/logout");
       } else if (underWorkgroupLimit(run)) {
         User user = this.createNewStudentAccount();
@@ -77,9 +84,10 @@ public void launchSurveyRun(@PathVariable String code, HttpServletResponse respo
       } else {
         response.sendRedirect("/survey/workgroupLimitReached");
       }
-    } else {
-      response.sendRedirect("/");
-    }
+  }
+
+  private Boolean userAlreadySignedIn() {
+    return !SecurityContextHolder.getContext().getAuthentication().getPrincipal().equals("anonymousUser");
   }
 
   private Boolean underWorkgroupLimit(Run run) {

src/main/java/org/wise/portal/service/student/impl/StudentServiceImpl.java

@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -44,7 +43,6 @@
 import org.wise.portal.domain.run.Run;
 import org.wise.portal.domain.run.StudentRunInfo;
 import org.wise.portal.domain.user.User;
-import org.wise.portal.domain.user.impl.UserImpl;
 import org.wise.portal.domain.workgroup.Workgroup;
 import org.wise.portal.service.group.GroupService;
 import org.wise.portal.service.run.RunService;