#22002

Committed 01 Apr 2024 07:56PM CUT coverage: 20.716% (+0.5%) from 20.173%

Build # #22002

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #10453 from IQSS/develop

Merge 6.2 into master

Run Details

704 of 2679 new or added lines in 152 files covered. (26.28%)

81 existing lines in 49 files now uncovered.

17160 of 82836 relevant lines covered (20.72%)

0.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/ListRoleAssignments.java

package edu.harvard.iq.dataverse.engine.command.impl;

import edu.harvard.iq.dataverse.DvObject;
import edu.harvard.iq.dataverse.RoleAssignment;
import edu.harvard.iq.dataverse.authorization.Permission;
import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
import edu.harvard.iq.dataverse.engine.command.CommandContext;
import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Collections;

/**
 * 
 * @author michael
 */
// no annotations here, since permissions are dynamically decided
public class ListRoleAssignments extends AbstractCommand<List<RoleAssignment>> {
        
        private final DvObject definitionPoint;
        public ListRoleAssignments(DataverseRequest aRequest, DvObject aDefinitionPoint) {
                super(aRequest, aDefinitionPoint);
                definitionPoint = aDefinitionPoint;
        }

        @Override
        public List<RoleAssignment> execute(CommandContext ctxt) throws CommandException {
            if(definitionPoint.isInstanceofDataset()){
                List <RoleAssignment> retVal = new ArrayList();
                retVal.addAll(ctxt.permissions().assignmentsOn(definitionPoint));
                retVal.addAll(ctxt.permissions().assignmentsOn(definitionPoint.getOwner()));
                return retVal;
            }
                return ctxt.permissions().assignmentsOn(definitionPoint);
        }

        @Override
        public Map<String, Set<Permission>> getRequiredPermissions() {
                return Collections.singletonMap("",
                                definitionPoint.isInstanceofDataset() ? Collections.singleton(Permission.ManageDatasetPermissions)
                                                : Collections.singleton(Permission.ManageDataversePermissions));
        }
        
}

1	package edu.harvard.iq.dataverse.engine.command.impl;
2
3	import edu.harvard.iq.dataverse.DvObject;
4	import edu.harvard.iq.dataverse.RoleAssignment;
5	import edu.harvard.iq.dataverse.authorization.Permission;
6	import edu.harvard.iq.dataverse.engine.command.AbstractCommand;
7	import edu.harvard.iq.dataverse.engine.command.CommandContext;
8	import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
9	import edu.harvard.iq.dataverse.engine.command.exception.CommandException;
10	import java.util.ArrayList;
11	import java.util.List;
12	import java.util.Map;
13	import java.util.Set;
14	import java.util.Collections;
15
16	/**
17	*
18	* @author michael
19	*/
20	// no annotations here, since permissions are dynamically decided
21	public class ListRoleAssignments extends AbstractCommand<List<RoleAssignment>> {
22
23	private final DvObject definitionPoint;
24	public ListRoleAssignments(DataverseRequest aRequest, DvObject aDefinitionPoint) {
25	super(aRequest, aDefinitionPoint);	×
26	definitionPoint = aDefinitionPoint;	×
27	}	×
28
29	@Override
30	public List<RoleAssignment> execute(CommandContext ctxt) throws CommandException {
31	if(definitionPoint.isInstanceofDataset()){	×
32	List <RoleAssignment> retVal = new ArrayList();	×
33	retVal.addAll(ctxt.permissions().assignmentsOn(definitionPoint));	×
34	retVal.addAll(ctxt.permissions().assignmentsOn(definitionPoint.getOwner()));	×
35	return retVal;	×
36	}
37	return ctxt.permissions().assignmentsOn(definitionPoint);	×
38	}
39
40	@Override
41	public Map<String, Set<Permission>> getRequiredPermissions() {
NEW 42	return Collections.singletonMap("",	×
NEW 43	definitionPoint.isInstanceofDataset() ? Collections.singleton(Permission.ManageDatasetPermissions)	×
NEW 44	: Collections.singleton(Permission.ManageDataversePermissions));	×
45	}
46
47	}

IQSS / dataverse / #22002

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous