[DS-2058] Avoid index out of bounds when no tasks match.

Also remove incorrect unit test.

dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java

@@ -187,7 +187,7 @@ public class XmlWorkflowCuratorServiceImpl
             String taskSetName = curationTaskConfig.containsKey(coll.getHandle()) ?
                     coll.getHandle() : CurationTaskConfig.DEFAULT_TASKSET_NAME;
             TaskSet ts = curationTaskConfig.findTaskSet(taskSetName);
-            return ts.steps.get(0);
+            return ts.steps.isEmpty() ? null : ts.steps.get(0);
         }
         ClaimedTask claimedTask
                 = claimedTaskService.findByWorkflowIdAndEPerson(c, wfi, c.getCurrentUser());

dspace-api/src/test/java/org/dspace/curate/XmlWorkflowCuratorServiceImplTest.java

@@ -1,277 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.curate;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Map;
-
-import org.dspace.AbstractUnitTest;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.builder.AbstractBuilder;
-import org.dspace.builder.CollectionBuilder;
-import org.dspace.builder.CommunityBuilder;
-import org.dspace.builder.GroupBuilder;
-import org.dspace.builder.WorkflowItemBuilder;
-import org.dspace.content.Collection;
-import org.dspace.content.Community;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.core.Context;
-import org.dspace.ctask.general.NoOpCurationTask;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.Group;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.EPersonService;
-import org.dspace.eperson.service.GroupService;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-import org.dspace.workflow.CurationTaskConfig;
-import org.dspace.xmlworkflow.Role;
-import org.dspace.xmlworkflow.WorkflowUtils;
-import org.dspace.xmlworkflow.XmlWorkflowFactoryImpl;
-import org.dspace.xmlworkflow.factory.XmlWorkflowServiceFactory;
-import org.dspace.xmlworkflow.service.XmlWorkflowService;
-import org.dspace.xmlworkflow.state.Step;
-import org.dspace.xmlworkflow.state.Workflow;
-import org.dspace.xmlworkflow.storedcomponents.ClaimedTask;
-import org.dspace.xmlworkflow.storedcomponents.ClaimedTaskServiceImpl;
-import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
-import org.dspace.xmlworkflow.storedcomponents.service.ClaimedTaskService;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.ApplicationContext;
-
-/**
- *
- * @author mwood
- */
-public class XmlWorkflowCuratorServiceImplTest
-        extends AbstractUnitTest {
-    private static final String GROUP_ONE = "one";
-    private static final String TASK_NOOP = "noop";
-    private static final String NULL_WORKFLOW = "nullWorkflow";
-
-    // Configure the workflow task mapping.
-    private static final String TASK_CONFIG_TEMPLATE
-            = ("<?xml version='1.0' encoding='UTF-8'?>"
-            + "<workflow-curation xmlns='https://dspace.org/workflow-curation'>"
-            + "  <taskset-map>"
-            + "    <mapping collection-handle='default' taskset='default'/>"
-            + "  </taskset-map>"
-            + "  <tasksets>"
-            + "    <taskset name='default'>"
-            + "      <flowstep name='%s'>"
-            + "        <task name='%s'/>"
-            + "      </flowstep>"
-            + "    </taskset>"
-            + "  </tasksets>"
-            + "</workflow-curation>");
-
-    private static CollectionService collectionService;
-
-    private static ConfigurationService dspaceConfiguration;
-
-    private static EPersonService epersonService;
-
-    private static GroupService groupService;
-
-    private static XmlWorkflowServiceFactory wsf;
-
-    private static XmlWorkflowService workflowService;
-
-    private static AutowireCapableBeanFactory beanFactory;
-
-    @BeforeClass
-    public static void setUpClass()
-            throws SQLException {
-        // Get some necessary service instances.
-        dspaceConfiguration = DSpaceServicesFactory.getInstance().getConfigurationService();
-        collectionService = ContentServiceFactory.getInstance().getCollectionService();
-        EPersonServiceFactory esf = EPersonServiceFactory.getInstance();
-        epersonService = esf.getEPersonService();
-        groupService = esf.getGroupService();
-        wsf = XmlWorkflowServiceFactory.getInstance();
-        workflowService = wsf.getXmlWorkflowService();
-
-        beanFactory = kernelImpl.getServiceManager()
-                .getServiceByName(ApplicationContext.class.getName(), ApplicationContext.class)
-                .getAutowireCapableBeanFactory();
-
-        // Ensure that a known task exists with a known name.
-        final String CURATION_TASK_MAP_NAME
-                = "plugin.named.org.dspace.curate.CurationTask";
-        dspaceConfiguration.setProperty(CURATION_TASK_MAP_NAME, null);
-        dspaceConfiguration.addPropertyValue(CURATION_TASK_MAP_NAME,
-                NoOpCurationTask.class.getCanonicalName() + " = " + TASK_NOOP);
-
-        // XXX Try to make Builders work in unit test.
-        AbstractBuilder.init();
-    }
-
-    /**
-     * Test of doCuration method, of class XmlWorkflowCuratorServiceImpl.
-     * @throws Exception passed through.
-     */
-    @Ignore
-    @Test
-    public void testDoCuration()
-            throws Exception {
-    }
-
-    /**
-     * Test of curate method, passing a WorkflowItem's ID.
-     * @throws Exception passed through.
-     */
-    @Ignore
-    @Test
-    public void testCurate_by_id()
-            throws Exception {
-    }
-
-    /**
-     * Test of curate method, passing a WorkflowItem instance.
-     * @throws Exception passed through.
-     */
-    @Test
-    public void testCurate_by_instance()
-            throws Exception {
-        // Find our workflow.
-        Workflow workflow = beanFactory.getBean(NULL_WORKFLOW, Workflow.class);
-
-        // Find the workflow step that we will be testing.
-        Step firstStep = workflow.getFirstStep();
-        Role stepRole = firstStep.getRole();
-
-        /*
-         * Build some prerequisite database objects.
-         */
-
-        // We will be creating some model objects, so become administrator.
-        context.turnOffAuthorisationSystem();
-
-        // We need a Collection to which to attach the workflow.
-        Community parent = CommunityBuilder.createCommunity(context)
-                .build();
-        Collection collection = CollectionBuilder.createCollection(context, parent)
-                .build();
-
-        // Create a group for the necessary role.
-        Group roleGroup = GroupBuilder.createGroup(context)
-                .withName(GROUP_ONE)
-                .addMember(eperson)
-                .build();
-
-        // Define that role on the Collection.
-        WorkflowUtils.createCollectionWorkflowRole(context, collection, stepRole.getId(), roleGroup);
-        context.commit(); // XXX try
-        context.reloadEntity(collection); // XXX try
-        context.reloadEntity(roleGroup); // XXX try
-
-        // Give the workflow factory a known configuration.
-        Map<String, Workflow> workflowMapping
-                = Collections.singletonMap(collection.getHandle(), workflow);
-
-        XmlWorkflowFactoryImpl workflowFactory
-                = (XmlWorkflowFactoryImpl) wsf.getWorkflowFactory();
-        workflowFactory.setWorkflowMapping(workflowMapping);
-
-        final String AUTHOR = "JUnit";
-        final String TITLE = "Test Item";
-        final String SUBJECT = "Testing";
-        final String ISSUE_DATE = "2021-02-23";
-
-        // Create a dummy WorkflowItem to curate.
-        XmlWorkflowItem wfi = WorkflowItemBuilder.createWorkflowItem(context, collection)
-                .withAuthor(AUTHOR)
-                .withTitle(TITLE)
-                .withSubject(SUBJECT)
-                .withIssueDate(ISSUE_DATE)
-                .withSubmitter(eperson)
-                .build();
-        context.commit();
-        context.reloadEntity(wfi);
-        context.reloadEntity(collection);
-
-        /*
-         * Database all set up.
-         */
-        context.restoreAuthSystemState();
-
-        // Create a curation task configuration document and parse it.
-        String taskConfigDocument
-                = String.format(TASK_CONFIG_TEMPLATE, firstStep.getId(), TASK_NOOP);
-        CurationTaskConfig curationTaskConfig
-                = new CurationTaskConfig(
-                        new ByteArrayInputStream(
-                                taskConfigDocument.getBytes(StandardCharsets.UTF_8)));
-
-        // Set up a Curator.
-        Curator curator = new Curator();
-        StringBuilder reporter = new StringBuilder();
-        curator.setReporter(reporter);
-
-        // Initialize an instance of the Unit Under Test.
-        XmlWorkflowCuratorServiceImpl instance = new XmlWorkflowCuratorServiceImpl();
-        instance.claimedTaskService = new FakeClaimedTaskService(firstStep.getId());
-        instance.collectionService = collectionService;
-        instance.configurationService = dspaceConfiguration;
-        instance.curationTaskConfig = curationTaskConfig;
-        instance.ePersonService = epersonService;
-        instance.groupService = groupService;
-        instance.workflowFactory = workflowFactory;
-        instance.workflowItemService = wsf.getXmlWorkflowItemService();
-        instance.workflowService = workflowService;
-
-        // Test!
-        boolean curated = instance.curate(curator, context, wfi);
-
-        // Check whether curation completed.
-        assertTrue("Curation did not complete.", curated);
-    }
-
-    /**
-     * Dummy service that makes up {@link ClaimedTask}s with a known content.
-     */
-    class FakeClaimedTaskService
-            extends ClaimedTaskServiceImpl {
-        private final String stepID;
-
-        /**
-         * Always return a ClaimedTask with the given stepID.
-         *
-         * @param stepID the given stepID.
-         */
-        FakeClaimedTaskService(String stepID) {
-            this.stepID = stepID;
-        }
-
-        @Override
-        public ClaimedTask findByWorkflowIdAndEPerson(Context context,
-                XmlWorkflowItem wfi, EPerson eperson)
-                throws SQLException {
-            ClaimedTaskService cts
-                = beanFactory.getBean(ClaimedTaskServiceImpl.class.getCanonicalName(),
-                                      ClaimedTaskService.class);
-            ClaimedTask task;
-            try {
-                task = cts.create(context);
-            } catch (AuthorizeException ex) {
-                throw new SQLException(ex);
-            }
-            task.setStepID(stepID);
-            return task;
-        }
-    }
-}