hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3067 from atmire/w2p-74727_Nullpointer-workflow-item-after-submitter-delete

Browse Source 
NullPointerException occurs when accessing WorkflowItem after deleting the Submitter
This commit is contained in:
Andrea Bollini
2020-12-03 17:13:57 +01:00
committed by GitHub
parent f9258e5f20 d1d7ef4bb9
commit 0b8675202a
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/test/java/org/dspace/builder/WorkflowItemBuilder.java
View File

@@ -162,6 +162,11 @@ public class WorkflowItemBuilder extends AbstractBuilder<XmlWorkflowItem, XmlWor
return this;
}
public WorkflowItemBuilder withSubmitter(EPerson ePerson) {
workspaceItem.getItem().setSubmitter(ePerson);
return this;
}
public WorkflowItemBuilder withTitle(final String title) {
return setMetadataSingleValue(MetadataSchemaEnum.DC.getName(), "title", null, title);
}

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/AInprogressItemConverter.java
View File

@@ -67,7 +67,9 @@ public abstract class AInprogressItemConverter<T extends InProgressSubmission,
witem.setId(obj.getID());
witem.setCollection(collection != null ? converter.toRest(collection, projection) : null);
witem.setItem(converter.toRest(item, projection));
witem.setSubmitter(converter.toRest(submitter, projection));
if (submitter != null) {
witem.setSubmitter(converter.toRest(submitter, projection));
}
// 1. retrieve the submission definition
// 2. iterate over the submission section to allow to plugin additional

23
dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
View File

@@ -33,6 +33,7 @@ import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
import org.dspace.builder.CollectionBuilder;
import org.dspace.builder.CommunityBuilder;
import org.dspace.builder.EPersonBuilder;
import org.dspace.builder.WorkflowItemBuilder;
import org.dspace.builder.WorkspaceItemBuilder;
import org.dspace.content.Collection;
import org.dspace.content.Community;
@@ -52,9 +53,9 @@ import org.dspace.versioning.service.VersioningService;
import org.dspace.xmlworkflow.factory.XmlWorkflowServiceFactory;
import org.dspace.xmlworkflow.service.XmlWorkflowService;
import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
/**
@@ -68,6 +69,8 @@ public class DeleteEPersonSubmitterIT extends AbstractControllerIntegrationTest
protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance()
.getWorkspaceItemService();
protected XmlWorkflowService xmlWorkflowService = XmlWorkflowServiceFactory.getInstance().getXmlWorkflowService();
protected XmlWorkflowItemService xmlWorkflowItemService = XmlWorkflowServiceFactory.getInstance()
.getXmlWorkflowItemService();
protected VersioningService versioningService = VersionServiceFactory.getInstance().getVersionService();
protected RequestItemAuthorExtractor requestItemAuthorExtractor =
@@ -303,11 +306,7 @@ public class DeleteEPersonSubmitterIT extends AbstractControllerIntegrationTest
.andExpect(status().isNotFound());
}
@Ignore
@Test
/**
* TODO: This test currently fails with a status 500
*/
public void testWorkflowItemSubmitterDelete() throws Exception {
context.turnOffAuthorisationSystem();
@@ -316,14 +315,12 @@ public class DeleteEPersonSubmitterIT extends AbstractControllerIntegrationTest
.withWorkflowGroup(1, workflowUser)
.build();
WorkspaceItem wsi = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
.withSubmitter(submitter)
.withTitle("Test Item")
.withIssueDate("2019-03-06")
.withSubject("ExtraEntry")
.build();
XmlWorkflowItem workflowItem = xmlWorkflowService.startWithoutNotify(context, wsi);
XmlWorkflowItem workflowItem = WorkflowItemBuilder.createWorkflowItem(context, collection)
.withSubmitter(submitter)
.withTitle("Test Item")
.withIssueDate("2019-03-06")
.withSubject("ExtraEntry")
.build();
String token = getAuthToken(admin.getEmail(), password);
getClient(token).perform(get("/api/workflow/workflowitems/" + workflowItem.getID()))