diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java index 585839c3063519fdbc981847fc9c7403d9ee5d35..2bae39da85fffd5ab5eccdf7e52e2613d463c1c9 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLService.java @@ -1050,7 +1050,7 @@ public class ETLService extends AbstractCommonServer<IETLLIMSService> implements } @Override - public List<SimpleDataSetInformationDTO> listDataSets(String sessionToken, String dataStoreCode) + public List<SimpleDataSetInformationDTO> listFileDataSets(String sessionToken, String dataStoreCode) throws UserFailureException { List<ExternalData> dataSets = loadDataSets(sessionToken, dataStoreCode); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java index 21731631324f6e0a698aba1463f41861e076a67b..2bc7a16cf0cec6eaf9c4ddcc1493389e99c4decc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceLogger.java @@ -351,10 +351,10 @@ public class ETLServiceLogger extends AbstractServerLogger implements IETLLIMSSe } @Override - public List<SimpleDataSetInformationDTO> listDataSets(String sessionToken, String dataStore) + public List<SimpleDataSetInformationDTO> listFileDataSets(String sessionToken, String dataStore) throws UserFailureException { - logAccess(Level.DEBUG, sessionToken, "listDataSets", "DATA_STORE(%s)", dataStore); + logAccess(Level.DEBUG, sessionToken, "listFileDataSets", "DATA_STORE(%s)", dataStore); return null; } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java index 52313da93b159f3d9431db1acdd93b8a238d9c88..e86c61ca79d5d0fb3e36e570aecbd590cac240b8 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/IETLLIMSService.java @@ -437,11 +437,11 @@ public interface IETLLIMSService extends IServer, ISessionProvider, IConversatio throws UserFailureException; /** - * Lists data sets belonging to chosen data store. + * Lists file-content data sets belonging to chosen data store. */ @Transactional(readOnly = true) @RolesAllowed(RoleWithHierarchy.SPACE_ETL_SERVER) - public List<SimpleDataSetInformationDTO> listDataSets(final String sessionToken, + public List<SimpleDataSetInformationDTO> listFileDataSets(final String sessionToken, String dataStore) throws UserFailureException; /** diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java index 7f929dd4932fe770311af703381a93d82f6eb79a..0f6c58b8c8682e6a70b9df7ae419977ade93a096 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/ETLServiceTest.java @@ -148,7 +148,7 @@ public class ETLServiceTest extends AbstractServerTestCase } @Test - public void testListDataSets() + public void testListFileDataSets() { prepareGetSession(); context.checking(new Expectations() @@ -183,7 +183,7 @@ public class ETLServiceTest extends AbstractServerTestCase }); List<SimpleDataSetInformationDTO> dataSets = - createService().listDataSets(SESSION_TOKEN, DSS_CODE); + createService().listFileDataSets(SESSION_TOKEN, DSS_CODE); assertEquals(DSS_CODE, dataSets.get(0).getDataStoreCode()); assertEquals("my-type", dataSets.get(0).getDataSetType());