[Task 64926] applied the feedback

dspace-api/src/main/java/org/dspace/content/ProcessServiceImpl.java

@@ -32,9 +32,6 @@ public class ProcessServiceImpl implements ProcessService {
     @Autowired
     private ProcessDAO processDAO;
 
-    @Autowired
-    private BitstreamService bitstreamService;
-
     @Override
     public Process create(Context context, EPerson ePerson, String scriptName,
                           List<DSpaceCommandLineParameter> parameters) throws SQLException {
@@ -60,6 +57,11 @@ public class ProcessServiceImpl implements ProcessService {
         return processDAO.findAll(context, Process.class);
     }
 
+    @Override
+    public List<Process> findAll(Context context, int limit, int offset) throws SQLException {
+        return processDAO.findAll(context, limit, offset);
+    }
+
     @Override
     public List<Process> findAllSortByScript(Context context) throws SQLException {
         return processDAO.findAllSortByScript(context);
@@ -130,4 +132,8 @@ public class ProcessServiceImpl implements ProcessService {
         return parameterList;
     }
 
+    public int countTotal(Context context) throws SQLException {
+        return processDAO.countRows(context);
+    }
+
 }

dspace-api/src/main/java/org/dspace/content/dao/ProcessDAO.java

@@ -31,4 +31,17 @@ public interface ProcessDAO extends GenericDAO<Process> {
      * @throws SQLException If something goes wrong
      */
     public List<Process> findAllSortByStartTime(Context context) throws SQLException;
+
+    /**
+     * Returns a list of all Process objects in the database
+     * @param context   The relevant DSpace context
+     * @param limit     The limit for the amount of Processes returned
+     * @param offset    The offset for the Processes to be returned
+     * @return The list of all Process objects in the Database
+     * @throws SQLException If something goes wrong
+     */
+    List<Process> findAll(Context context, int limit, int offset) throws SQLException;
+
+    int countRows(Context context) throws SQLException;
+
 }

dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java

@@ -45,6 +45,26 @@ public class ProcessDAOImpl extends AbstractHibernateDAO<Process> implements Pro
 
         return list(context, criteriaQuery, false, Process.class, -1, -1);
     }
+
+    public List<Process> findAll(Context context, int limit, int offset) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Process.class);
+        Root<Process> processRoot = criteriaQuery.from(Process.class);
+        criteriaQuery.select(processRoot);
+
+        return list(context, criteriaQuery, false, Process.class, limit, offset);
+    }
+
+    public int countRows(Context context) throws SQLException {
+
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Process.class);
+        Root<Process> processRoot = criteriaQuery.from(Process.class);
+        criteriaQuery.select(processRoot);
+
+        return count(context, criteriaQuery, criteriaBuilder, processRoot);
+
+    }
 }
 
 

dspace-api/src/main/java/org/dspace/content/service/ProcessService.java

@@ -49,6 +49,17 @@ public interface ProcessService {
      */
     public List<Process> findAll(Context context) throws SQLException;
 
+    /**
+     * Returns a list of all Process objects in the database
+     * @param context   The relevant DSpace context
+     * @param limit     The limit for the amount of Processes returned
+     * @param offset    The offset for the Processes to be returned
+     * @return The list of all Process objects in the Database
+     * @throws SQLException If something goes wrong
+     */
+    public List<Process> findAll(Context context, int limit, int offset) throws SQLException;
+
+
     /**
      * Returns a list of all Process objects in the database sorted by script name
      * @param context   The relevant DSpace context
@@ -115,4 +126,7 @@ public interface ProcessService {
      * @return The list of parsed parameters from the Process object
      */
     public List<DSpaceCommandLineParameter> getParameters(Process process);
+
+    int countTotal(Context context) throws SQLException;
+
 }

dspace-api/src/main/java/org/dspace/discovery/IndexClient.java

@@ -13,11 +13,8 @@ import java.util.Iterator;
 import java.util.UUID;
 
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.ParseException;
-import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
@@ -26,103 +23,23 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.handle.factory.HandleServiceFactory;
-import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.scripts.DSpaceRunnable;
+import org.springframework.beans.factory.annotation.Autowired;
 
-/**
+public class IndexClient extends DSpaceRunnable {
- * Class used to reindex dspace communities/collections/items into discovery
- *
- * @author Kevin Van de Velde (kevin at atmire dot com)
- * @author Mark Diggory (markd at atmire dot com)
- * @author Ben Bosman (ben at atmire dot com)
- */
-public class IndexClient {
 
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(IndexClient.class);
+    private Context context;
 
-    /**
+    @Autowired
-     * Default constructor
+    private IndexingService indexer;
-     */
-    private IndexClient() { }
 
-    /**
+    private IndexClientOptions indexClientOptions;
-     * When invoked as a command-line tool, creates, updates, removes content
-     * from the whole index
-     *
-     * @param args the command-line arguments, none used
-     * @throws SQLException           An exception that provides information on a database access error or other errors.
-     * @throws IOException            A general class of exceptions produced by failed or interrupted I/O operations.
-     * @throws SearchServiceException if something went wrong with querying the solr server
-     */
-    public static void main(String[] args) throws SQLException, IOException, SearchServiceException {
 
-        Context context = new Context(Context.Mode.READ_ONLY);
+    @Override
-        context.turnOffAuthorisationSystem();
+    public void internalRun() throws Exception {
-
+        if (indexClientOptions == IndexClientOptions.HELP) {
-        String usage = "org.dspace.discovery.IndexClient [-cbhf] | [-r <handle>] | [-i <handle>] or nothing to " +
+            printHelp();
-                "update/clean an existing index.";
+            return;
-        Options options = new Options();
-        HelpFormatter formatter = new HelpFormatter();
-        CommandLine line = null;
-
-        options.addOption(OptionBuilder
-                              .withArgName("handle to remove")
-                              .hasArg(true)
-                              .withDescription(
-                                  "remove an Item, Collection or Community from index based on its handle")
-                              .create("r"));
-
-        options.addOption(OptionBuilder
-                              .withArgName("handle or uuid to add or update")
-                              .hasArg(true)
-                              .withDescription(
-                                  "add or update an Item, Collection or Community based on its handle or uuid")
-                              .create("i"));
-
-        options.addOption(OptionBuilder
-                              .isRequired(false)
-                              .withDescription(
-                                  "clean existing index removing any documents that no longer exist in the db")
-                              .create("c"));
-
-        options.addOption(OptionBuilder
-                              .isRequired(false)
-                              .withDescription(
-                                  "(re)build index, wiping out current one if it exists")
-                              .create("b"));
-
-        options.addOption(OptionBuilder
-                              .isRequired(false)
-                              .withDescription(
-                                  "Rebuild the spellchecker, can be combined with -b and -f.")
-                              .create("s"));
-
-        options.addOption(OptionBuilder
-                              .isRequired(false)
-                              .withDescription(
-                                  "if updating existing index, force each handle to be reindexed even if uptodate")
-                              .create("f"));
-
-        options.addOption(OptionBuilder
-                              .isRequired(false)
-                              .withDescription(
-                                  "print this help message")
-                              .create("h"));
-
-        options.addOption(OptionBuilder.isRequired(false).withDescription(
-            "optimize search core").create("o"));
-
-        try {
-            line = new PosixParser().parse(options, args);
-        } catch (Exception e) {
-            // automatically generate the help statement
-            formatter.printHelp(usage, e.getMessage(), options, "");
-            System.exit(1);
-        }
-
-        if (line.hasOption("h")) {
-            // automatically generate the help statement
-            formatter.printHelp(usage, options);
-            System.exit(1);
         }
 
         /** Acquire from dspace-services in future */
@@ -130,28 +47,29 @@ public class IndexClient {
          * new DSpace.getServiceManager().getServiceByName("org.dspace.discovery.SolrIndexer");
          */
 
-        IndexingService indexer = DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
+        if (indexClientOptions == IndexClientOptions.REMOVE) {
-            IndexingService.class.getName(),
+            handler.logInfo("Removing " + commandLine.getOptionValue("r") + " from Index");
-            IndexingService.class
+            indexer.unIndexContent(context, commandLine.getOptionValue("r"));
-        );
+        } else if (indexClientOptions == IndexClientOptions.CLEAN) {
-
+            handler.logInfo("Cleaning Index");
-        if (line.hasOption("r")) {
+            indexer.cleanIndex(false);
-            log.info("Removing " + line.getOptionValue("r") + " from Index");
+        } else if (indexClientOptions == IndexClientOptions.FORCECLEAN) {
-            indexer.unIndexContent(context, line.getOptionValue("r"));
+            handler.logInfo("Cleaning Index");
-        } else if (line.hasOption("c")) {
+            indexer.cleanIndex(true);
-            log.info("Cleaning Index");
+        } else if (indexClientOptions == IndexClientOptions.BUILD ||
-            indexer.cleanIndex(line.hasOption("f"));
+            indexClientOptions == IndexClientOptions.BUILDANDSPELLCHECK) {
-        } else if (line.hasOption("b")) {
+            handler.logInfo("(Re)building index from scratch.");
-            log.info("(Re)building index from scratch.");
             indexer.createIndex(context);
-            checkRebuildSpellCheck(line, indexer);
+            if (indexClientOptions == IndexClientOptions.BUILDANDSPELLCHECK) {
-        } else if (line.hasOption("o")) {
+                checkRebuildSpellCheck(commandLine, indexer);
-            log.info("Optimizing search core.");
+            }
+        } else if (indexClientOptions == IndexClientOptions.OPTIMIZE) {
+            handler.logInfo("Optimizing search core.");
             indexer.optimize();
-        } else if (line.hasOption('s')) {
+        } else if (indexClientOptions == IndexClientOptions.SPELLCHECK) {
-            checkRebuildSpellCheck(line, indexer);
+            checkRebuildSpellCheck(commandLine, indexer);
-        } else if (line.hasOption('i')) {
+        } else if (indexClientOptions == IndexClientOptions.INDEX) {
-            final String param = line.getOptionValue('i');
+            final String param = commandLine.getOptionValue('i');
             UUID uuid = null;
             try {
                 uuid = UUID.fromString(param);
@@ -171,24 +89,76 @@ public class IndexClient {
                 }
             } else {
                 dso = (IndexableObject) HandleServiceFactory.getInstance()
-                                .getHandleService().resolveToObject(context, param);
+                                                            .getHandleService().resolveToObject(context, param);
             }
             if (dso == null) {
                 throw new IllegalArgumentException("Cannot resolve " + param + " to a DSpace object");
             }
-            log.info("Indexing " + param + " force " + line.hasOption("f"));
+            handler.logInfo("Indexing " + param + " force " + commandLine.hasOption("f"));
             final long startTimeMillis = System.currentTimeMillis();
-            final long count = indexAll(indexer, ContentServiceFactory.getInstance().getItemService(), context, dso);
+            final long count = indexAll(indexer, ContentServiceFactory.getInstance().getItemService(), context,
+                                        dso);
             final long seconds = (System.currentTimeMillis() - startTimeMillis) / 1000;
-            log.info("Indexed " + count + " object" + (count > 1 ? "s" : "") + " in " + seconds + " seconds");
+            handler.logInfo("Indexed " + count + " object" + (count > 1 ? "s" : "") + " in " + seconds + " seconds");
-        } else {
+        } else if (indexClientOptions == IndexClientOptions.UPDATE ||
-            log.info("Updating and Cleaning Index");
+            indexClientOptions == IndexClientOptions.UPDATEANDSPELLCHECK) {
-            indexer.cleanIndex(line.hasOption("f"));
+            handler.logInfo("Updating and Cleaning Index");
-            indexer.updateIndex(context, line.hasOption("f"));
+            indexer.cleanIndex(false);
-            checkRebuildSpellCheck(line, indexer);
+            indexer.updateIndex(context, false);
+            if (indexClientOptions == IndexClientOptions.UPDATEANDSPELLCHECK) {
+                checkRebuildSpellCheck(commandLine, indexer);
+            }
+        } else if (indexClientOptions == IndexClientOptions.FORCEUPDATE ||
+            indexClientOptions == IndexClientOptions.FORCEUPDATEANDSPELLCHECK) {
+            handler.logInfo("Updating and Cleaning Index");
+            indexer.cleanIndex(true);
+            indexer.updateIndex(context, true);
+            if (indexClientOptions == IndexClientOptions.FORCEUPDATEANDSPELLCHECK) {
+                checkRebuildSpellCheck(commandLine, indexer);
+            }
         }
 
-        log.info("Done with indexing");
+        handler.logInfo("Done with indexing");
+    }
+
+    public void setup() throws ParseException {
+        try {
+            context = new Context(Context.Mode.READ_ONLY);
+            context.turnOffAuthorisationSystem();
+        } catch (Exception e) {
+            throw new ParseException("Unable to create a new DSpace Context: " + e.getMessage());
+        }
+
+        indexClientOptions = IndexClientOptions.getIndexClientOption(commandLine);
+    }
+
+    private IndexClient() {
+        Options options = constructOptions();
+        this.options = options;
+    }
+
+    private Options constructOptions() {
+        Options options = new Options();
+
+        options
+            .addOption("r", "remove", true, "remove an Item, Collection or Community from index based on its handle");
+        options.getOption("r").setType(String.class);
+        options.addOption("i", "index", true,
+                          "add or update an Item, Collection or Community based on its handle or uuid");
+        options.getOption("i").setType(boolean.class);
+        options.addOption("c", "clean", false,
+                          "clean existing index removing any documents that no longer exist in the db");
+        options.getOption("c").setType(boolean.class);
+        options.addOption("b", "build", false, "(re)build index, wiping out current one if it exists");
+        options.getOption("b").setType(boolean.class);
+        options.addOption("s", "spellchecker", false, "Rebuild the spellchecker, can be combined with -b and -f.");
+        options.getOption("s").setType(boolean.class);
+        options.addOption("f", "force", false,
+                          "if updating existing index, force each handle to be reindexed even if uptodate");
+        options.getOption("f").setType(boolean.class);
+        options.addOption("h", "help", false, "print this help message");
+        options.getOption("h").setType(boolean.class);
+        return options;
     }
 
     /**
@@ -273,13 +243,12 @@ public class IndexClient {
      * @param line    the command line options
      * @param indexer the solr indexer
      * @throws SearchServiceException in case of a solr exception
-     * @throws java.io.IOException passed through
+     * @throws IOException passed through
      */
-    protected static void checkRebuildSpellCheck(CommandLine line, IndexingService indexer)
+    protected void checkRebuildSpellCheck(CommandLine line, IndexingService indexer)
         throws SearchServiceException, IOException {
-        if (line.hasOption("s")) {
+        handler.logInfo("Rebuilding spell checker.");
-            log.info("Rebuilding spell checker.");
+        indexer.buildSpellCheck();
-            indexer.buildSpellCheck();
-        }
     }
+
 }

dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java

@@ -6,7 +6,7 @@
  * http://www.dspace.org/license/
  */
 
-package org.dspace.scripts;
+package org.dspace.discovery;
 
 import org.apache.commons.cli.CommandLine;
 

dspace-api/src/main/java/org/dspace/handle/UpdateHandlePrefix.java

@@ -13,6 +13,7 @@ import java.sql.SQLException;
 import java.util.Iterator;
 
 import org.apache.logging.log4j.Logger;
+import org.dspace.app.launcher.ScriptLauncher;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.MetadataValueService;
@@ -139,7 +140,7 @@ public class UpdateHandlePrefix {
 
                     try {
                         // Reinitialise the search and browse system
-                        IndexClient.main(new String[] {"-b"});
+                        ScriptLauncher.main(new String[] {"index-discovery", "-b"});
                         System.out.println("Browse and search indexes are ready now.");
                         // All done
                         System.out.println("\nAll done successfully. Please check the DSpace logs!\n");

dspace-api/src/main/java/org/dspace/scripts/DSpaceRunnable.java

@@ -7,11 +7,16 @@
  */
 package org.dspace.scripts;
 
+import java.sql.SQLException;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.core.Context;
 import org.dspace.scripts.handler.DSpaceRunnableHandler;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Required;
 
 /**
@@ -42,6 +47,9 @@ public abstract class DSpaceRunnable implements Runnable {
      */
     protected DSpaceRunnableHandler handler;
 
+    @Autowired
+    private AuthorizeService authorizeService;
+
     public String getName() {
         return name;
     }
@@ -128,4 +136,13 @@ public abstract class DSpaceRunnable implements Runnable {
      * @throws ParseException   If something goes wrong
      */
     public abstract void setup() throws ParseException;
+
+    public boolean isAllowedToExecute(Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            handler.logError("Error occured when trying to verify permissions for script: " + name);
+        }
+        return false;
+    }
 }

dspace-api/src/main/java/org/dspace/scripts/impl/IndexClient.java

@@ -1,258 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.scripts.impl;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.Iterator;
-import java.util.UUID;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.dspace.content.Collection;
-import org.dspace.content.Community;
-import org.dspace.content.Item;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Constants;
-import org.dspace.core.Context;
-import org.dspace.discovery.IndexableObject;
-import org.dspace.discovery.IndexingService;
-import org.dspace.discovery.SearchServiceException;
-import org.dspace.handle.factory.HandleServiceFactory;
-import org.dspace.scripts.DSpaceRunnable;
-import org.dspace.scripts.IndexClientOptions;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class IndexClient extends DSpaceRunnable {
-
-    private Context context;
-
-    @Autowired
-    private IndexingService indexer;
-
-    private IndexClientOptions indexClientOptions;
-
-    @Override
-    public void internalRun() throws Exception {
-        if (indexClientOptions == IndexClientOptions.HELP) {
-            printHelp();
-            return;
-        }
-
-        /** Acquire from dspace-services in future */
-        /**
-         * new DSpace.getServiceManager().getServiceByName("org.dspace.discovery.SolrIndexer");
-         */
-
-        if (indexClientOptions == IndexClientOptions.REMOVE) {
-            handler.logInfo("Removing " + commandLine.getOptionValue("r") + " from Index");
-            indexer.unIndexContent(context, commandLine.getOptionValue("r"));
-        } else if (indexClientOptions == IndexClientOptions.CLEAN) {
-            handler.logInfo("Cleaning Index");
-            indexer.cleanIndex(false);
-        } else if (indexClientOptions == IndexClientOptions.FORCECLEAN) {
-            handler.logInfo("Cleaning Index");
-            indexer.cleanIndex(true);
-        } else if (indexClientOptions == IndexClientOptions.BUILD ||
-            indexClientOptions == IndexClientOptions.BUILDANDSPELLCHECK) {
-            handler.logInfo("(Re)building index from scratch.");
-            indexer.createIndex(context);
-            if (indexClientOptions == IndexClientOptions.BUILDANDSPELLCHECK) {
-                checkRebuildSpellCheck(commandLine, indexer);
-            }
-        } else if (indexClientOptions == IndexClientOptions.OPTIMIZE) {
-            handler.logInfo("Optimizing search core.");
-            indexer.optimize();
-        } else if (indexClientOptions == IndexClientOptions.SPELLCHECK) {
-            checkRebuildSpellCheck(commandLine, indexer);
-        } else if (indexClientOptions == IndexClientOptions.INDEX) {
-            final String param = commandLine.getOptionValue('i');
-            UUID uuid = null;
-            try {
-                uuid = UUID.fromString(param);
-            } catch (Exception e) {
-                // nothing to do, it should be an handle
-            }
-            IndexableObject dso = null;
-            if (uuid != null) {
-                dso = ContentServiceFactory.getInstance().getItemService().find(context, uuid);
-                if (dso == null) {
-                    // it could be a community
-                    dso = ContentServiceFactory.getInstance().getCommunityService().find(context, uuid);
-                    if (dso == null) {
-                        // it could be a collection
-                        dso = ContentServiceFactory.getInstance().getCollectionService().find(context, uuid);
-                    }
-                }
-            } else {
-                dso = (IndexableObject) HandleServiceFactory.getInstance()
-                                                            .getHandleService().resolveToObject(context, param);
-            }
-            if (dso == null) {
-                throw new IllegalArgumentException("Cannot resolve " + param + " to a DSpace object");
-            }
-            handler.logInfo("Indexing " + param + " force " + commandLine.hasOption("f"));
-            final long startTimeMillis = System.currentTimeMillis();
-            final long count = indexAll(indexer, ContentServiceFactory.getInstance().getItemService(), context,
-                                        dso);
-            final long seconds = (System.currentTimeMillis() - startTimeMillis) / 1000;
-            handler.logInfo("Indexed " + count + " object" + (count > 1 ? "s" : "") + " in " + seconds + " seconds");
-        } else if (indexClientOptions == IndexClientOptions.UPDATE ||
-            indexClientOptions == IndexClientOptions.UPDATEANDSPELLCHECK) {
-            handler.logInfo("Updating and Cleaning Index");
-            indexer.cleanIndex(false);
-            indexer.updateIndex(context, false);
-            if (indexClientOptions == IndexClientOptions.UPDATEANDSPELLCHECK) {
-                checkRebuildSpellCheck(commandLine, indexer);
-            }
-        } else if (indexClientOptions == IndexClientOptions.FORCEUPDATE ||
-            indexClientOptions == IndexClientOptions.FORCEUPDATEANDSPELLCHECK) {
-            handler.logInfo("Updating and Cleaning Index");
-            indexer.cleanIndex(true);
-            indexer.updateIndex(context, true);
-            if (indexClientOptions == IndexClientOptions.FORCEUPDATEANDSPELLCHECK) {
-                checkRebuildSpellCheck(commandLine, indexer);
-            }
-        }
-
-        handler.logInfo("Done with indexing");
-    }
-
-    public void setup() throws ParseException {
-        try {
-            context = new Context(Context.Mode.READ_ONLY);
-            context.turnOffAuthorisationSystem();
-        } catch (Exception e) {
-            throw new ParseException("Unable to create a new DSpace Context: " + e.getMessage());
-        }
-
-        indexClientOptions = IndexClientOptions.getIndexClientOption(commandLine);
-    }
-
-    private IndexClient() {
-        Options options = constructOptions();
-        this.options = options;
-    }
-
-    private Options constructOptions() {
-        Options options = new Options();
-
-        options
-            .addOption("r", "remove", true, "remove an Item, Collection or Community from index based on its handle");
-        options.getOption("r").setType(String.class);
-        options.addOption("i", "index", true,
-                          "add or update an Item, Collection or Community based on its handle or uuid");
-        options.getOption("i").setType(boolean.class);
-        options.addOption("c", "clean", false,
-                          "clean existing index removing any documents that no longer exist in the db");
-        options.getOption("c").setType(boolean.class);
-        options.addOption("b", "build", false, "(re)build index, wiping out current one if it exists");
-        options.getOption("b").setType(boolean.class);
-        options.addOption("s", "spellchecker", false, "Rebuild the spellchecker, can be combined with -b and -f.");
-        options.getOption("s").setType(boolean.class);
-        options.addOption("f", "force", false,
-                          "if updating existing index, force each handle to be reindexed even if uptodate");
-        options.getOption("f").setType(boolean.class);
-        options.addOption("h", "help", false, "print this help message");
-        options.getOption("h").setType(boolean.class);
-        return options;
-    }
-
-    /**
-     * Indexes the given object and all children, if applicable.
-     *
-     * @param indexingService
-     * @param itemService
-     * @param context         The relevant DSpace Context.
-     * @param dso             DSpace object to index recursively
-     * @throws IOException            A general class of exceptions produced by failed or interrupted I/O operations.
-     * @throws SearchServiceException in case of a solr exception
-     * @throws SQLException           An exception that provides information on a database access error or other errors.
-     */
-    private static long indexAll(final IndexingService indexingService,
-                                 final ItemService itemService,
-                                 final Context context,
-                                 final IndexableObject dso)
-        throws IOException, SearchServiceException, SQLException {
-        long count = 0;
-
-        indexingService.indexContent(context, dso, true, true);
-        count++;
-        if (dso.getType() == Constants.COMMUNITY) {
-            final Community community = (Community) dso;
-            final String communityHandle = community.getHandle();
-            for (final Community subcommunity : community.getSubcommunities()) {
-                count += indexAll(indexingService, itemService, context, subcommunity);
-                //To prevent memory issues, discard an object from the cache after processing
-                context.uncacheEntity(subcommunity);
-            }
-            final Community reloadedCommunity = (Community) HandleServiceFactory.getInstance().getHandleService()
-                                                                                .resolveToObject(context,
-                                                                                                 communityHandle);
-            for (final Collection collection : reloadedCommunity.getCollections()) {
-                count++;
-                indexingService.indexContent(context, collection, true, true);
-                count += indexItems(indexingService, itemService, context, collection);
-                //To prevent memory issues, discard an object from the cache after processing
-                context.uncacheEntity(collection);
-            }
-        } else if (dso.getType() == Constants.COLLECTION) {
-            count += indexItems(indexingService, itemService, context, (Collection) dso);
-        }
-
-        return count;
-    }
-
-    /**
-     * Indexes all items in the given collection.
-     *
-     * @param indexingService
-     * @param itemService
-     * @param context         The relevant DSpace Context.
-     * @param collection      collection to index
-     * @throws IOException            A general class of exceptions produced by failed or interrupted I/O operations.
-     * @throws SearchServiceException in case of a solr exception
-     * @throws SQLException           An exception that provides information on a database access error or other errors.
-     */
-    private static long indexItems(final IndexingService indexingService,
-                                   final ItemService itemService,
-                                   final Context context,
-                                   final Collection collection)
-        throws IOException, SearchServiceException, SQLException {
-        long count = 0;
-
-        final Iterator<Item> itemIterator = itemService.findByCollection(context, collection);
-        while (itemIterator.hasNext()) {
-            Item item = itemIterator.next();
-            indexingService.indexContent(context, item, true, false);
-            count++;
-            //To prevent memory issues, discard an object from the cache after processing
-            context.uncacheEntity(item);
-        }
-        indexingService.commit();
-
-        return count;
-    }
-
-    /**
-     * Check the command line options and rebuild the spell check if active.
-     *
-     * @param line    the command line options
-     * @param indexer the solr indexer
-     * @throws SearchServiceException in case of a solr exception
-     * @throws IOException passed through
-     */
-    protected void checkRebuildSpellCheck(CommandLine line, IndexingService indexer)
-        throws SearchServiceException, IOException {
-        handler.logInfo("Rebuilding spell checker.");
-        indexer.buildSpellCheck();
-    }
-
-}

dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V7.0_2019_06_14__scripts-and-process.sql

@@ -0,0 +1,40 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+-- ===============================================================
+-- WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+--
+-- DO NOT MANUALLY RUN THIS DATABASE MIGRATION. IT WILL BE EXECUTED
+-- AUTOMATICALLY (IF NEEDED) BY "FLYWAY" WHEN YOU STARTUP DSPACE.
+-- http://flywaydb.org/
+-- ===============================================================
+CREATE SEQUENCE process_id_seq;
+
+CREATE TABLE process
+(
+    process_id              INTEGER NOT NULL PRIMARY KEY,
+    user_id                 UUID NOT NULL,
+    start_time              TIMESTAMP,
+    finished_time           TIMESTAMP,
+    creation_time           TIMESTAMP NOT NULL,
+    script                  VARCHAR(256) NOT NULL,
+    status                  VARCHAR(32),
+    parameters              VARCHAR (512)
+);
+
+CREATE TABLE process2bitstream
+(
+  process_id   INTEGER REFERENCES process(process_id),
+  bitstream_id UUID REFERENCES bitstream(uuid),
+  CONSTRAINT PK_process2bitstream PRIMARY KEY (process_id, bitstream_id)
+);
+
+CREATE INDEX process_user_id_idx ON process(user_id);
+CREATE INDEX process_status_idx ON process(status);
+CREATE INDEX process_name_idx on process(script);
+CREATE INDEX process_start_time_idx on process(start_time);

dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/oracle/V7.0_2019_06_14__scripts-and-process.sql

@@ -0,0 +1,40 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+-- ===============================================================
+-- WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
+--
+-- DO NOT MANUALLY RUN THIS DATABASE MIGRATION. IT WILL BE EXECUTED
+-- AUTOMATICALLY (IF NEEDED) BY "FLYWAY" WHEN YOU STARTUP DSPACE.
+-- http://flywaydb.org/
+-- ===============================================================
+CREATE SEQUENCE process_id_seq;
+
+CREATE TABLE process
+(
+    process_id              INTEGER NOT NULL PRIMARY KEY,
+    user_id                 RAW(16) NOT NULL,
+    start_time              TIMESTAMP,
+    finished_time           TIMESTAMP,
+    creation_time           TIMESTAMP NOT NULL,
+    script                  VARCHAR(256) NOT NULL,
+    status                  VARCHAR(32),
+    parameters              VARCHAR (512)
+);
+
+CREATE TABLE process2bitstream
+(
+  process_id   INTEGER REFERENCES process(process_id),
+  bitstream_id RAW(16) REFERENCES bitstream(uuid),
+  CONSTRAINT PK_process2bitstream PRIMARY KEY (process_id, bitstream_id)
+);
+
+CREATE INDEX process_user_id_idx ON process(user_id);
+CREATE INDEX process_status_idx ON process(status);
+CREATE INDEX process_name_idx on process(script);
+CREATE INDEX process_start_time_idx on process(start_time);

dspace-server-webapp/src/main/java/org/dspace/app/rest/ProcessRestController.java

@@ -7,10 +7,14 @@
  */
 package org.dspace.app.rest;
 
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
+import static org.springframework.hateoas.mvc.ControllerLinkBuilder.methodOn;
+
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -24,7 +28,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.web.PagedResourcesAssembler;
 import org.springframework.hateoas.Link;
+import org.springframework.hateoas.PagedResources;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -63,30 +70,32 @@ public class ProcessRestController implements InitializingBean {
      *                  ProcessResource objects
      * @throws Exception    If something goes wrong
      */
+    @PreAuthorize("hasAuthority('ADMIN')")
     @RequestMapping(method = RequestMethod.GET)
-    public EmbeddedPage getProcesses(Pageable pageable) throws Exception {
+    public PagedResources<ProcessResource> getProcesses(Pageable pageable, PagedResourcesAssembler assembler)
+        throws Exception {
         if (log.isTraceEnabled()) {
             log.trace("Retrieving processes");
         }
 
-        List<ProcessRest> processRestList = processRestRepository.getAllProcesses();
+        List<ProcessResource> processResources = processRestRepository.getAllProcesses(pageable).stream()
-        List<ProcessResource> processResources = new LinkedList<>();
+                                                                      .map(processRest -> {
-        for (ProcessRest processRest : processRestList) {
+                                                                          ProcessResource processResource =
-            ProcessResource processResource = new ProcessResource(processRest);
+                                                                              new ProcessResource(
-            linkService.addLinks(processResource);
+                                                                                  processRest);
-            processResources.add(processResource);
+                                                                          linkService.addLinks(processResource);
+                                                                          return processResource;
+                                                                      }).collect(Collectors.toList());
 
-        }
+        Page page = new PageImpl<>(processResources, pageable, processRestRepository.getTotalAmountOfProcesses());
 
-        Page page = new PageImpl<>(processResources, pageable, processRestList.size());
+        Link link = linkTo(methodOn(this.getClass()).getProcesses(pageable, assembler)).withSelfRel();
+        PagedResources<ProcessResource> result = assembler.toResource(page, link);
 
-//        SearchResultsResourceHalLinkFactory linkFactory = new SearchResultsResourceHalLinkFactory();
+        return result;
-        EmbeddedPage embeddedPage = new EmbeddedPage("test",
-                                                     page, processResources, "scripts");
-
-        return embeddedPage;
     }
 
+
     /**
      * This method will retrieve the Process object from the database that matches the given processId and it'll
      * send this back as a ProcessResource

dspace-server-webapp/src/main/java/org/dspace/app/rest/ScriptRestController.java

@@ -29,9 +29,6 @@ public class ScriptRestController {
 
     private static final Logger log = LogManager.getLogger();
 
-    @Autowired
-    private DiscoverableEndpointsService discoverableEndpointsService;
-
     @Autowired
     private ScriptRestRepository scriptRestRepository;
 

dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/processes/ParameterConverter.java

@@ -33,7 +33,7 @@ public class ParameterConverter {
         for (Option option : CollectionUtils.emptyIfNull(options.getOptions())) {
             ParameterRest parameterRest = new ParameterRest();
             parameterRest.setDescription(option.getDescription());
-            parameterRest.setName(option.getOpt());
+            parameterRest.setName("-" + (option.getOpt() != null ? option.getOpt() : "-" + option.getLongOpt()));
             parameterRest.setType(((Class) option.getType()).getSimpleName());
             listToReturn.add(parameterRest);
         }

dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/processes/ProcessConverter.java

@@ -37,6 +37,7 @@ public class ProcessConverter implements DSpaceConverter<Process, ProcessRest> {
         processRest.setUserId(process.getEPerson().getID());
         processRest.setProcessStatus(process.getProcessStatus());
         processRest.setStartTime(process.getStartTime());
+        processRest.setEndTime(process.getFinishedTime());
         processRest.setParameterRestList(
             processService.getParameters(process).stream().map(x -> dSpaceRunnableParameterConverter.fromModel(x))
                           .collect(Collectors.toList()));

dspace-server-webapp/src/main/java/org/dspace/app/rest/link/process/ProcessHalLinkFactory.java

@@ -1,53 +1,19 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
 package org.dspace.app.rest.link.process;
 
-import java.util.LinkedList;
-
 import org.dspace.app.rest.ProcessRestController;
 import org.dspace.app.rest.link.HalLinkFactory;
-import org.dspace.app.rest.model.hateoas.ProcessResource;
+import org.springframework.web.util.UriComponentsBuilder;
-import org.dspace.services.ConfigurationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Pageable;
-import org.springframework.hateoas.Link;
-import org.springframework.stereotype.Component;
 
-/**
+public abstract class ProcessHalLinkFactory<T> extends HalLinkFactory<T, ProcessRestController> {
- * This HalLinkFactory class will provide a means to add Links to the ProcessResource
- */
-@Component
-public class ProcessHalLinkFactory extends HalLinkFactory<ProcessResource, ProcessRestController> {
 
-    @Autowired
+    public UriComponentsBuilder buildProcessesBaseLink() {
-    private ConfigurationService configurationService;
+        try {
+            UriComponentsBuilder uriBuilder = uriBuilder(getMethodOn().getProcesses(null, null));
 
-    @Override
+            return uriBuilder;
-    protected void addLinks(ProcessResource halResource, Pageable pageable, LinkedList<Link> list) throws Exception {
+        } catch (Exception ex) {
-        String dspaceRestUrl = configurationService.getProperty("dspace.restUrl");
+            //The method throwing the exception is never really executed, so this exception can never occur
-        list.add(buildLink(Link.REL_SELF, getMethodOn().getProcessById(halResource.getContent().getProcessId())));
+            return null;
-        list.add(
+        }
-            buildLink("script", dspaceRestUrl + "/api/system/scripts/" + halResource.getContent().getScriptName()));
-        // TODO Replace the bottom two with getMethodOn() when the Controller methods are created
-        list.add(buildLink("output", dspaceRestUrl + "/api/system/processes/" + halResource.getContent()
-                                                                                           .getProcessId() + "/output"
-        ));
-        list.add(buildLink("files", dspaceRestUrl + "/api/system/processes/" + halResource.getContent()
-                                                                                          .getProcessId() + "/files"));
     }
-
+}
-    @Override
-    protected Class<ProcessRestController> getControllerClass() {
-        return ProcessRestController.class;
-    }
-
-    @Override
-    protected Class<ProcessResource> getResourceClass() {
-        return ProcessResource.class;
-    }
-}

dspace-server-webapp/src/main/java/org/dspace/app/rest/link/process/ProcessResourceHalLinkFactory.java

@@ -0,0 +1,40 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.link.process;
+
+import java.util.LinkedList;
+
+import org.dspace.app.rest.ProcessRestController;
+import org.dspace.app.rest.model.hateoas.ProcessResource;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.hateoas.Link;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ProcessResourceHalLinkFactory extends ProcessHalLinkFactory<ProcessResource> {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    protected void addLinks(ProcessResource halResource, Pageable pageable, LinkedList<Link> list) throws Exception {
+        String dspaceRestUrl = configurationService.getProperty("dspace.restUrl");
+        list.add(buildLink(Link.REL_SELF, getMethodOn().getProcessById(halResource.getContent().getProcessId())));
+        list.add(buildLink("script", dspaceRestUrl + "/api/system/scripts/" + halResource.getContent().getScriptName()));
+
+    }
+
+    protected Class<ProcessRestController> getControllerClass() {
+        return ProcessRestController.class;
+    }
+
+    protected Class<ProcessResource> getResourceClass() {
+        return ProcessResource.class;
+    }
+}

dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessRest.java

@@ -12,6 +12,7 @@ import java.util.List;
 import java.util.UUID;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.dspace.app.rest.ProcessRestController;
 import org.dspace.content.ProcessStatus;
 
@@ -40,7 +41,9 @@ public class ProcessRest extends BaseObjectRest<UUID> {
     private UUID userId;
     private Integer processId;
     private Date startTime;
+    private Date endTime;
     private ProcessStatus processStatus;
+    @JsonProperty(value = "parameters")
     private List<ParameterValueRest> parameterRestList;
 
     public UUID getUserId() {
@@ -91,6 +94,14 @@ public class ProcessRest extends BaseObjectRest<UUID> {
         this.scriptName = scriptName;
     }
 
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
     @JsonIgnore
     @Override
     public UUID getId() {

dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessRestRepository.java

@@ -17,6 +17,7 @@ import org.dspace.content.Process;
 import org.dspace.content.service.ProcessService;
 import org.dspace.core.Context;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
 
 /**
@@ -36,9 +37,9 @@ public class ProcessRestRepository extends AbstractDSpaceRestRepository {
      * @return  The list of ProcessRest objects coming forth from all Process objects in the database
      * @throws SQLException If something goes wrong
      */
-    public List<ProcessRest> getAllProcesses() throws SQLException {
+    public List<ProcessRest> getAllProcesses(Pageable pageable) throws SQLException {
         Context context = obtainContext();
-        List<Process> list = processService.findAll(context);
+        List<Process> list = processService.findAll(context, pageable.getPageSize(), pageable.getOffset());
 
         List<ProcessRest> listToReturn = new LinkedList<>();
         for (Process process : list) {
@@ -60,4 +61,8 @@ public class ProcessRestRepository extends AbstractDSpaceRestRepository {
         Process process = processService.find(context, processId);
         return processConverter.fromModel(process);
     }
+
+    public int getTotalAmountOfProcesses() throws SQLException {
+        return processService.countTotal(obtainContext());
+    }
 }

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

@@ -30,6 +30,7 @@ import org.dspace.app.rest.model.ScriptRest;
 import org.dspace.app.rest.model.hateoas.DSpaceResource;
 import org.dspace.app.rest.model.hateoas.ScriptResource;
 import org.dspace.app.rest.scripts.handler.impl.RestDSpaceRunnableHandler;
+import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.service.ProcessService;
 import org.dspace.core.Context;
 import org.dspace.scripts.DSpaceCommandLineParameter;
@@ -40,6 +41,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * This is the REST repository dealing with the Script logic
@@ -100,37 +102,23 @@ public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, Strin
      * @throws SQLException If something goes wrong
      * @throws IOException  If something goes wrong
      */
-    public ProcessRest startProcess(String scriptName) throws SQLException, IOException {
+    public ProcessRest startProcess(String scriptName) throws SQLException, IOException, AuthorizeException {
         Context context = obtainContext();
-        List<ParameterValueRest> parameterValueRestList = new LinkedList<>();
+        String properties = requestService.getCurrentRequest().getServletRequest().getParameter("properties");
-        ObjectMapper objectMapper = new ObjectMapper();
+        List<DSpaceCommandLineParameter> dSpaceCommandLineParameters =
-        String propertiesJson = requestService.getCurrentRequest().getServletRequest().getParameter("properties");
+            processPropertiesToDSpaceCommandLineParameters(properties);
-        if (StringUtils.isNotBlank(propertiesJson)) {
+        DSpaceRunnable scriptToExecute = getdSpaceRunnableForName(scriptName);
-            try {
+        if (scriptToExecute == null) {
-                parameterValueRestList = Arrays
+            throw new DSpaceBadRequestException("The script for name: " + scriptName + " wasn't found");
-                    .asList(objectMapper.readValue(propertiesJson, ParameterValueRest[].class));
-            } catch (IOException e) {
-                log.error(
-                    "Couldn't convert the given properties to proper ParameterValueRest objects: " + propertiesJson, e);
-                throw e;
-            }
         }
-
+        if (!scriptToExecute.isAllowedToExecute(context)) {
-        List<DSpaceCommandLineParameter> dSpaceCommandLineParameters = new LinkedList<>();
+            throw new AuthorizeException("Current user is not eligible to execute script with name: " + scriptName);
-        dSpaceCommandLineParameters.addAll(
+        }
-            parameterValueRestList.stream().map(x -> dSpaceRunnableParameterConverter.toModel(x))
+        RestDSpaceRunnableHandler restDSpaceRunnableHandler = new RestDSpaceRunnableHandler(
-                                  .collect(Collectors.toList()));
+            context.getCurrentUser(), scriptName, dSpaceCommandLineParameters);
+        List<String> args = constructArgs(dSpaceCommandLineParameters);
         try {
-            RestDSpaceRunnableHandler restDSpaceRunnableHandler = new RestDSpaceRunnableHandler(
+            runDSpaceScript(scriptToExecute, restDSpaceRunnableHandler, args);
-                context.getCurrentUser(), scriptName, dSpaceCommandLineParameters);
-
-            List<String> args = new ArrayList<>();
-            args.add(scriptName);
-            for (DSpaceCommandLineParameter parameter : dSpaceCommandLineParameters) {
-                args.add(parameter.getName());
-                args.add(parameter.getValue());
-            }
-            runDSpaceScriptWithArgs(args.toArray(new String[0]), restDSpaceRunnableHandler, scriptName);
             context.complete();
             return processConverter.fromModel(restDSpaceRunnableHandler.getProcess());
         } catch (SQLException e) {
@@ -140,29 +128,55 @@ public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, Strin
         }
         return null;
     }
+    private List<DSpaceCommandLineParameter> processPropertiesToDSpaceCommandLineParameters(String propertiesJson)
+        throws IOException {
+        List<ParameterValueRest> parameterValueRestList = new LinkedList<>();
+        ObjectMapper objectMapper = new ObjectMapper();
+        if (StringUtils.isNotBlank(propertiesJson)) {
+            parameterValueRestList = Arrays.asList(objectMapper.readValue(propertiesJson, ParameterValueRest[].class));
+        }
 
-    /**
+        List<DSpaceCommandLineParameter> dSpaceCommandLineParameters = new LinkedList<>();
-     * This method will try to find the script to run and run if possible
+        dSpaceCommandLineParameters.addAll(
-     * @param args                  The arguments to be passed along to the script
+            parameterValueRestList.stream().map(x -> dSpaceRunnableParameterConverter.toModel(x))
-     * @param dSpaceRunnableHandler The handler for the script, this will be a RestDSpaceRunnableHandler in this
+                                  .collect(Collectors.toList()));
-     *                              instance
+        return dSpaceCommandLineParameters;
-     * @param scriptName            The name of the script for which a process wants to be started
+    }
-     */
+
-    private void runDSpaceScriptWithArgs(String[] args, RestDSpaceRunnableHandler dSpaceRunnableHandler,
+    private DSpaceRunnable getdSpaceRunnableForName(String scriptName) {
-                                         String scriptName) {
+        DSpaceRunnable scriptToExecute = null;
-        List<DSpaceRunnable> scripts = new DSpace().getServiceManager().getServicesByType(DSpaceRunnable.class);
+        for (DSpaceRunnable script : dspaceRunnables) {
-        for (DSpaceRunnable script : scripts) {
             if (StringUtils.equalsIgnoreCase(script.getName(), scriptName)) {
-                try {
+                scriptToExecute = script;
-                    script.initialize(args, dSpaceRunnableHandler);
+                break;
-                    dSpaceRunnableHandler.schedule(script);
-                } catch (ParseException e) {
-                    script.printHelp();
-                    dSpaceRunnableHandler
-                        .handleException("Failed to parse the arguments given to the script with name: " + scriptName
-                                             + " and args: " + Arrays.toString(args), e);
-                }
             }
         }
+        return scriptToExecute;
     }
+
+    private List<String> constructArgs(List<DSpaceCommandLineParameter> dSpaceCommandLineParameters) {
+        List<String> args = new ArrayList<>();
+        for (DSpaceCommandLineParameter parameter : dSpaceCommandLineParameters) {
+            args.add(parameter.getName());
+            if (parameter.getValue() != null) {
+                args.add(parameter.getValue());
+            }
+        }
+        return args;
+    }
+
+    private void runDSpaceScript(DSpaceRunnable scriptToExecute,
+                                 RestDSpaceRunnableHandler restDSpaceRunnableHandler, List<String> args) {
+        try {
+            scriptToExecute.initialize(args.toArray(new String[0]), restDSpaceRunnableHandler);
+            restDSpaceRunnableHandler.schedule(scriptToExecute);
+        } catch (ParseException e) {
+            scriptToExecute.printHelp();
+            restDSpaceRunnableHandler
+                .handleException(
+                    "Failed to parse the arguments given to the script with name: " + scriptToExecute.getName()
+                        + " and args: " + args, e);
+        }
+    }
+
 }

dspace/config/launcher.xml

@@ -138,13 +138,6 @@
             <class>org.dspace.authority.indexer.AuthorityIndexClient</class>
         </step>
     </command>
-    <command>
-        <name>index-discovery</name>
-        <description>Update Discovery Solr Search Index</description>
-        <step>
-            <class>org.dspace.discovery.IndexClient</class>
-        </step>
-    </command>
     <command>
         <name>itemupdate</name>
         <description>Item update tool for altering metadata and bitstream content in items</description>

dspace/config/spring/api/scripts-and-processes.xml

@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-    <bean id="indexClient" class="org.dspace.scripts.impl.IndexClient" scope="prototype">
+    <bean id="indexClient" class="org.dspace.discovery.IndexClient" scope="prototype">
         <property name="name" value="index-discovery"/>
         <property name="description" value="Update Discovery Solr Search Index"/>
     </bean>