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

[DURACOM-116] moved sorting to service

Browse Source
This commit is contained in:
corrado lombardi
2023-02-13 12:53:13 +01:00
parent 1fcbd6642c
commit a37403781e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dspace-api/src/main/java/org/dspace/scripts/ScriptServiceImpl.java
View File

@@ -8,6 +8,7 @@
package org.dspace.scripts; package org.dspace.scripts;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -36,7 +37,9 @@ public class ScriptServiceImpl implements ScriptService {
@Override @Override
public List<ScriptConfiguration> getScriptConfigurations(Context context) { public List<ScriptConfiguration> getScriptConfigurations(Context context) {
return serviceManager.getServicesByType(ScriptConfiguration.class).stream().filter( return serviceManager.getServicesByType(ScriptConfiguration.class).stream().filter(
scriptConfiguration -> scriptConfiguration.isAllowedToExecute(context)).collect(Collectors.toList()); scriptConfiguration -> scriptConfiguration.isAllowedToExecute(context))
.sorted(Comparator.comparing(ScriptConfiguration::getName))
.collect(Collectors.toList());
} }
@Override @Override

6
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
View File

@@ -11,7 +11,6 @@ import java.io.IOException;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@@ -82,10 +81,7 @@ public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, Strin
@PreAuthorize("hasAuthority('ADMIN')") @PreAuthorize("hasAuthority('ADMIN')")
public Page<ScriptRest> findAll(Context context, Pageable pageable) { public Page<ScriptRest> findAll(Context context, Pageable pageable) {
List<ScriptConfiguration> scriptConfigurations = List<ScriptConfiguration> scriptConfigurations =
scriptService.getScriptConfigurations(context) scriptService.getScriptConfigurations(context);
.stream()
.sorted(Comparator.comparing(ScriptConfiguration::getName))
.collect(Collectors.toList());
return converter.toRestPage(scriptConfigurations, pageable, utils.obtainProjection()); return converter.toRestPage(scriptConfigurations, pageable, utils.obtainProjection());
} }