Skip to content
Snippets Groups Projects
Commit aeddd6a2 authored by brinn's avatar brinn
Browse files

[BIS-137] Replace ExperimentPredicate with ExperimentListPredicate as...

[BIS-137] Replace ExperimentPredicate with ExperimentListPredicate as authorization guard of method listDataSetForExperiments().

SVN: 26199
parent ecb8adf4
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException; ...@@ -39,6 +39,7 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.IInvocationLoggerContext; import ch.systemsx.cisd.common.spring.IInvocationLoggerContext;
import ch.systemsx.cisd.openbis.generic.server.AbstractServer; import ch.systemsx.cisd.openbis.generic.server.AbstractServer;
import ch.systemsx.cisd.openbis.generic.server.ComponentNames; import ch.systemsx.cisd.openbis.generic.server.ComponentNames;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.ExperimentListPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SampleListPredicate; import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SampleListPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SamplePredicate; import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SamplePredicate;
import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager; import ch.systemsx.cisd.openbis.generic.server.business.IPropertiesBatchManager;
...@@ -76,7 +77,6 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.Capabili ...@@ -76,7 +77,6 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.Capabili
import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.ReturnValueFilter; import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.ReturnValueFilter;
import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed; import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed;
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.ExperimentIdentifierPredicate; import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.ExperimentIdentifierPredicate;
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.ExperimentPredicate;
import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.ProjectPredicate; import ch.systemsx.cisd.openbis.generic.shared.authorization.predicate.ProjectPredicate;
import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.DataSetByExperimentIdentifierValidator; import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.DataSetByExperimentIdentifierValidator;
import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.ExperimentByIdentiferValidator; import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.ExperimentByIdentiferValidator;
...@@ -696,7 +696,7 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio ...@@ -696,7 +696,7 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio
@RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER) @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER)
@ReturnValueFilter(validatorClass = DataSetByExperimentIdentifierValidator.class) @ReturnValueFilter(validatorClass = DataSetByExperimentIdentifierValidator.class)
public List<DataSet> listDataSetsForExperiments(String sessionToken, public List<DataSet> listDataSetsForExperiments(String sessionToken,
@AuthorizationGuard(guardClass = ExperimentPredicate.class) @AuthorizationGuard(guardClass = ExperimentListPredicate.class)
List<Experiment> experiments, EnumSet<Connections> connections) List<Experiment> experiments, EnumSet<Connections> connections)
{ {
checkSession(sessionToken); checkSession(sessionToken);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment