From 2f374e0949f54d6f9e6237998d60db250e193986 Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Thu, 28 Jun 2012 09:20:47 +0000
Subject: [PATCH] SP-169 BIS-90 rename the ETL service method listDataSets to
listFileDataSets
SVN: 25914
---
.../ch/systemsx/cisd/openbis/generic/server/ETLService.java | 2 +-
.../cisd/openbis/generic/server/ETLServiceLogger.java | 4 ++--
.../systemsx/cisd/openbis/generic/shared/IETLLIMSService.java | 4 ++--
.../systemsx/cisd/openbis/generic/server/ETLServiceTest.java | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
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 585839c3063..2bae39da85f 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 21731631324..2bc7a16cf0c 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 52313da93b1..e86c61ca79d 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 7f929dd4932..0f6c58b8c86 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());
--
GitLab