TableSelector prefers stable-ordered sets (#455)

Author: labkey-adam

snprc_scheduler/src/org/labkey/snprc_scheduler/SNPRC_schedulerManager.java

@@ -70,7 +70,6 @@ public static SNPRC_schedulerManager get()
      */
     private Integer getNextRevisionNum(int timelineId)
     {
-
         SQLFragment sql = new SQLFragment("SELECT MAX(t.RevisionNum) AS RevisionNum FROM ");
         sql.append(SNPRC_schedulerSchema.getInstance().getTableInfoTimeline(), "t");
         sql.append(" WHERE t.TimelineId = ?").add(timelineId);
@@ -79,7 +78,6 @@ private Integer getNextRevisionNum(int timelineId)
         Integer revNum = sqlSelector.getObject(Integer.class);
 
         return (revNum == null) ? 0 : revNum + 1;
-
     }
 
     /**
@@ -102,6 +100,7 @@ public static String getUserDisplayName(Integer userId)
         }
         return userName;
     }
+
     // TODO: fb_snprc_edit
     public List<TimelineItem> getTimelineItems(Container c, User u, String timelineObjectId, @Nullable Date scheduleDate) throws ApiUsageException
     {
@@ -121,7 +120,6 @@ public List<TimelineItem> getTimelineItems(Container c, User u, String timelineO
             }
 
             timelineItems = new TableSelector(timelineItemTable, filter, null).getArrayList(TimelineItem.class);
-
         }
         catch (Exception e)
         {
@@ -144,7 +142,6 @@ public List<StudyDayNotes> getStudyDayNotes(Container c, User u, String timeline
 
             SimpleFilter filter = new SimpleFilter(FieldKey.fromParts(StudyDayNotes.STUDYDAY_TIMELINE_OBJECT_ID), timelineObjectId, CompareType.EQUAL);
             studyDayNotes = new TableSelector(studyDayTable, filter, null).getArrayList(StudyDayNotes.class);
-
         }
         catch (Exception e)
         {
@@ -154,10 +151,8 @@ public List<StudyDayNotes> getStudyDayNotes(Container c, User u, String timeline
         return studyDayNotes;
     }
 
-
     public List<TimelineAnimalJunction> getTimelineAnimalItems(Container c, User u, String timelineObjectId) throws ApiUsageException
     {
-
         List<TimelineAnimalJunction> timelineAnimalItems;
         try
         {
@@ -259,7 +254,6 @@ public List<TimelineProjectItem> getTimelineProjectItems(Container c, User u, St
      */
     public void validateBeforeDelete(Container c, User u, Timeline timeline, BatchValidationException errors)
     {
-
         Integer timelineId = timeline.getTimelineId();
         Integer revisionNum = timeline.getRevisionNum();
         String timelineObjectId = timeline.getObjectId();
@@ -274,8 +268,7 @@ public void validateBeforeDelete(Container c, User u, Timeline timeline, BatchVa
         // Does timeline exist?
         if (!errors.hasErrors() && timelineTable != null)
         {
-            Set<String> cols = new HashSet<>();
-            cols.add(Timeline.TIMELINE_ID);
+            Set<String> cols = Collections.singleton(Timeline.TIMELINE_ID);
 
             SimpleFilter filter = new SimpleFilter(FieldKey.fromString(Timeline.TIMELINE_ID), timelineId, CompareType.EQUAL).
                     addCondition(FieldKey.fromString(Timeline.TIMELINE_REVISION_NUM), revisionNum, CompareType.EQUAL);
@@ -290,11 +283,9 @@ public void validateBeforeDelete(Container c, User u, Timeline timeline, BatchVa
         // is timeline in use?
         if (!errors.hasErrors() && timelineTable != null)
         {
-
             if (timelineTable.isTimelineInUse(timelineId, revisionNum))
                 errors.addRowError(new ValidationException("Timeline is in use - cannot be deleted."));
         }
-
     }
 
     /**
@@ -319,7 +310,6 @@ public void deleteTimeline(@NotNull  Container c, @NotNull User u, Timeline time
             Integer revisionNum = timeline.getRevisionNum();
             String timelineObjectId = timeline.getObjectId();
 
-
             // delete the timeline
             try (DbScope.Transaction transaction = scope.ensureTransaction())
             {
@@ -431,7 +421,6 @@ public void deleteTimeline(@NotNull  Container c, @NotNull User u, Timeline time
 
                 // All is well
                 transaction.commit();
-
             }
             catch (BatchValidationException | InvalidKeyException | QueryUpdateServiceException | SQLException e)
             {
@@ -440,7 +429,6 @@ public void deleteTimeline(@NotNull  Container c, @NotNull User u, Timeline time
         }
     }
 
-
     /**
      * Update the Timeline table (called by SNPRC_schedulerServiceImpl.saveTimelineData()
      *

snprc_scheduler/src/org/labkey/snprc_scheduler/query/TimelineTable.java

@@ -26,7 +26,7 @@
 import org.labkey.snprc_scheduler.domains.Timeline;
 
 import java.sql.SQLException;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
@@ -52,7 +52,6 @@ public SimpleTable init()
     {
         super.init();
 
-
         // initialize virtual columns here
         // HasItems = true if the timeline has timeline items assigned
         SQLFragment hasItemsSql = new SQLFragment();
@@ -149,14 +148,11 @@ private void customizeTimelineTable()
                 addColumn(wrapped);
             }
         }
-
     }
 
-
     public boolean isTimelineInUse(Integer timelineId, Integer revisionNum)
     {
-        Set<String> cols = new HashSet<>();
-        cols.add("IsScheduled");
+        Set<String> cols = Collections.singleton("IsScheduled");
         SimpleFilter filter = new SimpleFilter(FieldKey.fromString("TimelineId"), timelineId, CompareType.EQUAL).
             addCondition(FieldKey.fromString("RevisionNum"), revisionNum, CompareType.EQUAL);