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

Merge remote-tracking branch 'upstream/main' into 3061

Browse Source
This commit is contained in:
Mark H. Wood
2021-09-15 16:18:18 -04:00
parent edd310f536 d04b8d3881
commit 6013062a08
76 changed files with 379 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java
View File

@@ -28,7 +28,7 @@ import org.dspace.content.service.BundleService;
import org.dspace.content.service.ItemService;
import org.dspace.core.Constants;
import org.dspace.core.Context;
import org.dspace.core.LogManager;
import org.dspace.core.LogHelper;
import org.dspace.event.Event;
import org.dspace.storage.bitstore.service.BitstreamStorageService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,7 +74,7 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
if (bitstream == null) {
if (log.isDebugEnabled()) {
log.debug(LogManager.getHeader(context, "find_bitstream",
log.debug(LogHelper.getHeader(context, "find_bitstream",
"not_found,bitstream_id=" + id));
}
@@ -83,7 +83,7 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
// not null, return Bitstream
if (log.isDebugEnabled()) {
log.debug(LogManager.getHeader(context, "find_bitstream",
log.debug(LogHelper.getHeader(context, "find_bitstream",
"bitstream_id=" + id));
}
@@ -132,7 +132,7 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
// Store the bits
UUID bitstreamID = bitstreamStorageService.store(context, bitstreamDAO.create(context, new Bitstream()), is);
log.info(LogManager.getHeader(context, "create_bitstream",
log.info(LogHelper.getHeader(context, "create_bitstream",
"bitstream_id=" + bitstreamID));
// Set the format to "unknown"
@@ -192,7 +192,7 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
bitstreamStorageService.register(
context, bitstream, assetstore, bitstreamPath);
log.info(LogManager.getHeader(context,
log.info(LogHelper.getHeader(context,
"create_bitstream",
"bitstream_id=" + bitstream.getID()));
@@ -249,7 +249,7 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
// Check authorisation
authorizeService.authorizeAction(context, bitstream, Constants.WRITE);
log.info(LogManager.getHeader(context, "update_bitstream",
log.info(LogHelper.getHeader(context, "update_bitstream",
"bitstream_id=" + bitstream.getID()));
super.update(context, bitstream);
if (bitstream.isModified()) {
@@ -274,7 +274,7 @@ public class BitstreamServiceImpl extends DSpaceObjectServiceImpl<Bitstream> imp
// changed to a check on delete
// Check authorisation
authorizeService.authorizeAction(context, bitstream, Constants.DELETE);
log.info(LogManager.getHeader(context, "delete_bitstream",
log.info(LogHelper.getHeader(context, "delete_bitstream",
"bitstream_id=" + bitstream.getID()));
context.addEvent(new Event(Event.DELETE, Constants.BITSTREAM, bitstream.getID(),