Skip to content
Snippets Groups Projects
Commit 919ab056 authored by cramakri's avatar cramakri
Browse files

LMS-1153 Use collection versions of data set access predicate.

SVN: 15714
parent 579c5cf6
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,7 @@ import java.util.ArrayList; ...@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map;
import com.csvreader.CsvReader; import com.csvreader.CsvReader;
...@@ -138,25 +139,23 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements ...@@ -138,25 +139,23 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements
public List<ImageDatasetMetadata> listImageMetadata(String sessionToken, public List<ImageDatasetMetadata> listImageMetadata(String sessionToken,
List<? extends IImageDatasetIdentifier> imageDatasets) List<? extends IImageDatasetIdentifier> imageDatasets)
{ {
try ArrayList<String> datasetCodes = new ArrayList<String>();
for (IImageDatasetIdentifier dataset : imageDatasets)
{
datasetCodes.add(dataset.getDatasetCode());
}
Map<String, File> datasetRoots =
checkAccessAndGetRootDirectories(sessionToken, datasetCodes);
List<ImageDatasetMetadata> result = new ArrayList<ImageDatasetMetadata>();
for (IImageDatasetIdentifier dataset : imageDatasets)
{ {
List<ImageDatasetMetadata> result = new ArrayList<ImageDatasetMetadata>(); File rootDirectoryOrNull = datasetRoots.get(dataset.getDatasetCode());
for (IImageDatasetIdentifier dataset : imageDatasets) if (rootDirectoryOrNull != null)
{ {
result.add(extractImageMetadata(sessionToken, dataset)); result.add(extractImageMetadata(dataset, rootDirectoryOrNull));
} }
return result;
} catch (IOException ex)
{
throw wrapIOException(ex);
} }
} return result;
private ImageDatasetMetadata extractImageMetadata(String sessionToken,
IImageDatasetIdentifier dataset) throws IOException
{
File datasetRoot = checkAccessAndGetRootDirectory(sessionToken, dataset.getDatasetCode());
return extractImageMetadata(dataset, datasetRoot);
} }
private static ImageDatasetMetadata extractImageMetadata(IImageDatasetIdentifier dataset, private static ImageDatasetMetadata extractImageMetadata(IImageDatasetIdentifier dataset,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment