Skip to content

Continue adopting FileLike instead of File or Path #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Dec 3, 2025
Merged

Continue adopting FileLike instead of File or Path #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions laboratory/src/org/labkey/laboratory/LaboratoryController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
Expand Down