diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java index 7d6df1e67f4250853fb256c1295d0d5fda8d5ba0..d93e24f9581053049312eec74e58b6b9f6cff34f 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApi.java @@ -37,6 +37,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.delete.ExperimentDeletionOptions; @@ -99,7 +100,6 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IDeleteProjec import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IDeleteSampleMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IDeleteSpaceMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IExecuteServiceMethodExecutor; -import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IListDeletionMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IMapDataSetMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IMapExperimentMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IMapMaterialMethodExecutor; @@ -108,6 +108,7 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IMapSampleMet import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IMapSpaceMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.IRevertDeletionMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.ISearchDataSetMethodExecutor; +import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.ISearchDeletionMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.ISearchExperimentMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.ISearchMaterialMethodExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.method.ISearchObjectKindModificationMethodExecutor; @@ -246,7 +247,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi> private IDeleteMaterialMethodExecutor deleteMaterialExecutor; @Autowired - private IListDeletionMethodExecutor listDeletionExecutor; + private ISearchDeletionMethodExecutor searchDeletionExecutor; @Autowired private IRevertDeletionMethodExecutor revertDeletionExecutor; @@ -583,9 +584,9 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi> @Override @Transactional(readOnly = true) @RolesAllowed({ RoleWithHierarchy.SPACE_USER, RoleWithHierarchy.SPACE_ETL_SERVER }) - public List<Deletion> listDeletions(String sessionToken, DeletionFetchOptions fetchOptions) + public List<Deletion> searchDeletions(String sessionToken, DeletionSearchCriteria searchCriteria, DeletionFetchOptions fetchOptions) { - return listDeletionExecutor.listDeletions(sessionToken, fetchOptions); + return searchDeletionExecutor.searchDeletions(sessionToken, searchCriteria, fetchOptions); } @Override diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java index 200aab5c2982c9233f7dfb259b6dbfa6837dfdb8..0bec844ae967602e1be61c6a7f90ca17c40595ef 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java @@ -33,6 +33,7 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.update.DataSetUpdate; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.delete.ExperimentDeletionOptions; @@ -333,9 +334,9 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements } @Override - public List<Deletion> listDeletions(String sessionToken, DeletionFetchOptions fetchOptions) + public List<Deletion> searchDeletions(String sessionToken, DeletionSearchCriteria searchCriteria, DeletionFetchOptions fetchOptions) { - logAccess(sessionToken, "list-deletions", "FETCH_OPTIONS(%s)", fetchOptions); + logAccess(sessionToken, "search-deletions", "SEARCH_CRITERIA:\n%s\nFETCH_OPTIONS:\n%s\n", searchCriteria, fetchOptions); return null; } diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IListDeletionExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.java similarity index 79% rename from openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IListDeletionExecutor.java rename to openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.java index 5be7e9108d85915ec7eb56972de2e688a8768f95..cb0b7aa2d5ba56c699afc95b76d5d056b6311fa2 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/IListDeletionExecutor.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ISearchDeletionExecutor.java @@ -19,15 +19,16 @@ package ch.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion; import java.util.List; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion; /** * @author pkupczyk */ -public interface IListDeletionExecutor +public interface ISearchDeletionExecutor { - public List<Deletion> list(IOperationContext context, DeletionFetchOptions fetchOptions); + public List<Deletion> search(IOperationContext context, DeletionSearchCriteria criteria, DeletionFetchOptions fetchOptions); } diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ListDeletionExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.java similarity index 91% rename from openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ListDeletionExecutor.java rename to openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.java index a9fc448af701c12478672b3303fcfc1f3d7aa684..5643a3f1863c466ff4d032d8833462a98c535f1c 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/ListDeletionExecutor.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/deletion/SearchDeletionExecutor.java @@ -25,6 +25,7 @@ import javax.annotation.Resource; import org.springframework.stereotype.Component; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext; import ch.systemsx.cisd.openbis.generic.server.ComponentNames; import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory; @@ -35,14 +36,14 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion; * @author pkupczyk */ @Component -public class ListDeletionExecutor implements IListDeletionExecutor +public class SearchDeletionExecutor implements ISearchDeletionExecutor { @Resource(name = ComponentNames.COMMON_BUSINESS_OBJECT_FACTORY) ICommonBusinessObjectFactory businessObjectFactory; @Override - public List<Deletion> list(IOperationContext context, DeletionFetchOptions fetchOptions) + public List<Deletion> search(IOperationContext context, DeletionSearchCriteria criteria, DeletionFetchOptions fetchOptions) { if (context == null) { diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/IListDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ISearchDeletionMethodExecutor.java similarity index 76% rename from openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/IListDeletionMethodExecutor.java rename to openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ISearchDeletionMethodExecutor.java index f4a9eaac307122a09fa520cd13e60d31b26e6455..e26d95e024dd5a75ecb2ca9b34a80b3c6524cf3d 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/IListDeletionMethodExecutor.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ISearchDeletionMethodExecutor.java @@ -20,13 +20,14 @@ import java.util.List; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; /** * @author pkupczyk */ -public interface IListDeletionMethodExecutor +public interface ISearchDeletionMethodExecutor { - public List<Deletion> listDeletions(String sessionToken, DeletionFetchOptions fetchOptions); + public List<Deletion> searchDeletions(String sessionToken, DeletionSearchCriteria criteria, DeletionFetchOptions fetchOptions); } diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ListDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/SearchDeletionMethodExecutor.java similarity index 80% rename from openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ListDeletionMethodExecutor.java rename to openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/SearchDeletionMethodExecutor.java index f20c376020d6b7839b48998c5c7318e5819de0a3..c9289a7140b2dc57f13a1c41b9e8ba857cb68cf5 100644 --- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/ListDeletionMethodExecutor.java +++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/method/SearchDeletionMethodExecutor.java @@ -25,8 +25,9 @@ import org.springframework.stereotype.Component; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.IOperationContext; -import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion.IListDeletionExecutor; +import ch.ethz.sis.openbis.generic.server.asapi.v3.executor.deletion.ISearchDeletionExecutor; import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.TranslationContext; import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.entity.deletion.IDeletionTranslator; @@ -34,24 +35,24 @@ import ch.ethz.sis.openbis.generic.server.asapi.v3.translator.entity.deletion.ID * @author pkupczyk */ @Component -public class ListDeletionMethodExecutor extends AbstractMethodExecutor implements IListDeletionMethodExecutor +public class SearchDeletionMethodExecutor extends AbstractMethodExecutor implements ISearchDeletionMethodExecutor { @Autowired - private IListDeletionExecutor listExecutor; + private ISearchDeletionExecutor searchExecutor; @Autowired private IDeletionTranslator translator; @Override - public List<Deletion> listDeletions(final String sessionToken, final DeletionFetchOptions fetchOptions) + public List<Deletion> searchDeletions(final String sessionToken, final DeletionSearchCriteria criteria, final DeletionFetchOptions fetchOptions) { return executeInContext(sessionToken, new IMethodAction<List<Deletion>>() { @Override public List<Deletion> execute(IOperationContext context) { - List<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion> deletions = listExecutor.list(context, fetchOptions); + List<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion> deletions = searchExecutor.search(context, criteria, fetchOptions); Map<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion, Deletion> translatedMap = translator.translate(new TranslationContext(context.getSession()), deletions, fetchOptions); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/search/DeletionSearchOptions.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/search/DeletionSearchOptions.js new file mode 100644 index 0000000000000000000000000000000000000000..94edbb1a09eaa923db183481be420bace9377163 --- /dev/null +++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/dto/deletion/search/DeletionSearchOptions.js @@ -0,0 +1,22 @@ +define([ "require", "stjs", "dto/common/search/AbstractObjectSearchCriteria"], + function(require, stjs, AbstractObjectSearchCriteria) { + var ServiceSearchCriteria = function() { + AbstractObjectSearchCriteria.call(this); + }; + stjs.extend(DeletionSearchCriteria, AbstractObjectSearchCriteria, [ AbstractObjectSearchCriteria ], function(constructor, prototype) { + prototype['@type'] = 'dto.deletion.search.DeletionSearchCriteria'; + constructor.serialVersionUID = 1; + prototype.createBuilder = function() { + var AbstractCompositeSearchCriteria = require("dto/common/search/AbstractCompositeSearchCriteria"); + var builder = AbstractCompositeSearchCriteria.prototype.createBuilder.call(this); + builder.setName("DELETION"); + return builder; + }; + }, { + criteria : { + name : "Collection", + arguments : [ "ISearchCriteria" ] + } + }); + return ServiceSearchCriteria; +}) \ No newline at end of file diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js index 406e2fe3d548bb57a102cb93ef3d3d6d93717a2e..9839e9202a6f3d69fa1e89653a6f4c812a9bab83 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js +++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/openbis.js @@ -527,13 +527,13 @@ define([ 'jquery', 'util/Json' ], function($, stjsUtil) { }); } - this.listDeletions = function(fetchOptions) { + this.searchDeletions = function(criteria, fetchOptions) { var thisFacade = this; return thisFacade._private.ajaxRequest({ url : openbisUrl, data : { - "method" : "listDeletions", - "params" : [ thisFacade._private.sessionToken, fetchOptions ] + "method" : "searchDeletions", + "params" : [ thisFacade._private.sessionToken, criteria, fetchOptions ] }, returnType : { name : "List", diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java index 3c333aeaeb45fc3550a249ae6f9f651559e3e9a4..933ac482a095a9bbca541e8ee43b44ce2face5a1 100644 --- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java +++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/AbstractDeletionTest.java @@ -21,12 +21,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import junit.framework.Assert; - import ch.ethz.sis.openbis.generic.asapi.v3.dto.dataset.id.DataSetPermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.entitytype.id.EntityTypePermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.Experiment; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.create.ExperimentCreation; @@ -49,6 +48,8 @@ import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.ISampleId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.space.id.SpacePermId; +import junit.framework.Assert; + /** * @author pkupczyk */ @@ -219,7 +220,7 @@ public class AbstractDeletionTest extends AbstractTest private void assertDeletionExists(IDeletionId deletionId, boolean exists) { String sessionToken = v3api.login(TEST_USER, PASSWORD); - List<Deletion> result = v3api.listDeletions(sessionToken, new DeletionFetchOptions()); + List<Deletion> result = v3api.searchDeletions(sessionToken, new DeletionSearchCriteria(), new DeletionFetchOptions()); Deletion found = null; for (Deletion item : result) diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ListDeletionTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.java similarity index 80% rename from openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ListDeletionTest.java rename to openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.java index 9bef98056801aa63b0651cf4e6494dbaa7dc5173..94efc59c48c17b65a2482a66f2266e38b68c037d 100644 --- a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/ListDeletionTest.java +++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDeletionTest.java @@ -19,31 +19,32 @@ package ch.ethz.sis.openbis.systemtest.asapi.v3; import java.util.Collections; import java.util.List; -import junit.framework.Assert; - import org.testng.annotations.Test; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.Deletion; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.fetchoptions.DeletionFetchOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search.DeletionSearchCriteria; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.delete.ExperimentDeletionOptions; import ch.ethz.sis.openbis.generic.asapi.v3.dto.experiment.id.ExperimentPermId; import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.id.SamplePermId; import ch.ethz.sis.openbis.generic.asapi.v3.exceptions.NotFetchedException; +import junit.framework.Assert; + /** * @author pkupczyk */ -public class ListDeletionTest extends AbstractDeletionTest +public class SearchDeletionTest extends AbstractDeletionTest { @Test - public void testListDeletionsWithoutDeletedObjects() + public void testSearchDeletionsWithoutDeletedObjects() { String sessionToken = v3api.login(TEST_USER, PASSWORD); DeletionFetchOptions fetchOptions = new DeletionFetchOptions(); - List<Deletion> beforeDeletions = v3api.listDeletions(sessionToken, fetchOptions); + List<Deletion> beforeDeletions = v3api.searchDeletions(sessionToken, new DeletionSearchCriteria(), fetchOptions); ExperimentPermId experimentId = createCisdExperiment(); SamplePermId sampleId = createCisdSample(experimentId); @@ -55,7 +56,7 @@ public class ListDeletionTest extends AbstractDeletionTest assertExperimentDoesNotExist(experimentId); assertSampleDoesNotExist(sampleId); - List<Deletion> afterDeletions = v3api.listDeletions(sessionToken, fetchOptions); + List<Deletion> afterDeletions = v3api.searchDeletions(sessionToken, new DeletionSearchCriteria(), fetchOptions); Assert.assertEquals(beforeDeletions.size() + 1, afterDeletions.size()); Deletion latestDeletion = afterDeletions.get(afterDeletions.size() - 1); Assert.assertEquals(deletionId, latestDeletion.getId()); @@ -71,13 +72,13 @@ public class ListDeletionTest extends AbstractDeletionTest } @Test - public void testListDeletionsWithDeletedObjects() + public void testSearchDeletionsWithDeletedObjects() { String sessionToken = v3api.login(TEST_USER, PASSWORD); DeletionFetchOptions fetchOptions = new DeletionFetchOptions(); fetchOptions.withDeletedObjects(); - List<Deletion> beforeDeletions = v3api.listDeletions(sessionToken, fetchOptions); + List<Deletion> beforeDeletions = v3api.searchDeletions(sessionToken, new DeletionSearchCriteria(), fetchOptions); ExperimentPermId experimentId = createCisdExperiment(); SamplePermId sampleId = createCisdSample(experimentId); @@ -93,7 +94,7 @@ public class ListDeletionTest extends AbstractDeletionTest assertExperimentDoesNotExist(experimentId); assertSampleDoesNotExist(sampleId); - List<Deletion> afterDeletions = v3api.listDeletions(sessionToken, fetchOptions); + List<Deletion> afterDeletions = v3api.searchDeletions(sessionToken, new DeletionSearchCriteria(), fetchOptions); Assert.assertEquals(beforeDeletions.size() + 1, afterDeletions.size()); Deletion latestDeletion = afterDeletions.get(afterDeletions.size() - 1); Assert.assertEquals(deletionId, latestDeletion.getId()); @@ -103,12 +104,12 @@ public class ListDeletionTest extends AbstractDeletionTest } @Test - public void testListDeletionsWithUnauthorizedDeletion() + public void testSearchDeletionsWithUnauthorizedDeletion() { String spaceSessionToken = v3api.login(TEST_SPACE_USER, PASSWORD); DeletionFetchOptions fetchOptions = new DeletionFetchOptions(); - List<Deletion> beforeDeletions = v3api.listDeletions(spaceSessionToken, fetchOptions); + List<Deletion> beforeDeletions = v3api.searchDeletions(spaceSessionToken, new DeletionSearchCriteria(), fetchOptions); String adminSessionToken = v3api.login(TEST_USER, PASSWORD); @@ -119,7 +120,7 @@ public class ListDeletionTest extends AbstractDeletionTest assertExperimentDoesNotExist(experimentId); - List<Deletion> afterDeletions = v3api.listDeletions(spaceSessionToken, fetchOptions); + List<Deletion> afterDeletions = v3api.searchDeletions(spaceSessionToken, new DeletionSearchCriteria(), fetchOptions); Assert.assertEquals(beforeDeletions.size(), afterDeletions.size()); }