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

[DS-3952] Use service from superclass, tighten code.

Browse Source
This commit is contained in:
Mark H. Wood
2018-09-28 10:36:53 -04:00
committed by Mark H. Wood
parent fae1c5622d
commit 797e998739
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
View File

@@ -21,7 +21,6 @@ import org.dspace.content.Collection;
import org.dspace.content.Community;
import org.dspace.content.Item;
import org.dspace.core.Context;
import org.springframework.beans.factory.annotation.Autowired;
/**
* Manage the creation and cleanup of {@link RequestItem}s for testing.
@@ -30,9 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
*/
public class RequestItemBuilder
extends AbstractBuilder<RequestItem, RequestItemService> {
@Autowired(required = true)
protected RequestItemService requestItemService;
public static final String REQ_EMAIL = "jsmith@example.com";
public static final String REQ_NAME = "John Smith";
public static final String REQ_MESSAGE = "Please send me a copy of this.";
@@ -58,7 +54,7 @@ public class RequestItemBuilder
@Override
public RequestItem build() {
InputStream is = new ByteArrayInputStream("".getBytes());
// Build all the other stuff we need, to request an Item.
CommunityBuilder communityBuilder = CommunityBuilder.createCommunity(context);
community = communityBuilder.build();
CollectionBuilder collectionBuilder = CollectionBuilder.createCollection(context,
@@ -66,15 +62,20 @@ public class RequestItemBuilder
collection = collectionBuilder.build();
ItemBuilder itemBuilder = ItemBuilder.createItem(context, collection);
item = itemBuilder.build();
// Request a copy of the Item that we just built.
String token;
try {
BitstreamBuilder bitstreamBuilder = BitstreamBuilder.createBitstream(context, item, is);
try (InputStream is = new ByteArrayInputStream("".getBytes());) {
BitstreamBuilder bitstreamBuilder
= BitstreamBuilder.createBitstream(context, item, is);
bitstream = bitstreamBuilder.build();
token = requestItemService.createRequest(context,
bitstream, item, true, REQ_EMAIL, REQ_NAME, REQ_MESSAGE);
} catch (SQLException | AuthorizeException | IOException ex) {
throw new RuntimeException(ex);
}
// Return the request.
return requestItemService.findByToken(context, token);
}