SP-169 BIS-90 rename the ETL service method listDataSets to listFileDataSets

SVN: 25914

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);

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;
     }
 

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;
 
     /**

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());