diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java
index 4a9082ac2251f07e726e534847e95ee84e8e0646..7b8e99d087c06fc4193269bb490ef8ca945b6ae6 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/DataSetAuthorizationExecutor.java
@@ -94,12 +94,7 @@ public class DataSetAuthorizationExecutor implements IDataSetAuthorizationExecut
@RolesAllowed({ RoleWithHierarchy.SPACE_POWER_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
@Capability("UPDATE_DATASET")
@DatabaseUpdateModification(value = ObjectKind.DATA_SET)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
- public void canUpdate(IOperationContext context, IDataSetId id, DataPE dataSet)
+ public void canUpdate(IOperationContext context, IDataSetId id, @AuthorizationGuard(guardClass = DataPEPredicate.class) DataPE dataSet)
{
boolean isStorageConfirmed;
if (dataSet instanceof ExternalDataPE)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java
index 2d64541b61cde75dd2ab1e71dde72fc3a228ce8c..c4f3ec3cf6c8ea3bf37c831b7200819408ddf443 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/IDataSetAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface IDataSetAuthorizationExecutor extends IObjectAuthorizationExecu
void canCreate(IOperationContext context, DataPE dataSet);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, IDataSetId id, DataPE dataSet);
void canDelete(IOperationContext context, IDataSetId id, DataPE dataSet);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java
index 9e90ea96c8ce78c119e2c26a80a6f6d4040c55b4..af47bf3c78e15f87530721745a5e5f24cceb66a6 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/dataset/UpdateDataSetExecutor.java
@@ -102,12 +102,6 @@ public class UpdateDataSetExecutor extends AbstractUpdateEntityExecutor<DataSetU
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, IDataSetId id, DataPE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
index 006897bf966a1d7e6de1e4cb66c52b63fcbcc187..8946ddd0f2ef9f716128243ef1b3be7682a88926 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityExecutor.java
@@ -58,7 +58,6 @@ public abstract class AbstractUpdateEntityExecutor<UPDATE extends IUpdate, PE ex
@Override
public List<PERM_ID> update(IOperationContext context, List<UPDATE> updates)
{
- checkAccess(context);
if (updates == null || updates.isEmpty())
{
@@ -215,8 +214,6 @@ public abstract class AbstractUpdateEntityExecutor<UPDATE extends IUpdate, PE ex
protected abstract void checkData(IOperationContext context, UPDATE update);
- protected abstract void checkAccess(IOperationContext context);
-
protected abstract void checkAccess(IOperationContext context, ID id, PE entity);
protected abstract void updateBatch(IOperationContext context, MapBatch<UPDATE, PE> batch);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java
index 6b5ecd399553d88a8c6dd92cdcb4f92ef73d6744..cdfe76b09aa261c1d5d1b018dda5223b16bc4c95 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/ExperimentAuthorizationExecutor.java
@@ -61,12 +61,7 @@ public class ExperimentAuthorizationExecutor implements IExperimentAuthorization
@RolesAllowed({ RoleWithHierarchy.SPACE_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
@Capability("UPDATE_EXPERIMENT")
@DatabaseUpdateModification(value = ObjectKind.EXPERIMENT)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
- public void canUpdate(IOperationContext context, IExperimentId id, ExperimentPE experiment)
+ public void canUpdate(IOperationContext context, IExperimentId id, @AuthorizationGuard(guardClass = ExperimentPEPredicate.class) ExperimentPE experiment)
{
if (false == new ExperimentByIdentiferValidator().doValidation(context.getSession().tryGetPerson(), experiment))
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java
index cbe61d85ebcde6e2ce575894cc13f03cfa717de8..3210b7cb6eb0362188dd25038a8b89c79bf9395a 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/IExperimentAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface IExperimentAuthorizationExecutor extends IObjectAuthorizationEx
void canCreate(IOperationContext context, ExperimentPE experiment);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, IExperimentId id, ExperimentPE experiment);
void canDelete(IOperationContext context, IExperimentId id, ExperimentPE experiment);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java
index 14154ea14d7fdb665ddfa7ab4e3055d0df44622c..90d8b76ed56081bd823b0fb34bc79142bec352f1 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/experiment/UpdateExperimentExecutor.java
@@ -93,12 +93,6 @@ public class UpdateExperimentExecutor extends AbstractUpdateEntityExecutor<Exper
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, IExperimentId id, ExperimentPE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java
index 05f58105b657eddc1149bbb09d6091535e27b617..fbe3e5333ec3ba53260a36940b0679343ba33b8f 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/IMaterialAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface IMaterialAuthorizationExecutor extends IObjectAuthorizationExec
void canCreate(IOperationContext context, MaterialPE material);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, IMaterialId id, MaterialPE material);
void canDelete(IOperationContext context, IMaterialId id, MaterialPE material);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java
index 41d8c6321b433e5011a3bc1a3fb0bc7cbf5ae1a7..12302a98c9bdfe2162f5c503b05d752317196c87 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/MaterialAuthorizationExecutor.java
@@ -53,11 +53,6 @@ public class MaterialAuthorizationExecutor implements IMaterialAuthorizationExec
@RolesAllowed({ RoleWithHierarchy.INSTANCE_ADMIN, RoleWithHierarchy.INSTANCE_ETL_SERVER })
@Capability("UPDATE_MATERIAL")
@DatabaseUpdateModification(value = ObjectKind.MATERIAL)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
public void canUpdate(IOperationContext context, IMaterialId id, MaterialPE material)
{
// nothing to do
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java
index 172b2c34ca76d8f1ae03129e5a65ef03a0c7b9a2..d56e612f4f5bbb0f42b91f4814248ade017af426 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/material/UpdateMaterialExecutor.java
@@ -84,12 +84,6 @@ public class UpdateMaterialExecutor extends AbstractUpdateEntityExecutor<Materia
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, IMaterialId id, MaterialPE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java
index 4e2cd7b0df27d2a49a12f561347f8c6310b2ede1..031594eaa6ff84e3d3c947077bd86893bd9ba756 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/operation/update/UpdateOperationExecutionExecutor.java
@@ -80,12 +80,6 @@ public class UpdateOperationExecutionExecutor
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, IOperationExecutionId id, OperationExecutionPE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java
index bce2850db73895b699b31b0e81eeef2b8ece273d..40c2415878f3fd46980ed6bf4403dccd4c34761c 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/IProjectAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface IProjectAuthorizationExecutor extends IObjectAuthorizationExecu
void canCreate(IOperationContext context, ProjectPE project);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, IProjectId id, ProjectPE project);
void canDelete(IOperationContext context, IProjectId id, ProjectPE project);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java
index 0c78126c9ea70e710b813a09027664b0223568c1..91a6369aa1c27e8f843bc4b2f303d9ea93d149a8 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/ProjectAuthorizationExecutor.java
@@ -61,12 +61,7 @@ public class ProjectAuthorizationExecutor implements IProjectAuthorizationExecut
@RolesAllowed({ RoleWithHierarchy.SPACE_POWER_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
@Capability("UPDATE_PROJECT")
@DatabaseUpdateModification(value = ObjectKind.PROJECT)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
- public void canUpdate(IOperationContext context, IProjectId id, ProjectPE project)
+ public void canUpdate(IOperationContext context, IProjectId id, @AuthorizationGuard(guardClass = ProjectPEPredicate.class) ProjectPE project)
{
if (false == new ProjectByIdentiferValidator().doValidation(context.getSession().tryGetPerson(), project))
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java
index 93acb616238e0838e91685e5de8323ee12ae7fd7..e9a4078f4f9e9b49587ffd487ac65565a77e14d1 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/project/UpdateProjectExecutor.java
@@ -85,12 +85,6 @@ public class UpdateProjectExecutor extends AbstractUpdateEntityExecutor<ProjectU
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, IProjectId id, ProjectPE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java
index 1dd0db0948b42721c5dc72030bac96e24f70ac37..3327b41cfc950278b52e08f7219cf3bb28349f36 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/ISampleAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface ISampleAuthorizationExecutor extends IObjectAuthorizationExecut
void canCreate(IOperationContext context, SamplePE sample);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, ISampleId id, SamplePE sample);
void canDelete(IOperationContext context, ISampleId id, SamplePE sample);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java
index 917f4166f6bf074f6d08997fb4d07dfbfc87f40a..6efbbd66e944bbc46db6729ed0236497680f5db5 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SampleAuthorizationExecutor.java
@@ -61,12 +61,8 @@ public class SampleAuthorizationExecutor implements ISampleAuthorizationExecutor
@RolesAllowed({ RoleWithHierarchy.SPACE_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
@Capability("UPDATE_SAMPLE")
@DatabaseUpdateModification(value = ObjectKind.SAMPLE)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
- public void canUpdate(IOperationContext context, ISampleId id, SamplePE sample)
+ public void canUpdate(IOperationContext context, ISampleId id,
+ @AuthorizationGuard(guardClass = SamplePEPredicate.class) SamplePE sample)
{
if (false == new SampleByIdentiferValidator().doValidation(context.getSession().tryGetPerson(), sample))
{
@@ -81,7 +77,6 @@ public class SampleAuthorizationExecutor implements ISampleAuthorizationExecutor
public void canDelete(IOperationContext context, ISampleId id,
@AuthorizationGuard(guardClass = SamplePEPredicate.class) SamplePE sample)
{
-
if (false == new SampleByIdentiferValidator().doValidation(context.getSession().tryGetPerson(), sample))
{
throw new UnauthorizedObjectAccessException(id);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java
index bbcf86a2d27235cec7bad3d60944d0abf9b99a02..8e82dd36d76ebf2a24bfdc5e7c804dfcde6a27a9 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/UpdateSampleExecutor.java
@@ -102,12 +102,6 @@ public class UpdateSampleExecutor extends AbstractUpdateEntityExecutor<SampleUpd
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, ISampleId id, SamplePE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java
index ce10c8846b27003f9c59c0ad09e47082dc832510..814f43bcd1eb7a9fd80c97d63010eb7cd30f4983 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/ISpaceAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface ISpaceAuthorizationExecutor extends IObjectAuthorizationExecuto
void canCreate(IOperationContext context, SpacePE space);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, ISpaceId id, SpacePE space);
void canDelete(IOperationContext context, ISpaceId id, SpacePE space);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java
index 2fd28ffd81cce7e6219ab0ec23621ddb68168e98..777d0c43c3e1bb93b6e6ccfc9843054811011c06 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/SpaceAuthorizationExecutor.java
@@ -55,11 +55,6 @@ public class SpaceAuthorizationExecutor implements ISpaceAuthorizationExecutor
@RolesAllowed({ RoleWithHierarchy.SPACE_ADMIN, RoleWithHierarchy.SPACE_ETL_SERVER })
@Capability("UPDATE_SPACE")
@DatabaseUpdateModification(value = ObjectKind.SPACE)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
public void canUpdate(IOperationContext context, ISpaceId id, SpacePE space)
{
if (false == new SimpleSpaceValidator().doValidation(context.getSession().tryGetPerson(), space))
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java
index 2f611565506ca4158b28ee58e02dc2d43c449e4e..b4bdd5c78c5ddd903ac406234f18b41c9ec702ed 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/space/UpdateSpaceExecutor.java
@@ -73,12 +73,6 @@ public class UpdateSpaceExecutor extends AbstractUpdateEntityExecutor<SpaceUpdat
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, ISpaceId id, SpacePE entity)
{
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java
index 984d1f0a94d1f944e53cbd22a96ca9c0e081da15..4245705bfe65aed6587a3a9f1fe2200a0f0061c8 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/ITagAuthorizationExecutor.java
@@ -31,8 +31,6 @@ public interface ITagAuthorizationExecutor extends IObjectAuthorizationExecutor
void canCreate(IOperationContext context, MetaprojectPE tag);
- void canUpdate(IOperationContext context);
-
void canUpdate(IOperationContext context, ITagId id, MetaprojectPE tag);
void canDelete(IOperationContext context, ITagId id, MetaprojectPE tag);
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java
index 66d917bbc0a9344cb6e659e1b30e95e52fd9df79..ffe940db1e7f0e6e6163b17c5448bf5045699e93 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/TagAuthorizationExecutor.java
@@ -55,11 +55,6 @@ public class TagAuthorizationExecutor implements ITagAuthorizationExecutor
@RolesAllowed({ RoleWithHierarchy.SPACE_USER, RoleWithHierarchy.SPACE_ETL_SERVER })
@Capability("UPDATE_TAG")
@DatabaseUpdateModification(value = ObjectKind.METAPROJECT)
- public void canUpdate(IOperationContext context)
- {
- }
-
- @Override
public void canUpdate(IOperationContext context, ITagId id, MetaprojectPE tag)
{
if (false == new TagAuthorization(context).canAccess(tag))
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java
index d0aac3e10c09d9021ad0c32ac1c0a939ea570a8b..75d62c4ea40d92d2ab6d39a42f8e213ac3d6dddb 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/tag/UpdateTagExecutor.java
@@ -85,12 +85,6 @@ public class UpdateTagExecutor extends AbstractUpdateEntityExecutor<TagUpdate, M
}
}
- @Override
- protected void checkAccess(IOperationContext context)
- {
- authorizationExecutor.canUpdate(context);
- }
-
@Override
protected void checkAccess(IOperationContext context, ITagId id, MetaprojectPE entity)
{