Skip to content

Continue adopting FileLike instead of File or Path #903

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 2 commits into from
Dec 3, 2025
Merged

Continue adopting FileLike instead of File or Path #903

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc9a4fb
More cleanup
labkey-jeckels Dec 1, 2025
af70bcb
Merge branch 'develop' into fb_fileLike3
labkey-jeckels Dec 3, 2025
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
6 changes: 3 additions & 3 deletions WNPRC_Compliance/src/org/labkey/wnprc_compliance/WNPRC_ComplianceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
import org.labkey.dbutils.api.SimpleQueryFactory;
import org.labkey.dbutils.api.SimpleQueryUpdater;
import org.labkey.dbutils.api.SimplerFilter;
import org.labkey.vfs.FileLike;
import org.labkey.webutils.api.action.SimpleJspPageAction;
import org.labkey.wnprc_compliance.form.NewUserForm;
import org.labkey.wnprc_compliance.form.RequirementForm;
import org.labkey.wnprc_compliance.security.ComplianceAdminPermission;
import org.springframework.validation.BindException;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.Writer;
Expand Down Expand Up @@ -273,7 +273,7 @@ public Object execute(NewUserFormWithData form, BindException errors) throws Exc
@RequiresPermission(ComplianceAdminPermission.class)
public class UploadAccessReportAPI extends AbstractFileUploadAction {
@Override
protected File handleFile(String filename, InputStream input, Writer writer) throws IOException {
protected FileLike handleFile(String filename, InputStream input, Writer writer) throws IOException {
try {

AccessReportService service = new AccessReportService(getUser(), getContainer());
Expand All @@ -291,7 +291,7 @@ protected File handleFile(String filename, InputStream input, Writer writer) thr
}

@Override
protected File getTargetFile(String filename) throws IOException {
protected FileLike getTargetFile(String filename) throws IOException {
// We'll be intercepting the stream, and we override handleFile(), so we don't need
// to implement this. If that ever changes, look at using /dev/null ("NUL" for Windows)
// to truly give a data sink.
Expand Down