Continue adopting FileLike instead of File or Path (#274)

More cleanup

Author: labkey-jeckels

laboratory/src/org/labkey/laboratory/LaboratoryController.java

@@ -615,15 +615,15 @@ protected void setContentType(HttpServletResponse response)
         }
 
         @Override
-        protected File getTargetFile(String filename) throws IOException
+        protected FileLike getTargetFile(String filename) throws IOException
         {
             if (!PipelineService.get().hasValidPipelineRoot(getContainer()))
                 throw new UploadException("Pipeline root must be configured before uploading assay files", HttpServletResponse.SC_NOT_FOUND);
 
             try
             {
                 FileLike targetDirectory = AssayFileWriter.ensureUploadDirectory(getContainer());
-                return FileUtil.findUniqueFileName(filename, targetDirectory).toNioPathForWrite().toFile();
+                return FileUtil.findUniqueFileName(filename, targetDirectory);
             }
             catch (ExperimentException e)
             {
@@ -632,14 +632,14 @@ protected File getTargetFile(String filename) throws IOException
         }
 
         @Override
-        public String getResponse(ProcessAssayForm form, Map<String, Pair<File, String>> files) throws UploadException
+        public String getResponse(ProcessAssayForm form, Map<String, Pair<FileLike, String>> files) throws UploadException
         {
             JSONObject resp = new JSONObject();
             try
             {
-                for (Map.Entry<String, Pair<File, String>> entry : files.entrySet())
+                for (Map.Entry<String, Pair<FileLike, String>> entry : files.entrySet())
                 {
-                    File file = entry.getValue().getKey();
+                    File file = entry.getValue().getKey().toNioPathForRead().toFile();
                     String originalName = entry.getValue().getValue();
 
                     if (form.getLabkeyAssayId() == null)