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

Missing commit broke tests. Tighten up code, #2129

Browse Source
This commit is contained in:
Mark H. Wood
2021-09-03 16:58:06 -04:00
parent 76ea271ead
commit 9dd3026c05
5 changed files with 145 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,11 +42,16 @@ public class RequestItemBuilder
public void cleanup()
throws Exception {
LOG.debug("cleanup()");
if (null != requestItem) {
delete(context, requestItem);
requestItem = null;
} else {
LOG.debug("nothing to clean up.");
try ( Context ctx = new Context(); ) {
ctx.turnOffAuthorisationSystem();
requestItem = ctx.reloadEntity(requestItem);
if (null != requestItem) {
delete(ctx, requestItem);
ctx.complete();
requestItem = null;
} else {
LOG.debug("nothing to clean up.");
}
}
}
@@ -72,6 +77,13 @@ public class RequestItemBuilder
@Override
public RequestItem build() {
LOG.atDebug()
.withLocation()
.log("Building request with item ID {}",
() -> requestItem.getItem().getID().toString());
System.out.format("Building request with item ID %s%n",
requestItem.getItem().getID().toString());
new Throwable().printStackTrace(System.out);
// Nothing to build.
return requestItem;
}
@@ -85,12 +97,22 @@ public class RequestItemBuilder
/**
* Delete a request identified by its token. If no such token is known,
* simply return.
*
* @param token the token identifying the request.
* @throws java.sql.SQLException passed through
*/
static public void deleteRequestItem(String token) {
static public void deleteRequestItem(String token)
throws SQLException {
LOG.atDebug()
.withLocation()
.log("Delete RequestItem with token {}", token);
try (Context context = new Context()) {
RequestItem request = requestItemService.findByToken(context, token);
if (null == request) {
return;
}
requestItemService.delete(context, request);
context.complete();
}
}