From a4b4f6fa5dd9f057da2cf303579d92a618f86da5 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Wed, 8 Apr 2015 07:27:02 +0000
Subject: [PATCH] V3 API refactoring: - move logic of remaining
ApplicationServerApi methods into method executors - move common logic of all
method executors into AbstractMethodExecutor
SVN: 33802
---
.../server/api/v3/ApplicationServerApi.java | 157 ++++--------------
.../method/AbstractCreateMethodExecutor.java | 37 ++---
.../method/AbstractDeleteMethodExecutor.java | 46 +++++
.../method/AbstractMapMethodExecutor.java | 35 ++--
.../method/AbstractMethodExecutor.java | 36 +++-
.../method/AbstractSearchMethodExecutor.java | 35 ++--
.../method/AbstractUpdateMethodExecutor.java | 36 ++--
.../method/ConfirmDeletionMethodExecutor.java | 52 ++++++
.../method/DeleteDataSetMethodExecutor.java | 45 +++++
.../DeleteExperimentMethodExecutor.java | 45 +++++
.../method/DeleteMaterialMethodExecutor.java | 44 +++++
.../method/DeleteProjectMethodExecutor.java | 44 +++++
.../method/DeleteSampleMethodExecutor.java | 45 +++++
.../method/DeleteSpaceMethodExecutor.java | 44 +++++
.../IConfirmDeletionMethodExecutor.java | 31 ++++
.../method/IDeleteDataSetMethodExecutor.java | 29 ++++
.../IDeleteExperimentMethodExecutor.java | 29 ++++
.../method/IDeleteMaterialMethodExecutor.java | 28 ++++
.../method/IDeleteMethodExecutor.java | 29 ++++
.../method/IDeleteProjectMethodExecutor.java | 28 ++++
.../method/IDeleteSampleMethodExecutor.java | 29 ++++
.../method/IDeleteSpaceMethodExecutor.java | 28 ++++
.../method/IRevertDeletionMethodExecutor.java | 31 ++++
.../method/ListDeletionMethodExecutor.java | 29 ++--
.../method/RevertDeletionMethodExecutor.java | 52 ++++++
25 files changed, 810 insertions(+), 234 deletions(-)
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractDeleteMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ConfirmDeletionMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteDataSetMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteExperimentMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteMaterialMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteProjectMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSampleMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSpaceMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IConfirmDeletionMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteDataSetMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteExperimentMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMaterialMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteProjectMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSampleMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSpaceMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IRevertDeletionMethodExecutor.java
create mode 100644 openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/RevertDeletionMethodExecutor.java
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 71d25594d47..8a9928e4486 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
@@ -23,17 +23,18 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.dataset.IDeleteDataSetExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.deletion.IConfirmDeletionExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.deletion.IRevertDeletionExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.experiment.IDeleteExperimentExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.material.IDeleteMaterialExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IConfirmDeletionMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ICreateExperimentMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ICreateMaterialMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ICreateProjectMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ICreateSampleMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ICreateSpaceMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IDeleteDataSetMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IDeleteExperimentMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IDeleteMaterialMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IDeleteProjectMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IDeleteSampleMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IDeleteSpaceMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IListDeletionMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IMapDataSetMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IMapExperimentMethodExecutor;
@@ -41,6 +42,7 @@ import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IMapMaterialMet
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IMapProjectMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IMapSampleMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IMapSpaceMethodExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IRevertDeletionMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ISearchDataSetMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ISearchExperimentMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.ISearchMaterialMethodExecutor;
@@ -53,10 +55,6 @@ import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IUpdateMaterial
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IUpdateProjectMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IUpdateSampleMethodExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.method.IUpdateSpaceMethodExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.project.IDeleteProjectExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.sample.IDeleteSampleExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.space.IDeleteSpaceExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
import ch.ethz.sis.openbis.generic.shared.api.v3.IApplicationServerApi;
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;
@@ -120,7 +118,6 @@ import ch.systemsx.cisd.openbis.generic.shared.DatabaseUpdateModification;
import ch.systemsx.cisd.openbis.generic.shared.IOpenBisSessionManager;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
-import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
import ch.systemsx.cisd.openbis.generic.shared.managed_property.IManagedPropertyEvaluatorFactory;
@@ -201,31 +198,31 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
private ISearchMaterialMethodExecutor searchMaterialExecutor;
@Autowired
- private IDeleteSpaceExecutor deleteSpaceExecutor;
+ private IDeleteSpaceMethodExecutor deleteSpaceExecutor;
@Autowired
- private IDeleteProjectExecutor deleteProjectExecutor;
+ private IDeleteProjectMethodExecutor deleteProjectExecutor;
@Autowired
- private IDeleteExperimentExecutor deleteExperimentExecutor;
+ private IDeleteExperimentMethodExecutor deleteExperimentExecutor;
@Autowired
- private IDeleteSampleExecutor deleteSampleExecutor;
+ private IDeleteSampleMethodExecutor deleteSampleExecutor;
@Autowired
- private IDeleteDataSetExecutor deleteDataSetExecutor;
+ private IDeleteDataSetMethodExecutor deleteDataSetExecutor;
@Autowired
- private IDeleteMaterialExecutor deleteMaterialExecutor;
+ private IDeleteMaterialMethodExecutor deleteMaterialExecutor;
@Autowired
private IListDeletionMethodExecutor listDeletionExecutor;
@Autowired
- private IRevertDeletionExecutor revertDeletionExecutor;
+ private IRevertDeletionMethodExecutor revertDeletionExecutor;
@Autowired
- private IConfirmDeletionExecutor confirmDeletionExecutor;
+ private IConfirmDeletionMethodExecutor confirmDeletionExecutor;
// Default constructor needed by Spring
public ApplicationServerApi()
@@ -476,16 +473,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@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);
- }
+ deleteSpaceExecutor.delete(sessionToken, spaceIds, deletionOptions);
}
@Override
@@ -495,16 +483,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Capability("DELETE_PROJECT")
public void deleteProjects(String sessionToken, List<? extends IProjectId> projectIds, ProjectDeletionOptions deletionOptions)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
-
- try
- {
- deleteProjectExecutor.delete(context, projectIds, deletionOptions);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- }
+ deleteProjectExecutor.delete(sessionToken, projectIds, deletionOptions);
}
@Override
@@ -514,20 +493,17 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Capability("DELETE_EXPERIMENT")
public IDeletionId deleteExperiments(String sessionToken, List<? extends IExperimentId> experimentIds, ExperimentDeletionOptions deletionOptions)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
+ return deleteExperimentExecutor.delete(sessionToken, experimentIds, deletionOptions);
+ }
- try
- {
- return deleteExperimentExecutor.delete(context, experimentIds, deletionOptions);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- // the clear is necessary, as deleting experiments involves sql queries, that are not visible to cached PE objects
- getDAOFactory().getSessionFactory().getCurrentSession().clear();
- }
+ @Override
+ @Transactional
+ @DatabaseCreateOrDeleteModification(value = { ObjectKind.SAMPLE, ObjectKind.DELETION })
+ @RolesAllowed({ RoleWithHierarchy.SPACE_POWER_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
+ @Capability("DELETE_SAMPLE")
+ public IDeletionId deleteSamples(String sessionToken, List<? extends ISampleId> sampleIds, SampleDeletionOptions deletionOptions)
+ {
+ return deleteSampleExecutor.delete(sessionToken, sampleIds, deletionOptions);
}
@Override
@@ -537,18 +513,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Capability("DELETE_DATA_SET")
public IDeletionId deleteDataSets(String sessionToken, List<? extends IDataSetId> dataSetIds, DataSetDeletionOptions deletionOptions)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
- try
- {
- return deleteDataSetExecutor.delete(context, dataSetIds, deletionOptions);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- getDAOFactory().getSessionFactory().getCurrentSession().clear();
- }
+ return deleteDataSetExecutor.delete(sessionToken, dataSetIds, deletionOptions);
}
@Override
@@ -558,41 +523,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Capability("DELETE_MATERIAL")
public void deleteMaterials(String sessionToken, List<? extends IMaterialId> materialIds, MaterialDeletionOptions deletionOptions)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
- try
- {
- deleteMaterialExecutor.delete(context, materialIds, deletionOptions);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- getDAOFactory().getSessionFactory().getCurrentSession().clear();
- }
- }
-
- @Override
- @Transactional
- @DatabaseCreateOrDeleteModification(value = { ObjectKind.SAMPLE, ObjectKind.DELETION })
- @RolesAllowed({ RoleWithHierarchy.SPACE_POWER_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
- @Capability("DELETE_SAMPLE")
- public IDeletionId deleteSamples(String sessionToken, List<? extends ISampleId> sampleIds, SampleDeletionOptions deletionOptions)
- {
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
-
- try
- {
- return deleteSampleExecutor.delete(context, sampleIds, deletionOptions);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- // the clear is necessary, as deleting samples involves sql queries, that are not visible to cached PE objects
- getDAOFactory().getSessionFactory().getCurrentSession().clear();
- }
+ deleteMaterialExecutor.delete(sessionToken, materialIds, deletionOptions);
}
@Override
@@ -611,19 +542,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Capability("RESTORE")
public void revertDeletions(String sessionToken, List<? extends IDeletionId> deletionIds)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
-
- try
- {
- revertDeletionExecutor.revert(context, deletionIds);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- getDAOFactory().getSessionFactory().getCurrentSession().clear();
- }
+ revertDeletionExecutor.revert(sessionToken, deletionIds);
}
@Override
@@ -633,19 +552,7 @@ public class ApplicationServerApi extends AbstractServer<IApplicationServerApi>
@Capability("PURGE")
public void confirmDeletions(String sessionToken, List<? extends IDeletionId> deletionIds)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
-
- try
- {
- confirmDeletionExecutor.confirm(context, deletionIds);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- getDAOFactory().getSessionFactory().getCurrentSession().clear();
- }
+ confirmDeletionExecutor.confirm(sessionToken, deletionIds);
}
@Override
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractCreateMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractCreateMethodExecutor.java
index 949abb5bc97..af8afab741e 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractCreateMethodExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractCreateMethodExecutor.java
@@ -18,13 +18,8 @@ package ch.ethz.sis.openbis.generic.server.api.v3.executor.method;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.ICreateEntityExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
-import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
/**
* @author pkupczyk
@@ -33,27 +28,19 @@ public abstract class AbstractCreateMethodExecutor<PERM_ID, CREATION> extends Ab
ICreateMethodExecutor<PERM_ID, CREATION>
{
- @Autowired
- private IDAOFactory daoFactory;
-
@Override
- public List<PERM_ID> create(String sessionToken, List<CREATION> creations)
+ public List<PERM_ID> create(final String sessionToken, final List<CREATION> creations)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
-
- try
- {
- List<PERM_ID> permIds = getCreateExecutor().create(context, creations);
- daoFactory.getSessionFactory().getCurrentSession().flush();
- return permIds;
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
- daoFactory.getSessionFactory().getCurrentSession().clear();
- }
+ return executeInContext(sessionToken, new IMethodAction<List<PERM_ID>>()
+ {
+
+ @Override
+ public List<PERM_ID> execute(IOperationContext context)
+ {
+ return getCreateExecutor().create(context, creations);
+ }
+
+ });
}
protected abstract ICreateEntityExecutor<CREATION, PERM_ID> getCreateExecutor();
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractDeleteMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractDeleteMethodExecutor.java
new file mode 100644
index 00000000000..6c793803c35
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractDeleteMethodExecutor.java
@@ -0,0 +1,46 @@
+/*
+ * 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.method;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+
+/**
+ * @author pkupczyk
+ */
+public abstract class AbstractDeleteMethodExecutor<DELETION_ID, OBJECT_ID, DELETION_OPTIONS> extends AbstractMethodExecutor implements
+ IDeleteMethodExecutor<DELETION_ID, OBJECT_ID, DELETION_OPTIONS>
+{
+
+ @Override
+ public DELETION_ID delete(final String sessionToken, final List<? extends OBJECT_ID> objectIds, final DELETION_OPTIONS deletionOptions)
+ {
+ return executeInContext(sessionToken, new IMethodAction<DELETION_ID>()
+ {
+ @Override
+ public DELETION_ID execute(IOperationContext context)
+ {
+ return getDeleteExecutor().delete(context, objectIds, deletionOptions);
+ }
+ });
+ }
+
+ protected abstract IDeleteEntityExecutor<DELETION_ID, OBJECT_ID, DELETION_OPTIONS> getDeleteExecutor();
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMapMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMapMethodExecutor.java
index 0dab0672cd9..ac812422f3b 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMapMethodExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMapMethodExecutor.java
@@ -21,13 +21,11 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.common.IMapObjectByIdExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.ITranslator;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.TranslationContext;
-import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.IObjectId;
-import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
/**
* @author pkupczyk
@@ -35,33 +33,28 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
public abstract class AbstractMapMethodExecutor<OBJECT_ID extends IObjectId, OBJECT_PE, OBJECT, FETCH_OPTIONS> extends AbstractMethodExecutor
{
- public Map<OBJECT_ID, OBJECT> map(String sessionToken, List<? extends OBJECT_ID> objectIds, FETCH_OPTIONS fetchOptions)
+ public Map<OBJECT_ID, OBJECT> map(final String sessionToken, final List<? extends OBJECT_ID> objectIds, final FETCH_OPTIONS fetchOptions)
{
- Session session = getSession(sessionToken);
- return translate(session, map(session, objectIds), fetchOptions);
- }
-
- private Map<OBJECT_ID, OBJECT_PE> map(Session session, List<? extends OBJECT_ID> objectIds)
- {
- OperationContext context = new OperationContext(session);
- try
- {
- return getMapExecutor().map(context, objectIds);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- }
+ return executeInContext(sessionToken, new IMethodAction<Map<OBJECT_ID, OBJECT>>()
+ {
+ @Override
+ public Map<OBJECT_ID, OBJECT> execute(IOperationContext context)
+ {
+ Map<OBJECT_ID, OBJECT_PE> map = getMapExecutor().map(context, objectIds);
+ return translate(context, map, fetchOptions);
+ }
+ });
}
- private Map<OBJECT_ID, OBJECT> translate(Session session, Map<OBJECT_ID, OBJECT_PE> idToPeMap, FETCH_OPTIONS fetchOptions)
+ private Map<OBJECT_ID, OBJECT> translate(IOperationContext context, Map<OBJECT_ID, OBJECT_PE> idToPeMap, FETCH_OPTIONS fetchOptions)
{
if (idToPeMap == null || idToPeMap.isEmpty())
{
return Collections.emptyMap();
}
- TranslationContext context = new TranslationContext(session);
- Map<OBJECT_PE, OBJECT> peToObjectMap = getTranslator().translate(context, idToPeMap.values(), fetchOptions);
+ TranslationContext translationContext = new TranslationContext(context.getSession());
+ Map<OBJECT_PE, OBJECT> peToObjectMap = getTranslator().translate(translationContext, idToPeMap.values(), fetchOptions);
Map<OBJECT_ID, OBJECT> idToObjectMap = new LinkedHashMap<OBJECT_ID, OBJECT>();
for (Map.Entry<OBJECT_ID, OBJECT_PE> entry : idToPeMap.entrySet())
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMethodExecutor.java
index 901056051f3..25b7d59d80d 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMethodExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractMethodExecutor.java
@@ -18,7 +18,13 @@ package ch.ethz.sis.openbis.generic.server.api.v3.executor.method;
import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
+import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
import ch.systemsx.cisd.openbis.generic.shared.IOpenBisSessionManager;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
@@ -27,13 +33,41 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
*/
public class AbstractMethodExecutor
{
+ @Autowired
+ private IDAOFactory daoFactory;
@Resource(name = ComponentNames.SESSION_MANAGER)
- protected IOpenBisSessionManager sessionManager;
+ private IOpenBisSessionManager sessionManager;
+
+ protected <T> T executeInContext(String sessionToken, IMethodAction<T> action)
+ {
+ Session session = getSession(sessionToken);
+ OperationContext context = new OperationContext(session);
+
+ try
+ {
+ T result = action.execute(context);
+ daoFactory.getSessionFactory().getCurrentSession().flush();
+ return result;
+ } catch (Throwable t)
+ {
+ throw ExceptionUtils.create(context, t);
+ } finally
+ {
+ daoFactory.getSessionFactory().getCurrentSession().clear();
+ }
+ }
protected Session getSession(String sessionToken)
{
return sessionManager.getSession(sessionToken);
}
+ public interface IMethodAction<T>
+ {
+
+ public T execute(IOperationContext context);
+
+ }
+
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractSearchMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractSearchMethodExecutor.java
index 5f58e17de97..cf677f9e0f8 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractSearchMethodExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractSearchMethodExecutor.java
@@ -21,13 +21,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.common.ISearchObjectExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.ITranslator;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.TranslationContext;
-import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.search.AbstractObjectSearchCriterion;
-import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
/**
* @author pkupczyk
@@ -37,33 +35,28 @@ public abstract class AbstractSearchMethodExecutor<OBJECT, OBJECT_PE, CRITERION
{
@Override
- public List<OBJECT> search(String sessionToken, CRITERION criterion, FETCH_OPTIONS fetchOptions)
+ public List<OBJECT> search(final String sessionToken, final CRITERION criterion, final FETCH_OPTIONS fetchOptions)
{
- Session session = getSession(sessionToken);
- return translate(session, search(session, criterion), fetchOptions);
+ return executeInContext(sessionToken, new IMethodAction<List<OBJECT>>()
+ {
+ @Override
+ public List<OBJECT> execute(IOperationContext context)
+ {
+ List<OBJECT_PE> results = getSearchExecutor().search(context, criterion);
+ return translate(context, results, fetchOptions);
+ }
+ });
}
- private List<OBJECT_PE> search(Session session, CRITERION criterion)
- {
- OperationContext context = new OperationContext(session);
- try
- {
- return getSearchExecutor().search(context, criterion);
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- }
- }
-
- private List<OBJECT> translate(Session session, List<OBJECT_PE> peList, FETCH_OPTIONS fetchOptions)
+ private List<OBJECT> translate(IOperationContext context, List<OBJECT_PE> peList, FETCH_OPTIONS fetchOptions)
{
if (peList == null || peList.isEmpty())
{
return Collections.emptyList();
}
- TranslationContext context = new TranslationContext(session);
- Map<OBJECT_PE, OBJECT> peToObjectMap = getTranslator().translate(context, peList, fetchOptions);
+ TranslationContext translationContext = new TranslationContext(context.getSession());
+ Map<OBJECT_PE, OBJECT> peToObjectMap = getTranslator().translate(translationContext, peList, fetchOptions);
return new ArrayList<OBJECT>(peToObjectMap.values());
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractUpdateMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractUpdateMethodExecutor.java
index a7438797278..33aaf79336b 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractUpdateMethodExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/AbstractUpdateMethodExecutor.java
@@ -18,13 +18,8 @@ package ch.ethz.sis.openbis.generic.server.api.v3.executor.method;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IUpdateEntityExecutor;
-import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
-import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
-import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
/**
* @author pkupczyk
@@ -33,27 +28,18 @@ public abstract class AbstractUpdateMethodExecutor<UPDATE> extends AbstractMetho
IUpdateMethodExecutor<UPDATE>
{
- @Autowired
- private IDAOFactory daoFactory;
-
@Override
- public void update(String sessionToken, List<UPDATE> updates)
+ public void update(final String sessionToken, final List<UPDATE> updates)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
-
- try
- {
- getUpdateExecutor().update(context, updates);
- daoFactory.getSessionFactory().getCurrentSession().flush();
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- } finally
- {
-
- daoFactory.getSessionFactory().getCurrentSession().clear();
- }
+ executeInContext(sessionToken, new IMethodAction<Void>()
+ {
+ @Override
+ public Void execute(IOperationContext context)
+ {
+ getUpdateExecutor().update(context, updates);
+ return null;
+ }
+ });
}
protected abstract IUpdateEntityExecutor<UPDATE> getUpdateExecutor();
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ConfirmDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ConfirmDeletionMethodExecutor.java
new file mode 100644
index 00000000000..a3044a07115
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ConfirmDeletionMethodExecutor.java
@@ -0,0 +1,52 @@
+/*
+ * 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.method;
+
+import java.util.List;
+
+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.server.api.v3.executor.deletion.IConfirmDeletionExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class ConfirmDeletionMethodExecutor extends AbstractMethodExecutor implements IConfirmDeletionMethodExecutor
+{
+
+ @Autowired
+ private IConfirmDeletionExecutor confirmExecutor;
+
+ @Override
+ public void confirm(final String sessionToken, final List<? extends IDeletionId> deletionIds)
+ {
+ executeInContext(sessionToken, new IMethodAction<Void>()
+ {
+ @Override
+ public Void execute(IOperationContext context)
+ {
+ confirmExecutor.confirm(context, deletionIds);
+ return null;
+ }
+ });
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteDataSetMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteDataSetMethodExecutor.java
new file mode 100644
index 00000000000..2b85dc0e1d6
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteDataSetMethodExecutor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.dataset.IDeleteDataSetExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.dataset.DataSetDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.dataset.IDataSetId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class DeleteDataSetMethodExecutor extends AbstractDeleteMethodExecutor<IDeletionId, IDataSetId, DataSetDeletionOptions> implements
+ IDeleteDataSetMethodExecutor
+{
+
+ @Autowired
+ private IDeleteDataSetExecutor deleteExecutor;
+
+ @Override
+ protected IDeleteEntityExecutor<IDeletionId, IDataSetId, DataSetDeletionOptions> getDeleteExecutor()
+ {
+ return deleteExecutor;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteExperimentMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteExperimentMethodExecutor.java
new file mode 100644
index 00000000000..b32ee7b1ac8
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteExperimentMethodExecutor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.experiment.IDeleteExperimentExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.experiment.ExperimentDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.experiment.IExperimentId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class DeleteExperimentMethodExecutor extends AbstractDeleteMethodExecutor<IDeletionId, IExperimentId, ExperimentDeletionOptions> implements
+ IDeleteExperimentMethodExecutor
+{
+
+ @Autowired
+ private IDeleteExperimentExecutor deleteExecutor;
+
+ @Override
+ protected IDeleteEntityExecutor<IDeletionId, IExperimentId, ExperimentDeletionOptions> getDeleteExecutor()
+ {
+ return deleteExecutor;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteMaterialMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteMaterialMethodExecutor.java
new file mode 100644
index 00000000000..2f4053203a8
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteMaterialMethodExecutor.java
@@ -0,0 +1,44 @@
+/*
+ * 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.method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.material.IDeleteMaterialExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.material.MaterialDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.material.IMaterialId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class DeleteMaterialMethodExecutor extends AbstractDeleteMethodExecutor<Void, IMaterialId, MaterialDeletionOptions> implements
+ IDeleteMaterialMethodExecutor
+{
+
+ @Autowired
+ private IDeleteMaterialExecutor deleteExecutor;
+
+ @Override
+ protected IDeleteEntityExecutor<Void, IMaterialId, MaterialDeletionOptions> getDeleteExecutor()
+ {
+ return deleteExecutor;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteProjectMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteProjectMethodExecutor.java
new file mode 100644
index 00000000000..93360660f3f
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteProjectMethodExecutor.java
@@ -0,0 +1,44 @@
+/*
+ * 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.method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.project.IDeleteProjectExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.project.ProjectDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.project.IProjectId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class DeleteProjectMethodExecutor extends AbstractDeleteMethodExecutor<Void, IProjectId, ProjectDeletionOptions> implements
+ IDeleteProjectMethodExecutor
+{
+
+ @Autowired
+ private IDeleteProjectExecutor deleteExecutor;
+
+ @Override
+ protected IDeleteEntityExecutor<Void, IProjectId, ProjectDeletionOptions> getDeleteExecutor()
+ {
+ return deleteExecutor;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSampleMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSampleMethodExecutor.java
new file mode 100644
index 00000000000..3512cd5b56d
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSampleMethodExecutor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.sample.IDeleteSampleExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.sample.SampleDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.sample.ISampleId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class DeleteSampleMethodExecutor extends AbstractDeleteMethodExecutor<IDeletionId, ISampleId, SampleDeletionOptions> implements
+ IDeleteSampleMethodExecutor
+{
+
+ @Autowired
+ private IDeleteSampleExecutor deleteExecutor;
+
+ @Override
+ protected IDeleteEntityExecutor<IDeletionId, ISampleId, SampleDeletionOptions> getDeleteExecutor()
+ {
+ return deleteExecutor;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSpaceMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSpaceMethodExecutor.java
new file mode 100644
index 00000000000..83e685ac6a6
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/DeleteSpaceMethodExecutor.java
@@ -0,0 +1,44 @@
+/*
+ * 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.method;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.entity.IDeleteEntityExecutor;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.space.IDeleteSpaceExecutor;
+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
+ */
+@Component
+public class DeleteSpaceMethodExecutor extends AbstractDeleteMethodExecutor<Void, ISpaceId, SpaceDeletionOptions> implements
+ IDeleteSpaceMethodExecutor
+{
+
+ @Autowired
+ private IDeleteSpaceExecutor deleteExecutor;
+
+ @Override
+ protected IDeleteEntityExecutor<Void, ISpaceId, SpaceDeletionOptions> getDeleteExecutor()
+ {
+ return deleteExecutor;
+ }
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IConfirmDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IConfirmDeletionMethodExecutor.java
new file mode 100644
index 00000000000..4efc3264666
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IConfirmDeletionMethodExecutor.java
@@ -0,0 +1,31 @@
+/*
+ * 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.method;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IConfirmDeletionMethodExecutor
+{
+
+ public void confirm(String sessionToken, List<? extends IDeletionId> deletionIds);
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteDataSetMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteDataSetMethodExecutor.java
new file mode 100644
index 00000000000..a326e80d046
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteDataSetMethodExecutor.java
@@ -0,0 +1,29 @@
+/*
+ * 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.method;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.dataset.DataSetDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.dataset.IDataSetId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteDataSetMethodExecutor extends IDeleteMethodExecutor<IDeletionId, IDataSetId, DataSetDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteExperimentMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteExperimentMethodExecutor.java
new file mode 100644
index 00000000000..56f59bdbeb7
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteExperimentMethodExecutor.java
@@ -0,0 +1,29 @@
+/*
+ * 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.method;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.experiment.ExperimentDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.experiment.IExperimentId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteExperimentMethodExecutor extends IDeleteMethodExecutor<IDeletionId, IExperimentId, ExperimentDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMaterialMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMaterialMethodExecutor.java
new file mode 100644
index 00000000000..d2a1705eee8
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMaterialMethodExecutor.java
@@ -0,0 +1,28 @@
+/*
+ * 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.method;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.material.MaterialDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.material.IMaterialId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteMaterialMethodExecutor extends IDeleteMethodExecutor<Void, IMaterialId, MaterialDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMethodExecutor.java
new file mode 100644
index 00000000000..0bbc4451d57
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteMethodExecutor.java
@@ -0,0 +1,29 @@
+/*
+ * 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.method;
+
+import java.util.List;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteMethodExecutor<DELETION_ID, OBJECT_ID, DELETION_OPTIONS>
+{
+
+ public DELETION_ID delete(String sessionToken, List<? extends OBJECT_ID> objectIds, DELETION_OPTIONS deletionOptions);
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteProjectMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteProjectMethodExecutor.java
new file mode 100644
index 00000000000..395ce054882
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteProjectMethodExecutor.java
@@ -0,0 +1,28 @@
+/*
+ * 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.method;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.project.ProjectDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.project.IProjectId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteProjectMethodExecutor extends IDeleteMethodExecutor<Void, IProjectId, ProjectDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSampleMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSampleMethodExecutor.java
new file mode 100644
index 00000000000..d3b7c2f176b
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSampleMethodExecutor.java
@@ -0,0 +1,29 @@
+/*
+ * 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.method;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.sample.SampleDeletionOptions;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.sample.ISampleId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IDeleteSampleMethodExecutor extends IDeleteMethodExecutor<IDeletionId, ISampleId, SampleDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSpaceMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSpaceMethodExecutor.java
new file mode 100644
index 00000000000..e9e757c1f6e
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IDeleteSpaceMethodExecutor.java
@@ -0,0 +1,28 @@
+/*
+ * 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.method;
+
+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 IDeleteSpaceMethodExecutor extends IDeleteMethodExecutor<Void, ISpaceId, SpaceDeletionOptions>
+{
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IRevertDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IRevertDeletionMethodExecutor.java
new file mode 100644
index 00000000000..9d484bf94d0
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/IRevertDeletionMethodExecutor.java
@@ -0,0 +1,31 @@
+/*
+ * 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.method;
+
+import java.util.List;
+
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+
+/**
+ * @author pkupczyk
+ */
+public interface IRevertDeletionMethodExecutor
+{
+
+ public void revert(String sessionToken, List<? extends IDeletionId> deletionIds);
+
+}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ListDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ListDeletionMethodExecutor.java
index 7e6849474f2..6af2000b790 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ListDeletionMethodExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/ListDeletionMethodExecutor.java
@@ -23,14 +23,12 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import ch.ethz.sis.openbis.generic.server.api.v3.executor.OperationContext;
+import ch.ethz.sis.openbis.generic.server.api.v3.executor.IOperationContext;
import ch.ethz.sis.openbis.generic.server.api.v3.executor.deletion.IListDeletionExecutor;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.TranslationContext;
import ch.ethz.sis.openbis.generic.server.api.v3.translator.entity.deletion.IDeletionTranslator;
-import ch.ethz.sis.openbis.generic.server.api.v3.utils.ExceptionUtils;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.deletion.Deletion;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.fetchoptions.deletion.DeletionFetchOptions;
-import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
/**
* @author pkupczyk
@@ -46,22 +44,21 @@ public class ListDeletionMethodExecutor extends AbstractMethodExecutor implement
private IDeletionTranslator translator;
@Override
- public List<Deletion> listDeletions(String sessionToken, DeletionFetchOptions fetchOptions)
+ public List<Deletion> listDeletions(final String sessionToken, final DeletionFetchOptions fetchOptions)
{
- Session session = getSession(sessionToken);
- OperationContext context = new OperationContext(session);
- try
- {
- List<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion> deletions = listExecutor.list(context, 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);
- Map<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion, Deletion> translatedMap =
- translator.translate(new TranslationContext(session), deletions, fetchOptions);
+ Map<ch.systemsx.cisd.openbis.generic.shared.basic.dto.Deletion, Deletion> translatedMap =
+ translator.translate(new TranslationContext(context.getSession()), deletions, fetchOptions);
- return new ArrayList<Deletion>(translatedMap.values());
- } catch (Throwable t)
- {
- throw ExceptionUtils.create(context, t);
- }
+ return new ArrayList<Deletion>(translatedMap.values());
+ }
+ });
}
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/RevertDeletionMethodExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/RevertDeletionMethodExecutor.java
new file mode 100644
index 00000000000..ad4feb30599
--- /dev/null
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/api/v3/executor/method/RevertDeletionMethodExecutor.java
@@ -0,0 +1,52 @@
+/*
+ * 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.method;
+
+import java.util.List;
+
+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.server.api.v3.executor.deletion.IRevertDeletionExecutor;
+import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.deletion.IDeletionId;
+
+/**
+ * @author pkupczyk
+ */
+@Component
+public class RevertDeletionMethodExecutor extends AbstractMethodExecutor implements IRevertDeletionMethodExecutor
+{
+
+ @Autowired
+ private IRevertDeletionExecutor revertExecutor;
+
+ @Override
+ public void revert(final String sessionToken, final List<? extends IDeletionId> deletionIds)
+ {
+ executeInContext(sessionToken, new IMethodAction<Void>()
+ {
+ @Override
+ public Void execute(IOperationContext context)
+ {
+ revertExecutor.revert(context, deletionIds);
+ return null;
+ }
+ });
+ }
+
+}
--
GitLab