Change isSurvey from Boolean to boolean.

Requires db changes:
update runs set isSurvey=false where isSurvey is null;
alter table runs add column isSurvey bit(1) not null default 0;

Author: hirokiterashima

src/main/java/org/wise/portal/domain/run/Run.java

@@ -120,7 +120,7 @@ public interface Run extends Persistable {
 
   /**
    * Returns the period with periodName that is associated with this run
-   * 
+   *
    * @param periodName
    * @return Group the period with the periodName that is associated with this run
    * @throws <code>PeriodNotFoundException</code>
@@ -214,41 +214,41 @@ public interface Run extends Persistable {
 
   /**
    * Sets whether or not student asset uploading is enabled for this run.
-   * 
+   *
    * @return
    */
   void setStudentAssetUploaderEnabled(boolean isStudentAssetUploaderEnabled);
 
   /**
    * Returns whether or not student asset uploading is enabled for this run.
-   * 
+   *
    * @return
    */
   boolean isStudentAssetUploaderEnabled();
 
   /**
    * Sets whether or not idea manager is enabled for this run.
-   * 
+   *
    * @return
    */
   void setIdeaManagerEnabled(boolean isIdeaManagerEnabled);
 
   /**
    * Returns whether or not idea manager is enabled for this run.
-   * 
+   *
    * @return
    */
   boolean isIdeaManagerEnabled();
 
   /**
-   * @return Whether or not the run a survey 
+   * @return Whether or not the run a survey
    */
-  Boolean getIsSurvey();
+  boolean isSurvey();
 
   /**
-   * @param isSurvey 
+   * @param isSurvey
    */
-  void setIsSurvey(Boolean isSurvey);
+  void setIsSurvey(boolean isSurvey);
 
   /**
    * @return <code>Integer</code> maxWorkgroupSize
@@ -351,7 +351,7 @@ public interface Run extends Persistable {
 
   /**
    * sets student attendance for this run
-   * 
+   *
    * @param studentAttendance
    */
   void setStudentAttendance(List<StudentAttendance> studentAttendance);
@@ -363,29 +363,29 @@ public interface Run extends Persistable {
 
   /**
    * Gets private notes for this run
-   * 
+   *
    * @return String private notes for this run
    */
   String getPrivateNotes();
 
   /**
    * Sets private notes for this run
-   * 
+   *
    * @param privateNotes
    *                       private notes for this run
    */
   void setPrivateNotes(String privateNotes);
 
   /**
    * Gets survey for this run
-   * 
+   *
    * @return String survey for this run
    */
   String getSurvey();
 
   /**
    * Sets survey for this run
-   * 
+   *
    * @return String survey for this run
    */
   void setSurvey(String survey);

src/main/java/org/wise/portal/domain/run/impl/RunImpl.java

@@ -203,9 +203,7 @@ public class RunImpl implements Run {
   private String info; // other info pertaining to the run
 
   @Column(name = COLUMN_NAME_IS_SURVEY)
-  @Getter
-  @Setter
-  private Boolean isSurvey; 
+  private boolean isSurvey;
 
   @Column(name = COLUMN_NAME_MAX_WORKGROUP_SIZE, nullable = true)
   @Getter
@@ -435,7 +433,7 @@ public static class UserAlphabeticalComparator implements Comparator<User> {
 
     /**
      * Compares the user names of two User objects
-     * 
+     *
      * @param user1
      *                a user object
      * @param user2
@@ -488,4 +486,12 @@ public boolean isLockedAfterEndDate() {
   public void setLockedAfterEndDate(boolean isLockedAfterEndDate) {
     this.isLockedAfterEndDate = isLockedAfterEndDate;
   }
+
+  public boolean isSurvey() {
+    return isSurvey;
+  }
+
+  public void setIsSurvey(boolean isSurvey) {
+    this.isSurvey = isSurvey;
+  }
 }

src/main/java/org/wise/portal/domain/run/impl/RunParameters.java

@@ -30,7 +30,6 @@
 import org.wise.portal.domain.project.Project;
 import org.wise.portal.domain.user.User;
 
-import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -70,7 +69,7 @@ public class RunParameters implements Serializable {
 
   private Boolean isLockedAfterEndDate = false;
 
-  private Boolean isSurvey = false;
+  private boolean isSurvey = false;
 
   public String printAllPeriods() {
     String allPeriods = null;

src/main/java/org/wise/portal/presentation/web/controllers/run/RunInfoAPIController.java

@@ -62,7 +62,7 @@ private HashMap<String, Object> getRunInfo(Run run) {
     info.put("teacherFirstName", owner.getUserDetails().getFirstname());
     info.put("teacherLastName", owner.getUserDetails().getLastname());
     info.put("wiseVersion", run.getProject().getWiseVersion());
-    info.put("isSurvey", run.getIsSurvey());
+    info.put("isSurvey", run.isSurvey());
     return info;
   }
 

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

@@ -65,7 +65,7 @@ public void launchSurveyRun(@PathVariable String code, HttpServletResponse respo
 
     Projectcode projectCode = new Projectcode(code);
     Run run = runService.retrieveRunByRuncode(projectCode.getRuncode());
-    if (run.getIsSurvey()) {
+    if (run.isSurvey()) {
       handleSurveyLaunched(response, request, run, projectCode);
     } else {
       sendRedirect(response, "/");
@@ -76,9 +76,9 @@ private void handleSurveyLaunched(HttpServletResponse response, HttpServletReque
       Run run, Projectcode projectCode) throws AuthorityNotFoundException, IOException,
       DuplicateUsernameException, ObjectNotFoundException, PeriodNotFoundException,
       StudentUserAlreadyAssociatedWithRunException, RunHasEndedException {
-    
+
     Object principal = getSecurityContextHolderPrincipal();
-    if (principal instanceof StudentUserDetails 
+    if (principal instanceof StudentUserDetails
         && isStudentAssociatedWithRun(run, (StudentUserDetails) principal)) {
       sendRedirect(response, "/student/unit/" + run.getId());
       return;

src/main/java/org/wise/portal/presentation/web/controllers/teacher/TeacherAPIController.java

@@ -255,7 +255,7 @@ private List<Integer> getSharedOwnerPermissionsList(Run run, User user) {
   @PostMapping("/run/create")
   HashMap<String, Object> createRun(Authentication auth, HttpServletRequest request,
       @RequestParam("projectId") Long projectId, @RequestParam("periods") String periods,
-      @RequestParam("isSurvey") Boolean isSurvey,
+      @RequestParam boolean isSurvey,
       @RequestParam("maxStudentsPerTeam") Integer maxStudentsPerTeam,
       @RequestParam("startDate") Long startDate,
       @RequestParam(value = "endDate", required = false) Long endDate,
@@ -264,8 +264,8 @@ HashMap<String, Object> createRun(Authentication auth, HttpServletRequest reques
     User user = userService.retrieveUserByUsername(auth.getName());
     Locale locale = request.getLocale();
     Set<String> periodNames = createPeriodNamesSet(periods);
-    Run run = runService.createRun(projectId, user, periodNames, isSurvey, maxStudentsPerTeam, startDate,
-        endDate, isLockedAfterEndDate, locale);
+    Run run = runService.createRun(projectId, user, periodNames, isSurvey, maxStudentsPerTeam,
+        startDate, endDate, isLockedAfterEndDate, locale);
     return getRunMap(user, run);
   }
 

src/main/java/org/wise/portal/presentation/web/controllers/user/UserAPIController.java

@@ -261,7 +261,7 @@ protected HashMap<String, Object> getRunMap(User user, Run run) {
     HashMap<String, Object> map = new HashMap<String, Object>();
     map.put("id", run.getId());
     map.put("name", run.getName());
-    map.put("isSurvey", run.getIsSurvey());
+    map.put("isSurvey", run.isSurvey());
     map.put("maxStudentsPerTeam", run.getMaxWorkgroupSize());
     map.put("runCode", run.getRuncode());
     map.put("startTime", run.getStartTimeMilliseconds());

src/main/java/org/wise/portal/service/run/RunService.java

@@ -58,8 +58,9 @@ public interface RunService {
    */
   Run createRun(RunParameters runParameters) throws ObjectNotFoundException;
 
-  Run createRun(Long projectId, User user, Set<String> periodNames, Boolean isSurvey, Integer maxStudentsPerTeam,
-      Long startDate, Long endDate, Boolean isLockedAfterEndDate, Locale locale) throws Exception;
+  Run createRun(Long projectId, User user, Set<String> periodNames, boolean isSurvey,
+      Integer maxStudentsPerTeam, Long startDate, Long endDate, Boolean isLockedAfterEndDate,
+      Locale locale) throws Exception;
 
   /**
    * Ends this run. The side effect is that the run's endtime gets set. A Run that has ended is no

src/main/java/org/wise/portal/service/run/impl/RunServiceImpl.java

@@ -199,7 +199,7 @@ public Run createRun(RunParameters runParameters) {
     run.setStarttime(runParameters.getStartTime());
     run.setRuncode(generateUniqueRunCode(runParameters.getLocale()));
     run.setOwner(runParameters.getOwner());
-    run.setIsSurvey(runParameters.getIsSurvey());
+    run.setIsSurvey(runParameters.isSurvey());
     run.setMaxWorkgroupSize(runParameters.getMaxWorkgroupSize());
     run.setProject(project);
     run.setName("" + runParameters.getProject().getName());
@@ -240,7 +240,7 @@ public Run createRun(RunParameters runParameters) {
   }
 
   @Transactional()
-  public Run createRun(Long projectId, User user, Set<String> periodNames, Boolean isSurvey,
+  public Run createRun(Long projectId, User user, Set<String> periodNames, boolean isSurvey,
       Integer maxStudentsPerTeam, Long startDate, Long endDate, Boolean isLockedAfterEndDate,
       Locale locale) throws Exception {
     Project project = projectService.copyProject(projectId, user);
@@ -252,17 +252,17 @@ public Run createRun(Long projectId, User user, Set<String> periodNames, Boolean
     return run;
   }
 
-  public RunParameters createRunParameters(Project project, User user, Set<String> periodNames, Boolean isSurvey,
-      Integer maxStudentsPerTeam, Long startDate, Long endDate, Boolean isLockedAfterEndDate,
-      Locale locale) {
+  public RunParameters createRunParameters(Project project, User user, Set<String> periodNames,
+      boolean isSurvey, Integer maxStudentsPerTeam, Long startDate, Long endDate,
+      Boolean isLockedAfterEndDate, Locale locale) {
     RunParameters runParameters = new RunParameters();
     runParameters.setOwner(user);
     runParameters.setName(project.getName());
     runParameters.setProject(project);
     runParameters.setLocale(locale);
     runParameters.setPostLevel(5);
     runParameters.setPeriodNames(periodNames);
-    runParameters.setIsSurvey(isSurvey);
+    runParameters.setSurvey(isSurvey);
     runParameters.setMaxWorkgroupSize(maxStudentsPerTeam);
     runParameters.setStartTime(new Date(startDate));
     if (endDate == null || endDate <= startDate) {

src/main/resources/wise_db_init.sql

@@ -330,7 +330,7 @@ create table runs (
     end_time datetime,
     extras mediumtext,
     info varchar(255),
-    isSurvey bit,
+    isSurvey bit not null default 0,
     lastRun datetime,
     loggingLevel integer,
     maxWorkgroupSize integer,