diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java
index 34893253c726188e3c5228354fe7defd6ac4f805..f1f8dfe362a1aa6d518dd412522988107829c6fc 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java
@@ -49,6 +49,7 @@ import ch.systemsx.cisd.openbis.dss.screening.shared.api.v1.IDssServiceRpcScreen
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVector;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDataset;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDatasetReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IDatasetIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IFeatureVectorDatasetIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IImageDatasetIdentifier;
@@ -207,14 +208,13 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements
}
public List<FeatureVectorDataset> loadFeatures(String sessionToken,
- List<? extends IFeatureVectorDatasetIdentifier> featureDatasets,
- List<String> featureNames)
+ List<FeatureVectorDatasetReference> featureDatasets, List<String> featureNames)
{
try
{
List<FeatureVectorDataset> result = new ArrayList<FeatureVectorDataset>();
- for (IFeatureVectorDatasetIdentifier dataset : featureDatasets)
+ for (FeatureVectorDatasetReference dataset : featureDatasets)
{
result.add(createFeatureVectorDataset(sessionToken, dataset, featureNames));
}
@@ -226,7 +226,7 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements
}
private FeatureVectorDataset createFeatureVectorDataset(String sessionToken,
- IFeatureVectorDatasetIdentifier dataset, List<String> featureNames) throws IOException
+ FeatureVectorDatasetReference dataset, List<String> featureNames) throws IOException
{
return createFeatureVectorDataset(getDatasetFile(sessionToken, dataset), dataset,
featureNames);
@@ -434,7 +434,7 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements
// exposed for testing
static FeatureVectorDataset createFeatureVectorDataset(File datasetFile,
- IFeatureVectorDatasetIdentifier dataset, List<String> featureNames) throws IOException
+ FeatureVectorDatasetReference dataset, List<String> featureNames) throws IOException
{
DatasetFileLines fileLines = CsvFileReaderHelper.getDatasetFileLines(datasetFile);
String[] headerTokens = fileLines.getHeaderTokens();
@@ -570,13 +570,13 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc implements
private static class FeatureVectorDatasetBuilder
{
- private final IFeatureVectorDatasetIdentifier dataset;
+ private final FeatureVectorDatasetReference dataset;
private final List<String> featureNames;
private final List<FeatureVector> featureVectors;
- public FeatureVectorDatasetBuilder(IFeatureVectorDatasetIdentifier dataset,
+ public FeatureVectorDatasetBuilder(FeatureVectorDatasetReference dataset,
List<String> featureNames)
{
this.dataset = dataset;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/IDssServiceRpcScreening.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/IDssServiceRpcScreening.java
index aee6d48296355bfbac32c5a49ccbb85fb374d519..713ebf641b4c0d9dd461b1aa28d2fa525d5aded2 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/IDssServiceRpcScreening.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/shared/api/v1/IDssServiceRpcScreening.java
@@ -20,6 +20,7 @@ import java.io.InputStream;
import java.util.List;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDataset;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDatasetReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IFeatureVectorDatasetIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IImageDatasetIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ImageDatasetMetadata;
@@ -45,8 +46,7 @@ public interface IDssServiceRpcScreening
* matrix. Each column in that matrix is one feature, each row is one well in one data set.
*/
List<FeatureVectorDataset> loadFeatures(String sessionToken,
- List<? extends IFeatureVectorDatasetIdentifier> featureDatasets,
- List<String> featureNames);
+ List<FeatureVectorDatasetReference> featureDatasets, List<String> featureNames);
/**
* Provide images for a given list of image references (given by data set code, well position,
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/IScreeningOpenbisServiceFacade.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/IScreeningOpenbisServiceFacade.java
index 00252494f7421a4847a8cb7ed3faf46c95cd2d89..ade62515667718fd94781e54e12272bb4e060f16 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/IScreeningOpenbisServiceFacade.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/IScreeningOpenbisServiceFacade.java
@@ -85,8 +85,7 @@ public interface IScreeningOpenbisServiceFacade
* feature vectors.
*/
public abstract List<FeatureVectorDataset> loadFeatures(
- List<? extends IFeatureVectorDatasetIdentifier> featureDatasets,
- List<String> featureNames);
+ List<FeatureVectorDatasetReference> featureDatasets, List<String> featureNames);
/**
* Saves images for a given list of image references (given by data set code, well position,
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java
index 9cb47a4a0e7357ea8fa1a5f91844c913f0ed90be..8373b280460e10ce63358a60b27d8a7f8f92b74f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/ScreeningOpenbisServiceFacade.java
@@ -163,8 +163,7 @@ public class ScreeningOpenbisServiceFacade implements IScreeningOpenbisServiceFa
* feature vectors.
*/
public List<FeatureVectorDataset> loadFeatures(
- List<? extends IFeatureVectorDatasetIdentifier> featureDatasets,
- List<String> featureNames)
+ List<FeatureVectorDatasetReference> featureDatasets, List<String> featureNames)
{
if (featureDatasets.size() == 0)
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java
index 104d49aa664a61ce660e65a6a65796a39bcaeedb..7f503e539e5dce6e617231b6f8a3b2f2b0e2c34d 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/FeatureVectorDataset.java
@@ -12,13 +12,13 @@ public class FeatureVectorDataset implements Serializable
{
private static final long serialVersionUID = 1L;
- private final IFeatureVectorDatasetIdentifier dataset;
+ private final FeatureVectorDatasetReference dataset;
private final List<String> featureNames;
private final List<FeatureVector> featureVectors;
- public FeatureVectorDataset(IFeatureVectorDatasetIdentifier dataset, List<String> featureNames,
+ public FeatureVectorDataset(FeatureVectorDatasetReference dataset, List<String> featureNames,
List<FeatureVector> featureVectors)
{
this.dataset = dataset;
@@ -27,7 +27,7 @@ public class FeatureVectorDataset implements Serializable
}
/** identifier of the dataset containing feature vectors */
- public IDatasetIdentifier getDataset()
+ public FeatureVectorDatasetReference getDataset()
{
return dataset;
}
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java
index 74a33d804756edb451fc7372f63630394d2c4a14..b985f0240a627733d20feb20fcd7645b61b50967 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDataset;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IFeatureVectorDatasetIdentifier;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDatasetReference;
/**
* Test cases for the {@link DssServiceRpcScreening}.
@@ -71,8 +71,8 @@ public class DssServiceRpcScreeningTest extends AbstractFileSystemTestCase
for (String data : fileData)
{
FileUtilities.writeToFile(datasetFile, data);
- IFeatureVectorDatasetIdentifier dataset =
- createFeatureVectorDatasetIdentifier(datasetCode, url);
+ FeatureVectorDatasetReference dataset =
+ createFeatureVectorDatasetReference(datasetCode, url);
FeatureVectorDataset result =
DssServiceRpcScreening.createFeatureVectorDataset(datasetFile, dataset,
Arrays.asList(new String[]
@@ -104,23 +104,10 @@ public class DssServiceRpcScreeningTest extends AbstractFileSystemTestCase
}
}
- private IFeatureVectorDatasetIdentifier createFeatureVectorDatasetIdentifier(
+ private FeatureVectorDatasetReference createFeatureVectorDatasetReference(
final String datasetCode, final String url)
{
- return new IFeatureVectorDatasetIdentifier()
- {
-
- public String getDatasetCode()
- {
- return datasetCode;
- }
-
- public String getDatastoreServerUrl()
- {
- return url;
- }
-
- };
+ return new FeatureVectorDatasetReference(datasetCode, url, null, null);
}
}