#22693

Committed 03 Jul 2024 01:09PM CUT coverage: 20.626% (-0.09%) from 20.716%

Build # #22693

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #10664 from IQSS/develop

merge develop into master for 6.3

Run Details

195 of 1852 new or added lines in 82 files covered. (10.53%)

72 existing lines in 33 files now uncovered.

17335 of 84043 relevant lines covered (20.63%)

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/ListMetadataBlocksCommand.java

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

import edu.harvard.iq.dataverse.Dataverse;
import edu.harvard.iq.dataverse.MetadataBlock;
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.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
 * Lists the metadata blocks of a {@link Dataverse}.
 *
 * @author michael
 */
// no annotations here, since permissions are dynamically decided
public class ListMetadataBlocksCommand extends AbstractCommand<List<MetadataBlock>> {

    private final Dataverse dataverse;
    private final boolean onlyDisplayedOnCreate;

    public ListMetadataBlocksCommand(DataverseRequest request, Dataverse dataverse, boolean onlyDisplayedOnCreate) {
        super(request, dataverse);
        this.dataverse = dataverse;
        this.onlyDisplayedOnCreate = onlyDisplayedOnCreate;
    }

    @Override
    public List<MetadataBlock> execute(CommandContext ctxt) throws CommandException {
        if (onlyDisplayedOnCreate) {
            return listMetadataBlocksDisplayedOnCreate(ctxt, dataverse);
        }
        return dataverse.getMetadataBlocks();
    }

    private List<MetadataBlock> listMetadataBlocksDisplayedOnCreate(CommandContext ctxt, Dataverse dataverse) {
        if (dataverse.isMetadataBlockRoot() || dataverse.getOwner() == null) {
            return ctxt.metadataBlocks().listMetadataBlocksDisplayedOnCreate(dataverse);
        }
        return listMetadataBlocksDisplayedOnCreate(ctxt, dataverse.getOwner());
    }

    @Override
    public Map<String, Set<Permission>> getRequiredPermissions() {
        return Collections.singletonMap("",
                dataverse.isReleased() ? Collections.<Permission>emptySet()
                        : Collections.singleton(Permission.ViewUnpublishedDataverse));
    }
}

1	package edu.harvard.iq.dataverse.engine.command.impl;
2
3	import edu.harvard.iq.dataverse.Dataverse;
4	import edu.harvard.iq.dataverse.MetadataBlock;
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
11	import java.util.Collections;
12	import java.util.List;
13	import java.util.Map;
14	import java.util.Set;
15
16	/**
17	* Lists the metadata blocks of a {@link Dataverse}.
18	*
19	* @author michael
20	*/
21	// no annotations here, since permissions are dynamically decided
22	public class ListMetadataBlocksCommand extends AbstractCommand<List<MetadataBlock>> {
23
24	private final Dataverse dataverse;
25	private final boolean onlyDisplayedOnCreate;
26
27	public ListMetadataBlocksCommand(DataverseRequest request, Dataverse dataverse, boolean onlyDisplayedOnCreate) {
NEW 28	super(request, dataverse);	×
NEW 29	this.dataverse = dataverse;	×
NEW 30	this.onlyDisplayedOnCreate = onlyDisplayedOnCreate;	×
UNCOV 31	}	×
32
33	@Override
34	public List<MetadataBlock> execute(CommandContext ctxt) throws CommandException {
NEW 35	if (onlyDisplayedOnCreate) {	×
NEW 36	return listMetadataBlocksDisplayedOnCreate(ctxt, dataverse);	×
37	}
NEW 38	return dataverse.getMetadataBlocks();	×
39	}
40
41	private List<MetadataBlock> listMetadataBlocksDisplayedOnCreate(CommandContext ctxt, Dataverse dataverse) {
NEW 42	if (dataverse.isMetadataBlockRoot() \|\| dataverse.getOwner() == null) {	×
NEW 43	return ctxt.metadataBlocks().listMetadataBlocksDisplayedOnCreate(dataverse);	×
44	}
NEW 45	return listMetadataBlocksDisplayedOnCreate(ctxt, dataverse.getOwner());	×
46	}
47
48	@Override
49	public Map<String, Set<Permission>> getRequiredPermissions() {
50	return Collections.singletonMap("",	×
NEW 51	dataverse.isReleased() ? Collections.<Permission>emptySet()	×
NEW 52	: Collections.singleton(Permission.ViewUnpublishedDataverse));	×
53	}
54	}

IQSS / dataverse / #22693

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