hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 23:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-5755] Refactoring

Browse Source
This commit is contained in:
Jurgen Mamani
2022-04-29 10:30:19 +02:00
parent 9b14fe59bd
commit 7dc4aaa0d4
3 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dspace-api/src/main/java/org/dspace/scripts/ProcessServiceImpl.java
View File

@@ -21,7 +21,6 @@ import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.regex.Pattern;
@@ -47,7 +46,6 @@ import org.dspace.core.LogHelper;
import org.dspace.eperson.EPerson;
import org.dspace.eperson.Group;
import org.dspace.eperson.service.EPersonService;
import org.dspace.eperson.service.GroupService;
import org.dspace.scripts.service.ProcessService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -76,12 +74,10 @@ public class ProcessServiceImpl implements ProcessService {
@Autowired
private EPersonService ePersonService;
@Autowired
private GroupService groupService;
@Override
public Process create(Context context, EPerson ePerson, String scriptName,
List<DSpaceCommandLineParameter> parameters, final List<Group> specialGroups) throws SQLException {
List<DSpaceCommandLineParameter> parameters,
final List<Group> specialGroups) throws SQLException {
Process process = new Process();
process.setEPerson(ePerson);
@@ -177,24 +173,10 @@ public class ProcessServiceImpl implements ProcessService {
MetadataField dspaceProcessFileTypeField = metadataFieldService
.findByString(context, Process.BITSTREAM_TYPE_METADATAFIELD, '.');
bitstreamService.addMetadata(context, bitstream, dspaceProcessFileTypeField, null, type);
if (Objects.isNull(context.getCurrentUser())) {
Group anonymous = groupService.findByName(context, Group.ANONYMOUS);
authorizeService.addPolicy(context, bitstream, Constants.READ, anonymous);
} else {
authorizeService.addPolicy(context, bitstream, Constants.READ, context.getCurrentUser());
authorizeService.addPolicy(context, bitstream, Constants.WRITE, context.getCurrentUser());
authorizeService.addPolicy(context, bitstream, Constants.DELETE, context.getCurrentUser());
}
try {
context.turnOffAuthorisationSystem();
bitstreamService.update(context, bitstream);
context.restoreAuthSystemState();
} catch (SQLException | AuthorizeException e) {
log.info(e.getMessage());
throw new RuntimeException(e.getMessage(), e);
}
authorizeService.addPolicy(context, bitstream, Constants.READ, context.getCurrentUser());
authorizeService.addPolicy(context, bitstream, Constants.WRITE, context.getCurrentUser());
authorizeService.addPolicy(context, bitstream, Constants.DELETE, context.getCurrentUser());
bitstreamService.update(context, bitstream);
process.addBitstream(bitstream);
update(context, process);
}