Skip to content

Commit 1d86f81

Browse files
ExperimentDataHandler File->FileLike (#1057)
1 parent b368b5b commit 1d86f81

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

snd/src/org/labkey/snd/pipeline/SNDDataHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.labkey.data.xml.ColumnType;
4646
import org.labkey.data.xml.ValidatorType;
4747
import org.labkey.data.xml.ValidatorsType;
48+
import org.labkey.vfs.FileLike;
4849
import org.txbiomed.snd.AttributesType;
4950
import org.txbiomed.snd.ChildType;
5051
import org.txbiomed.snd.ExportDocument;
@@ -57,6 +58,7 @@
5758
import java.io.File;
5859
import java.io.FileInputStream;
5960
import java.io.IOException;
61+
import java.io.InputStream;
6062
import java.util.ArrayList;
6163
import java.util.HashMap;
6264
import java.util.LinkedList;
@@ -77,7 +79,7 @@ public class SNDDataHandler extends AbstractExperimentDataHandler
7779
}
7880

7981
@Override
80-
public void importFile(@NotNull ExpData data, File dataFile, @NotNull ViewBackgroundInfo info, @NotNull Logger log, @NotNull XarContext context) throws ExperimentException
82+
public void importFile(@NotNull ExpData data, @NotNull FileLike dataFile, @NotNull ViewBackgroundInfo info, @NotNull Logger log, @NotNull XarContext context) throws ExperimentException
8183
{
8284
ExportDocument exportDocument;
8385
String inputFileName = dataFile.getName();
@@ -92,7 +94,7 @@ public void importFile(@NotNull ExpData data, File dataFile, @NotNull ViewBackgr
9294
}
9395

9496
//read xml data
95-
try(FileInputStream in = FileUtils.openInputStream(dataFile))
97+
try(InputStream in = dataFile.openInputStream())
9698
{
9799
XmlOptions options = XmlBeansUtil.getDefaultParseOptions();
98100
options.setValidateStrict();

0 commit comments

Comments
 (0)