diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
index a692871c0115a81069141929a53244f86ad7d96f..4f17a15328316c568b56a457091f07783aec4c80 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTask.java
@@ -127,7 +127,7 @@ public class PathInfoDatabaseFeedingTask implements IMaintenanceTask, IPostRegis
@Override
public void execute()
{
- List<SimpleDataSetInformationDTO> dataSets = service.listDataSets();
+ List<SimpleDataSetInformationDTO> dataSets = service.listPhysicalDataSets();
for (SimpleDataSetInformationDTO dataSet : dataSets)
{
feedPathInfoDatabase(dataSet);
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
index 307077b903bd66fea73033505393f9ad2faec84c..794b63aa02287148929efb67118cfe0b5ff27ebb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdater.java
@@ -207,7 +207,7 @@ public class HierarchicalStorageUpdater implements IDataStoreLockingMaintenanceT
*/
private Map<String, String> convertDataToLinkMappings()
{
- Collection<SimpleDataSetInformationDTO> dataSets = openBISService.listDataSets();
+ Collection<SimpleDataSetInformationDTO> dataSets = openBISService.listPhysicalDataSets();
Map<String, String> linkMappings = new HashMap<String, String>();
for (SimpleDataSetInformationDTO dataSet : dataSets)
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index e852e0a8dbc3a3d7cd998b73bf90d8612d3e9f2b..d73d54dbbf33c2444ad7066e97e362843133e407 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -550,7 +550,7 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer
}
@Override
- public List<SimpleDataSetInformationDTO> listDataSets() throws UserFailureException
+ public List<SimpleDataSetInformationDTO> listPhysicalDataSets() throws UserFailureException
{
List<SimpleDataSetInformationDTO> dataSets =
service.listPhysicalDataSets(session.getSessionToken(), session.getDataStoreCode());
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
index cf1876aca973b0d80355159dc49abce5b3c19be7..0d68c4c159a191c647f07ef5fb087fa0ea198eba 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/IEncapsulatedOpenBISService.java
@@ -252,11 +252,11 @@ public interface IEncapsulatedOpenBISService extends IEncapsulatedBasicOpenBISSe
public List<DataSetShareId> listDataSetShareIds() throws UserFailureException;
/**
- * Returns informations about all phyisical data sets which belong to the calling data store
+ * Returns informations about all physical data sets which belong to the calling data store
* server.
*/
@ManagedAuthentication
- public List<SimpleDataSetInformationDTO> listDataSets() throws UserFailureException;
+ public List<SimpleDataSetInformationDTO> listPhysicalDataSets() throws UserFailureException;
/**
* Returns informations about the <var>chunkSize</var> oldest physical data sets which belong to
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java
index 13de1e7c15a8e0ce214714d747376fe5d2a7f6dc..106dd48fa1bb816041b4be6d75eef822be054fc0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SharesHolder.java
@@ -67,7 +67,7 @@ final class SharesHolder
{
return;
}
- for (SimpleDataSetInformationDTO dataSet : service.listDataSets())
+ for (SimpleDataSetInformationDTO dataSet : service.listPhysicalDataSets())
{
String shareId = dataSet.getDataSetShareId();
if (dataStoreCode.equals(dataSet.getDataStoreCode()))
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
index 725104b6784813e0966e43fb1693589ee0246fba..70d32c85be72fe65b6d110a83c9b9c5a682219f4 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/path/PathInfoDatabaseFeedingTaskTest.java
@@ -121,7 +121,7 @@ public class PathInfoDatabaseFeedingTaskTest extends AbstractFileSystemTestCase
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds1, ds2)));
}
});
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java
index 20f9babc915abe7dc4ece6271a6988dc62eac96e..e0994dc862a0379aa3e5c405f38fc5523d9f8880 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/HierarchicalStorageUpdaterTest.java
@@ -86,7 +86,7 @@ public class HierarchicalStorageUpdaterTest extends AbstractFileSystemTestCase
allowing(beanFactory).getBean("openBIS-service");
will(returnValue(openBISService));
- allowing(openBISService).listDataSets();
+ allowing(openBISService).listPhysicalDataSets();
will(returnValue(listDataSets()));
}
});
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java
index d6c0b850cfd769d8d2b956babddf504672a6c351..c3df5a96906b90d6344eeee8253e4f852a4c5cc6 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SegmentedStoreShufflingTaskTest.java
@@ -167,7 +167,7 @@ public class SegmentedStoreShufflingTaskTest extends AbstractFileSystemTestCase
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
SimpleDataSetInformationDTO ds1 = new SimpleDataSetInformationDTO();
ds1.setDataStoreCode(DATA_STORE_CODE);
ds1.setDataSetCode("ds1");
@@ -191,7 +191,7 @@ public class SegmentedStoreShufflingTaskTest extends AbstractFileSystemTestCase
ds1b.setDataSetShareId("2");
ds1b.setDataSetSize(10l);
ds1b.setDataSetLocation("ds1");
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds1b, ds2)));
inSequence(sequence1);
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java
index 6392f60fd1dc20a332083b40a57313ab42e63993..3888e6235c29f905f6be2fe49024a706f66b0c63 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/plugins/SimpleShufflingTest.java
@@ -221,7 +221,7 @@ public class SimpleShufflingTest extends AbstractFileSystemTestCase
context.checking(new Expectations()
{
{
- allowing(service).listDataSets();
+ allowing(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds1, ds2, ds3, ds4)));
one(logger).log(LogLevel.INFO,
"BEGIN Computing number of data sets to be moved for share 1");
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java
index 9a0805fe93ed335c28973e18a22d09ab61bd4010..4e47baaa7795421394f05e818173da276fb21bd8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/EagerShufflingTaskTest.java
@@ -289,7 +289,7 @@ public class EagerShufflingTaskTest extends AbstractFileSystemTestCase
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(dataSet("1", DATA_SET_CODE1))));
one(logger).log(
with(LogLevel.INFO),
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index e70cf7c8a820b644dc4b521d38dedbb8a1f0e3e7..ef23d87282c6f7c8c7df9db3ad02cbea6d30ce8f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
@@ -462,7 +462,7 @@ public class DssComponentTest extends SystemTestCase
private SimpleDataSetInformationDTO getCodeOfLatestDataSet()
{
IEncapsulatedOpenBISService openBISService = ServiceProvider.getOpenBISService();
- List<SimpleDataSetInformationDTO> dataSets = openBISService.listDataSets();
+ List<SimpleDataSetInformationDTO> dataSets = openBISService.listPhysicalDataSets();
Collections.sort(dataSets, new Comparator<SimpleDataSetInformationDTO>()
{
@Override
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
index 52996876080f6bf4466e2b47891652bce60ea65a..c1ab2165f728015e5eab49adfb3b3eef3e7364a0 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/OpenbisServiceFacadeTest.java
@@ -283,7 +283,7 @@ public class OpenbisServiceFacadeTest extends SystemTestCase
private SimpleDataSetInformationDTO getCodeOfLatestDataSet(String dataSetCode)
{
IEncapsulatedOpenBISService openBISService = ServiceProvider.getOpenBISService();
- List<SimpleDataSetInformationDTO> dataSets = openBISService.listDataSets();
+ List<SimpleDataSetInformationDTO> dataSets = openBISService.listPhysicalDataSets();
for (SimpleDataSetInformationDTO dataSet : dataSets)
{
if (dataSet.getDataSetCode().equals(dataSetCode))
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
index 7107ef85b2ac68e8415a643c6e1568464eeb4c4e..1fe0be177e4395c78c494b6a37781de97550dd4f 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/SegmentedStoreUtilsTest.java
@@ -154,7 +154,7 @@ public class SegmentedStoreUtilsTest extends AbstractFileSystemTestCase
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds1, ds2, ds3, ds4, ds5)));
one(service).updateShareIdAndSize("ds-1", "1", 10L);
diff --git a/eu_basysbio/source/java/eu/basysbio/cisd/dss/PostRegistrationDatabaseUploadTask.java b/eu_basysbio/source/java/eu/basysbio/cisd/dss/PostRegistrationDatabaseUploadTask.java
index 4216de4bfbe9462317e41227cf44e653efd60091..9c7664af94c697bd0d09e9bf03aaf3877d63c0fd 100644
--- a/eu_basysbio/source/java/eu/basysbio/cisd/dss/PostRegistrationDatabaseUploadTask.java
+++ b/eu_basysbio/source/java/eu/basysbio/cisd/dss/PostRegistrationDatabaseUploadTask.java
@@ -94,7 +94,7 @@ public class PostRegistrationDatabaseUploadTask implements IMaintenanceTask
public void execute()
{
Set<String> knownDataSets = getKnownDataSets();
- List<SimpleDataSetInformationDTO> dataSets = service.listDataSets();
+ List<SimpleDataSetInformationDTO> dataSets = service.listPhysicalDataSets();
Collections.sort(dataSets, new Comparator<SimpleDataSetInformationDTO>()
{
@Override
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java
index b836087c85e89c1bec9e850598c01401f7fc4d37..1f2ca5c7a32fdbe6ade2dabb20ffa1003e44d339 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTask.java
@@ -98,7 +98,7 @@ public class ImageSizeFeedingMaintenanceTask implements IDataStoreLockingMainten
@Override
public void execute()
{
- List<SimpleDataSetInformationDTO> dataSets = service.listDataSets();
+ List<SimpleDataSetInformationDTO> dataSets = service.listPhysicalDataSets();
operationLog.info("Scan " + dataSets.size() + " data sets.");
List<String> exceptions = new ArrayList<String>();
Counters<String> counters = new Counters<String>();
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java
index 04c48f4b58eddcd6da6fcc77010e0c5b292d26e9..6ee17be0289dfe5807656876a6197ae273e67ea5 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/ImageSizeFeedingMaintenanceTaskTest.java
@@ -161,7 +161,7 @@ public class ImageSizeFeedingMaintenanceTaskTest extends AssertJUnit
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds0, ds1)));
one(contentProvider).asContent(ds1.getDataSetCode());
@@ -193,7 +193,7 @@ public class ImageSizeFeedingMaintenanceTaskTest extends AssertJUnit
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds1, ds2, ds3)));
}
});
@@ -236,7 +236,7 @@ public class ImageSizeFeedingMaintenanceTaskTest extends AssertJUnit
context.checking(new Expectations()
{
{
- one(service).listDataSets();
+ one(service).listPhysicalDataSets();
will(returnValue(Arrays.asList(ds1, ds2)));
}
});