diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApi.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApi.java
index 4f09cc2509f10df6585a70a8e657f9a788828e69..716722c6a20b1b3f60c89b998b36c16e62f4981d 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApi.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApi.java
@@ -46,6 +46,7 @@ import ch.ethz.sis.openbis.generic.server.api.v3.executor.sample.IMapSampleByIdE
import ch.ethz.sis.openbis.generic.server.api.v3.executor.sample.ISearchSampleExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.sample.IUpdateSampleExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.space.ICreateSpaceExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.space.IDeleteSpaceExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.space.IMapSpaceByIdExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.space.IUpdateSpaceExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.TranslationContext;
@@ -63,6 +64,7 @@ import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.Deletion;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.dataset.DataSetDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.experiment.ExperimentDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.sample.SampleDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.space.SpaceDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSet;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSetUpdate;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
@@ -176,6 +178,9 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Autowired
private ISearchDataSetExecutor searchDataSetExecutor;
+ @Autowired
+ private IDeleteSpaceExecutor deleteSpaceExecutor;
+
@Autowired
private IDeleteExperimentExecutor deleteExperimentExecutor;
@@ -525,6 +530,25 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
}
}
+ @Override
+ @Transactional
+ @DatabaseCreateOrDeleteModification(value = { ObjectKind.SPACE, ObjectKind.DELETION })
+ @RolesAllowed({ RoleWithHierarchy.SPACE_ADMIN, RoleWithHierarchy.SPACE_ETL_SERVER })
+ @Capability("DELETE_SPACE")
+ public void deleteSpaces(String sessionToken, List<? extends ISpaceId> spaceIds, SpaceDeletionOptions deletionOptions)
+ {
+ Session session = getSession(sessionToken);
+ OperationContext context = new OperationContext(session);
+
+ try
+ {
+ deleteSpaceExecutor.delete(context, spaceIds, deletionOptions);
+ } catch (Throwable t)
+ {
+ throw ExceptionUtils.create(context, t);
+ }
+ }
+
@Override
@Transactional
@DatabaseCreateOrDeleteModification(value = { ObjectKind.EXPERIMENT, ObjectKind.DELETION })
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApiLogger.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApiLogger.java
index f63ff44310b71fb0afd819c01239b7c916d93f5d..e381d13bf864e6b91313f790909883e8cc4d4f64 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApiLogger.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/ApplicationServerApiLogger.java
@@ -24,6 +24,7 @@ import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.Deletion;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.dataset.DataSetDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.experiment.ExperimentDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.sample.SampleDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.space.SpaceDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSet;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSetUpdate;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
@@ -207,6 +208,12 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements
return null;
}
+ @Override
+ public void deleteSpaces(String sessionToken, List<? extends ISpaceId> spaceIds, SpaceDeletionOptions deletionOptions)
+ {
+ logAccess(sessionToken, "delete-spaces", "SPACE_IDS(%s) DELETION_OPTIONS(%s)", spaceIds, deletionOptions);
+ }
+
@Override
public IDeletionId deleteExperiments(String sessionToken, List<? extends IExperimentId> experimentIds, ExperimentDeletionOptions deletionOptions)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/space/DeleteSpaceExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/space/DeleteSpaceExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a63141bbfa3ef6a8e14e16ce7c62122baa330d4
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/space/DeleteSpaceExecutor.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2014 ETH Zuerich, Scientific IT Services
+ *
+ * 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.server.api.v3.executor.space;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.space.SpaceDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.space.ISpaceId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.exceptions.UnauthorizedObjectAccessException;
+import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
+import ch.systemsx.cisd.openbis.generic.server.authorization.validator.SimpleSpaceValidator;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.ICommonBusinessObjectFactory;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.ISpaceBO;
+import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
+import ch.systemsx.cisd.openbis.generic.shared.dto.SpacePE;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class DeleteSpaceExecutor implements IDeleteSpaceExecutor
+{
+
+ @Resource(name = ComponentNames.COMMON_BUSINESS_OBJECT_FACTORY)
+ ICommonBusinessObjectFactory businessObjectFactory;
+
+ @Autowired
+ IMapSpaceByIdExecutor mapSpaceByIdExecutor;
+
+ @Override
+ public void delete(IOperationContext context, List<? extends ISpaceId> spaceIds, SpaceDeletionOptions deletionOptions)
+ {
+ if (context == null)
+ {
+ throw new IllegalArgumentException("Context cannot be null");
+ }
+ if (spaceIds == null)
+ {
+ throw new IllegalArgumentException("Space ids cannot be null");
+ }
+ if (deletionOptions == null)
+ {
+ throw new IllegalArgumentException("Deletion options cannot be null");
+ }
+ if (deletionOptions.getReason() == null)
+ {
+ throw new IllegalArgumentException("Deletion reason cannot be null");
+ }
+
+ ISpaceBO spaceBO = businessObjectFactory.createSpaceBO(context.getSession());
+ Map<ISpaceId, SpacePE> spaceMap = mapSpaceByIdExecutor.map(context, spaceIds);
+
+ for (Map.Entry<ISpaceId, SpacePE> entry : spaceMap.entrySet())
+ {
+ ISpaceId spaceId = entry.getKey();
+ SpacePE space = entry.getValue();
+
+ if (false == new SimpleSpaceValidator().doValidation(context.getSession().tryGetPerson(), space))
+ {
+ throw new UnauthorizedObjectAccessException(spaceId);
+ }
+
+ spaceBO.deleteByTechId(new TechId(space.getId()), deletionOptions.getReason());
+ }
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/space/IDeleteSpaceExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/space/IDeleteSpaceExecutor.java
new file mode 100644
index 0000000000000000000000000000000000000000..384d2903697ad68454aa92d342fcaa1664a5c526
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/space/IDeleteSpaceExecutor.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 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.server.api.v3.executor.space;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.space.SpaceDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.space.ISpaceId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteSpaceExecutor
+{
+
+ public void delete(IOperationContext context, List<? extends ISpaceId> spaceIds, SpaceDeletionOptions deletionOptions);
+
+}
diff --git a/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/DeleteSpaceTest.java b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/DeleteSpaceTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..36ccb4a3fbab6972f5a9cf0a4b8cd231e77f78ea
--- /dev/null
+++ b/openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/api/v3/DeleteSpaceTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2015 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.systemtest.api.v3;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.testng.annotations.Test;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.space.SpaceDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.space.Space;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.space.SpaceCreation;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.space.SpaceFetchOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.space.ISpaceId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.space.SpacePermId;
+import ch.systemsx.cisd.common.action.IDelegatedAction;
+
+/**
+ * @author pkupczyk
+ */
+public class DeleteSpaceTest extends AbstractDeletionTest
+{
+
+ @Test
+ public void testDeleteEmptySpace()
+ {
+ String sessionToken = v3api.login(TEST_USER, PASSWORD);
+
+ SpaceCreation creation = new SpaceCreation();
+ creation.setCode("SPACE_TO_DELETE");
+
+ List<SpacePermId> permIds = v3api.createSpaces(sessionToken, Arrays.asList(creation));
+
+ Map<ISpaceId, Space> map = v3api.mapSpaces(sessionToken, permIds, new SpaceFetchOptions());
+ assertEquals(map.size(), 1);
+
+ SpaceDeletionOptions options = new SpaceDeletionOptions();
+ options.setReason("It is just a test");
+
+ v3api.deleteSpaces(sessionToken, permIds, options);
+
+ map = v3api.mapSpaces(sessionToken, permIds, new SpaceFetchOptions());
+ assertEquals(map.size(), 0);
+ }
+
+ @Test
+ public void testDeleteNotEmptySpace()
+ {
+ final String sessionToken = v3api.login(TEST_USER, PASSWORD);
+
+ final SpaceDeletionOptions options = new SpaceDeletionOptions();
+ options.setReason("It is just a test");
+
+ assertUserFailureException(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ v3api.deleteSpaces(sessionToken, Arrays.asList(new SpacePermId("CISD")), options);
+ }
+ }, "Space 'CISD' is being used. Delete all connected data first.");
+ }
+
+ @Test
+ public void testDeleteUnauthorizedSpace()
+ {
+ String adminSessionToken = v3api.login(TEST_USER, PASSWORD);
+
+ SpaceCreation creation = new SpaceCreation();
+ creation.setCode("SPACE_TO_DELETE");
+
+ final List<SpacePermId> permIds = v3api.createSpaces(adminSessionToken, Arrays.asList(creation));
+
+ Map<ISpaceId, Space> map = v3api.mapSpaces(adminSessionToken, permIds, new SpaceFetchOptions());
+ assertEquals(map.size(), 1);
+
+ final String sessionToken = v3api.login(TEST_SPACE_USER, PASSWORD);
+
+ final SpaceDeletionOptions options = new SpaceDeletionOptions();
+ options.setReason("It is just a test");
+
+ assertUnauthorizedObjectAccessException(new IDelegatedAction()
+ {
+ @Override
+ public void execute()
+ {
+ v3api.deleteSpaces(sessionToken, permIds, options);
+ }
+ }, permIds.get(0));
+ }
+
+}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/IApplicationServerApi.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/IApplicationServerApi.java
index f52a293b8958dcf6a16af03676ca904a12280f17..2471fc819fff5312a3420c8a85549f08db8eec66 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/IApplicationServerApi.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/IApplicationServerApi.java
@@ -23,6 +23,7 @@ import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.Deletion;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.dataset.DataSetDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.experiment.ExperimentDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.sample.SampleDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.space.SpaceDeletionOptions;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSet;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.dataset.DataSetUpdate;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.experiment.Experiment;
@@ -168,6 +169,8 @@ public interface IApplicationServerApi extends IRpcService
public List<DataSet> searchDataSets(String sessionToken, DataSetSearchCriterion searchCriterion, DataSetFetchOptions fetchOptions);
+ public void deleteSpaces(String sessionToken, List<? extends ISpaceId> spaceIds, SpaceDeletionOptions deletionOptions);
+
// REPLACES:
// - IGeneralInformationChangingService.deleteExperiments(List<Long>, String, DeletionType)
public IDeletionId deleteExperiments(String sessionToken, List<? extends IExperimentId> experimentIds, ExperimentDeletionOptions deletionOptions);
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/deletion/space/SpaceDeletionOptions.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/deletion/space/SpaceDeletionOptions.java
new file mode 100644
index 0000000000000000000000000000000000000000..579f7fde331b578f5555178531ba63b87d9cffa5
--- /dev/null
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/deletion/space/SpaceDeletionOptions.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 ETH Zuerich, Scientific IT Services
+ *
+ * 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.shared.api.v3.dto.deletion.space;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.AbstractObjectDeletionOptions;
+import ch.systemsx.cisd.base.annotation.JsonObject;
+
+/**
+ * @author pkupczyk
+ */
+@JsonObject("dto.deletion.space.SpaceDeletionOptions")
+public class SpaceDeletionOptions extends AbstractObjectDeletionOptions
+{
+
+ private static final long serialVersionUID = 1L;
+
+}