diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java index 4d6af996843dc132220d52129cdc6bd10e8e268b..097e7c21a05abec0c4cf56bfb96a3fae2833fbd7 100644 --- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/IApplicationServerApi.java @@ -32,6 +32,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; @@ -180,12 +181,12 @@ public interface IApplicationServerApi extends IRpcService public void deleteMaterials(String sessionToken, List<? extends IMaterialId> materialIds, MaterialDeletionOptions deletionOptions); - public List<Deletion> listDeletions(String sessionToken, DeletionFetchOptions fetchOptions); + public List<Deletion> searchDeletions(String sessionToken, DeletionSearchCriteria searchCriteria, DeletionFetchOptions fetchOptions); public void revertDeletions(String sessionToken, List<? extends IDeletionId> deletionIds); public void confirmDeletions(String sessionToken, List<? extends IDeletionId> deletionIds); - + public Serializable executeService(String sessionToken, IServiceId serviceId, ExecutionOptions options); } diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java new file mode 100644 index 0000000000000000000000000000000000000000..8bc4e773ba186143758c24bee5844bfe21792080 --- /dev/null +++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/asapi/v3/dto/deletion/search/DeletionSearchCriteria.java @@ -0,0 +1,40 @@ +/* + * Copyright 2016 ETH Zuerich, CISD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.search; + +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.AbstractObjectSearchCriteria; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder; +import ch.ethz.sis.openbis.generic.asapi.v3.dto.deletion.id.IDeletionId; +import ch.systemsx.cisd.base.annotation.JsonObject; + +/** + * @author Jakub Straszewski + */ +@JsonObject("dto.deletion.search.DeletionSearchCriteria") +public class DeletionSearchCriteria extends AbstractObjectSearchCriteria<IDeletionId> +{ + + private static final long serialVersionUID = 1L; + + @Override + protected SearchCriteriaToStringBuilder createBuilder() + { + SearchCriteriaToStringBuilder builder = super.createBuilder(); + builder.setName("DELETION"); + return builder; + } +}