Merge 24.11 to develop (#1021)

Author: labkey-teamcity

api-src/org/labkey/api/targetedms/TargetedMSService.java

@@ -78,7 +78,7 @@ enum FolderType
     void registerTargetedMSFolderTypeListener(TargetedMSFolderTypeListener listener);
     List<TargetedMSFolderTypeListener> getTargetedMSFolderTypeListeners();
     List<SampleFileInfo> getSampleFiles(Container container, User user, Integer sampleFileLimit);
-    List<SampleFileInfo> getSampleFiles(Container container, User user, Date startDate, Date endDate);
+    List<SampleFileInfo> getSampleFiles(@NotNull Container container, @NotNull User user, @Nullable Date startDate, @Nullable Date endDate);
     TargetedMSService.FolderType getFolderType(Container container);
 
     ExperimentRunType getExperimentRunType();

src/org/labkey/targetedms/TargetedMSServiceImpl.java

@@ -47,8 +47,6 @@
 import org.labkey.targetedms.query.ReplicateManager;
 
 import java.nio.file.Path;
-import java.text.DateFormat;
-import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -122,7 +120,7 @@ public List<SampleFileInfo> getSampleFiles(Container container, User user, Integ
     }
 
     @Override
-    public List<SampleFileInfo> getSampleFiles(Container container, User user, Date startDate, Date endDate)
+    public List<SampleFileInfo> getSampleFiles(@NotNull Container container, @NotNull User user, @Nullable Date startDate, @Nullable Date endDate)
     {
         List<SampleFileInfo> sampleFileInfos = TargetedMSManager.get().getSampleFileInfos(container, user, null);
         List<SampleFileInfo> result = new ArrayList<>();
@@ -131,9 +129,9 @@ public List<SampleFileInfo> getSampleFiles(Container container, User user, Date
             for (SampleFileInfo sampleFileInfo : sampleFileInfos)
             {
                 Date acquired = DateUtil.getDateOnly(sampleFileInfo.getAcquiredTime());
-                Date start = DateUtil.getDateOnly(startDate);
-                Date end = DateUtil.getDateOnly(endDate);
-                if ((acquired.after(start) && acquired.before(end) || acquired.compareTo(start) == 0 || acquired.compareTo(end) == 0))
+                Date start = startDate == null ? acquired : DateUtil.getDateOnly(startDate);
+                Date end = endDate == null ? acquired : DateUtil.getDateOnly(endDate);
+                if ((acquired.after(start) || acquired.compareTo(start) == 0) && (acquired.before(end) || acquired.compareTo(end) == 0))
                 {
                     result.add(sampleFileInfo);
                 }