Skip to content

Route all temp file creation through FileUtil for consistency #531

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-adam merged 1 commit into from
Dec 2, 2022
Merged

Route all temp file creation through FileUtil for consistency #531

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
7 changes: 3 additions & 4 deletions src/org/labkey/cds/CDSExportQueryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ private void writeCSVQueries(ZipOutputStream out, boolean isLearnGrid) throws IO
try (TSVGridWriter tsv = getTSVGridWriter(isLearnGrid, _tabQueryForms.get(tabName)))
{
tsv.setDelimiterCharacter(TSVWriter.DELIM.COMMA);
tmpFile = File.createTempFile("tmp" + tabName + FileUtil.getTimestamp(), null);
tmpFile = FileUtil.createTempFile("tmp" + tabName + FileUtil.getTimestamp(), null);
tmpFile.deleteOnExit();
tsv.write(tmpFile);
logAuditEvent("Exported to CSV", tsv.getDataRowCount());
Expand All @@ -776,7 +776,7 @@ private void writeGridCSV(String tabName, ResultsFactory factory, ZipOutputStrea
try (TSVGridWriter tsv = new TSVGridWriter(factory))
{
tsv.setDelimiterCharacter(TSVWriter.DELIM.COMMA);
tmpFile = File.createTempFile("tmp" + tabName + FileUtil.getTimestamp(), null);
tmpFile = FileUtil.createTempFile("tmp" + tabName + FileUtil.getTimestamp(), null);
tmpFile.deleteOnExit();
tsv.write(tmpFile);
}
Expand Down Expand Up @@ -873,12 +873,11 @@ private void writeMetadataTxt(ZipOutputStream out, boolean isLearnGrid) throws I
builder.append("\n" + FILTERS_FOOTER_TXT + "\n");
}

File tmpFile = File.createTempFile("tmpMetadata" + FileUtil.getTimestamp(), null);
File tmpFile = FileUtil.createTempFile("tmpMetadata" + FileUtil.getTimestamp(), null);
tmpFile.deleteOnExit();

FileUtils.writeStringToFile(tmpFile, builder.toString(), StringUtilsLabKey.DEFAULT_CHARSET);
copyFileToZip(tmpFile, out);
}
}

}