From 0dad4dd71387d0d48dbb8d3788cb7ba0b0b5ce15 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Thu, 9 Mar 2023 18:27:32 +0100
Subject: [PATCH 01/25] [DSC-963] Create new project to run dspace with
 embedded tomcat

---
 dspace-server-webapp/pom.xml                  |  54 ---
 .../{Application.java => WebApplication.java} |  32 +-
 .../java/org/dspace/app/TestApplication.java  |  16 +
 .../AbstractControllerIntegrationTest.java    |   4 +-
 .../AbstractWebClientIntegrationTest.java     |   4 +-
 dspace-webapp-boot/pom.xml                    | 135 +++++++
 .../main/java/org/dspace/app/Application.java |  45 +++
 .../src/main/resources/application.properties |   1 +
 .../src/main/resources/static}/index.html     |   0
 .../resources/static}/js/hal/http/client.js   |   0
 .../static}/js/vendor/CustomPostForm.js       |   0
 .../src/main/resources/static}/login.html     |   0
 .../src/main/resources/static}/styles.css     |   0
 .../app/rest/example/ExampleController.java   |   0
 .../app/rest/example/ExampleControllerIT.java |   0
 dspace/config/log4j2-console.xml              |   2 +-
 dspace/modules/server/pom.xml                 | 355 ------------------
 .../modules/server/src/main/webapp/.gitignore |   0
 pom.xml                                       |  33 +-
 19 files changed, 226 insertions(+), 455 deletions(-)
 rename dspace-server-webapp/src/main/java/org/dspace/app/rest/{Application.java => WebApplication.java} (87%)
 create mode 100644 dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
 create mode 100644 dspace-webapp-boot/pom.xml
 create mode 100644 dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
 rename {dspace-server-webapp => dspace-webapp-boot}/src/main/resources/application.properties (99%)
 rename {dspace-server-webapp/src/main/webapp => dspace-webapp-boot/src/main/resources/static}/index.html (100%)
 rename {dspace-server-webapp/src/main/webapp => dspace-webapp-boot/src/main/resources/static}/js/hal/http/client.js (100%)
 rename {dspace-server-webapp/src/main/webapp => dspace-webapp-boot/src/main/resources/static}/js/vendor/CustomPostForm.js (100%)
 rename {dspace-server-webapp/src/main/webapp => dspace-webapp-boot/src/main/resources/static}/login.html (100%)
 rename {dspace-server-webapp/src/main/webapp => dspace-webapp-boot/src/main/resources/static}/styles.css (100%)
 rename {dspace/modules/server => dspace-webapp-boot}/src/test/java/org/dspace/app/rest/example/ExampleController.java (100%)
 rename {dspace/modules/server => dspace-webapp-boot}/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java (100%)
 delete mode 100644 dspace/modules/server/pom.xml
 delete mode 100644 dspace/modules/server/src/main/webapp/.gitignore

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index d00d6364cad0..e6423a7bc8bc 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -2,7 +2,6 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dspace</groupId>
     <artifactId>dspace-server-webapp</artifactId>
-    <packaging>war</packaging>
     <name>DSpace Server Webapp</name>
     <description>
         DSpace Server Webapp (Spring Boot)
@@ -25,55 +24,10 @@
 
         <!-- Default resource delimiter for Spring Boot, so it doesn't clash with Spring ${} placeholders-->
         <resource.delimiter>@</resource.delimiter>
-        <!-- Define our starting class for our Spring Boot Application -->
-        <start-class>org.dspace.app.rest.Application</start-class>
     </properties>
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <attachClasses>true</attachClasses>
-                    <!-- Filter the web.xml (needed for IDE compatibility/debugging) -->
-                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <!-- Builds a *-tests.jar of all test classes -->
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Verify OS license headers for all source code files -->
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/src/test/resources/**</exclude>
-                        <exclude>**/src/test/data/**</exclude>
-                        <!--Skip license check of third party files included/customized from HAL Browser -->
-                        <exclude>src/main/webapp/index.html</exclude>
-                        <exclude>src/main/webapp/login.html</exclude>
-                        <exclude>src/main/webapp/styles.css</exclude>
-                        <exclude>src/main/webapp/js/hal/**</exclude>
-                        <exclude>src/main/webapp/js/vendor/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <!-- This plugin allows us to run a Groovy script in our Maven POM
                  (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
                  We are generating a OS-agnostic version (agnostic.build.dir) of
@@ -304,12 +258,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-tomcat</artifactId>
-            <scope>provided</scope>
-            <version>${spring-boot.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -550,12 +498,10 @@
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.jayway.jsonpath</groupId>
             <artifactId>json-path-assert</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
similarity index 87%
rename from dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
rename to dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
index c85efed835bf..213477698ac8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/Application.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
@@ -17,8 +17,6 @@
 import org.dspace.app.rest.parameter.resolver.SearchFilterResolver;
 import org.dspace.app.rest.utils.ApplicationConfig;
 import org.dspace.app.rest.utils.DSpaceAPIRequestLoggingFilter;
-import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
-import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.dspace.app.sitemap.GenerateSitemaps;
 import org.dspace.app.solrdatabaseresync.SolrDatabaseResyncCli;
 import org.dspace.app.util.DSpaceContextListener;
@@ -27,11 +25,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.hateoas.server.LinkRelationProvider;
 import org.springframework.lang.NonNull;
@@ -59,12 +55,12 @@
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  * @author Tim Donohue
  */
-@SpringBootApplication
 @EnableScheduling
 @EnableCaching
-public class Application extends SpringBootServletInitializer {
+@Configuration
+public class WebApplication {
 
-    private static final Logger log = LoggerFactory.getLogger(Application.class);
+    private static final Logger log = LoggerFactory.getLogger(WebApplication.class);
 
     @Autowired
     private ApplicationConfig configuration;
@@ -87,26 +83,6 @@ public void sendGoogleAnalyticsEvents() {
         googleAsyncEventListener.sendCollectedEvents();
     }
 
-    /**
-     * Override the default SpringBootServletInitializer.configure() method,
-     * passing it this Application class.
-     * <p>
-     * This is necessary to allow us to build a deployable WAR, rather than
-     * always relying on embedded Tomcat.
-     * <p>
-     * See: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
-     *
-     * @param application
-     * @return
-     */
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        // Pass this Application class, and our initializers for DSpace Kernel and Configuration
-        // NOTE: Kernel must be initialized before Configuration
-        return application.sources(Application.class)
-                          .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer());
-    }
-
     /**
      * Register the "DSpaceContextListener" so that it is loaded
      * for this Application.
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java b/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
new file mode 100644
index 000000000000..0f80e866edd7
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
@@ -0,0 +1,16 @@
+/**
+ * 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;
+
+import org.dspace.app.rest.WebApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
+public class TestApplication {
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
index 00339ba2e482..4ec66fb00081 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.rest.Application;
+import org.dspace.app.TestApplication;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
@@ -68,7 +68,7 @@
 // Specify main class to use to load Spring ApplicationContext
 // NOTE: By default, Spring caches and reuses ApplicationContext for each integration test (to speed up tests)
 // See: https://docs.spring.io/spring/docs/current/spring-framework-reference/testing.html#integration-testing
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = TestApplication.class)
 // Load DSpace initializers in Spring ApplicationContext (to initialize DSpace Kernel & Configuration)
 @ContextConfiguration(initializers = { DSpaceKernelInitializer.class, DSpaceConfigurationInitializer.class })
 // Tell Spring to make ApplicationContext an instance of WebApplicationContext (for web-based tests)
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
index 6556624c6b11..be0a27b4ebd1 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
@@ -9,7 +9,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.rest.Application;
+import org.dspace.app.TestApplication;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.junit.runner.RunWith;
@@ -46,7 +46,7 @@
 // ALSO tell Spring to start a web server on a random port
 // NOTE: By default, Spring caches and reuses ApplicationContext for each integration test (to speed up tests)
 // See: https://docs.spring.io/spring/docs/current/spring-framework-reference/testing.html#integration-testing
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = TestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 // Load DSpace initializers in Spring ApplicationContext (to initialize DSpace Kernel & Configuration)
 @ContextConfiguration(initializers = { DSpaceKernelInitializer.class, DSpaceConfigurationInitializer.class })
 // Load our src/test/resources/application-test.properties to override some settings in default application.properties
diff --git a/dspace-webapp-boot/pom.xml b/dspace-webapp-boot/pom.xml
new file mode 100644
index 000000000000..1a110886cf42
--- /dev/null
+++ b/dspace-webapp-boot/pom.xml
@@ -0,0 +1,135 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.dspace</groupId>
+    <artifactId>dspace-webapp-boot</artifactId>
+    <packaging>war</packaging>
+    <name>DSpace WebApplication Boot</name>
+
+    <!--
+      A Parent POM that Maven inherits DSpace Default
+      POM attributes from.
+    -->
+    <parent>
+        <groupId>org.dspace</groupId>
+        <artifactId>dspace-parent</artifactId>
+        <version>cris-2022.03.01-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <properties>
+        <!-- This is the path to the root [dspace-src] directory. -->
+        <root.basedir>${basedir}/..</root.basedir>
+        <!-- Default resource delimiter for Spring Boot, so it doesn't clash with Spring ${} placeholders-->
+        <resource.delimiter>@</resource.delimiter>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dspace.modules</groupId>
+            <artifactId>additions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-server-webapp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-api</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-server-webapp</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <version>${spring-security.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path-assert</artifactId>
+            <version>${json-path.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Solr Core is only needed for Integration Tests (to run a MockSolrServer) -->
+        <!-- The following Solr / Lucene dependencies also support integration tests -->
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr.client.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <!-- Newer version brought in by opencsv -->
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-text</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-icu</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <!-- Verify OS license headers for all source code files -->
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/src/test/resources/**</exclude>
+                        <exclude>**/src/test/data/**</exclude>
+                        <!--Skip license check of third party files included/customized from HAL Browser -->
+                        <exclude>src/main/resources/static/index.html</exclude>
+                        <exclude>src/main/resources/static/login.html</exclude>
+                        <exclude>src/main/resources/static/styles.css</exclude>
+                        <exclude>src/main/resources/static/js/hal/**</exclude>
+                        <exclude>src/main/resources/static/js/vendor/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java b/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
new file mode 100644
index 000000000000..90039887f862
--- /dev/null
+++ b/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
@@ -0,0 +1,45 @@
+/**
+ * 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;
+
+import org.dspace.app.rest.WebApplication;
+import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
+import org.dspace.app.rest.utils.DSpaceKernelInitializer;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
+public class Application extends SpringBootServletInitializer {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(Application.class)
+            .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer())
+            .run(args);
+    }
+
+    /**
+     * Override the default SpringBootServletInitializer.configure() method,
+     * passing it this Application class.
+     * <p>
+     * This is necessary to allow us to build a deployable WAR, rather than
+     * always relying on embedded Tomcat.
+     * <p>
+     * See: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
+     *
+     * @param application
+     * @return
+     */
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        // Pass this Application class, and our initializers for DSpace Kernel and Configuration
+        // NOTE: Kernel must be initialized before Configuration
+        return application.sources(Application.class)
+                          .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer());
+    }
+}
diff --git a/dspace-server-webapp/src/main/resources/application.properties b/dspace-webapp-boot/src/main/resources/application.properties
similarity index 99%
rename from dspace-server-webapp/src/main/resources/application.properties
rename to dspace-webapp-boot/src/main/resources/application.properties
index a10e0f98a00d..8dd8e2903cc6 100644
--- a/dspace-server-webapp/src/main/resources/application.properties
+++ b/dspace-webapp-boot/src/main/resources/application.properties
@@ -27,6 +27,7 @@
 #    http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
 #
 
+server.servlet.context-path=/server
 ########################
 # DSpace Settings
 #
diff --git a/dspace-server-webapp/src/main/webapp/index.html b/dspace-webapp-boot/src/main/resources/static/index.html
similarity index 100%
rename from dspace-server-webapp/src/main/webapp/index.html
rename to dspace-webapp-boot/src/main/resources/static/index.html
diff --git a/dspace-server-webapp/src/main/webapp/js/hal/http/client.js b/dspace-webapp-boot/src/main/resources/static/js/hal/http/client.js
similarity index 100%
rename from dspace-server-webapp/src/main/webapp/js/hal/http/client.js
rename to dspace-webapp-boot/src/main/resources/static/js/hal/http/client.js
diff --git a/dspace-server-webapp/src/main/webapp/js/vendor/CustomPostForm.js b/dspace-webapp-boot/src/main/resources/static/js/vendor/CustomPostForm.js
similarity index 100%
rename from dspace-server-webapp/src/main/webapp/js/vendor/CustomPostForm.js
rename to dspace-webapp-boot/src/main/resources/static/js/vendor/CustomPostForm.js
diff --git a/dspace-server-webapp/src/main/webapp/login.html b/dspace-webapp-boot/src/main/resources/static/login.html
similarity index 100%
rename from dspace-server-webapp/src/main/webapp/login.html
rename to dspace-webapp-boot/src/main/resources/static/login.html
diff --git a/dspace-server-webapp/src/main/webapp/styles.css b/dspace-webapp-boot/src/main/resources/static/styles.css
similarity index 100%
rename from dspace-server-webapp/src/main/webapp/styles.css
rename to dspace-webapp-boot/src/main/resources/static/styles.css
diff --git a/dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleController.java b/dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleController.java
similarity index 100%
rename from dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleController.java
rename to dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleController.java
diff --git a/dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java b/dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java
similarity index 100%
rename from dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java
rename to dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java
diff --git a/dspace/config/log4j2-console.xml b/dspace/config/log4j2-console.xml
index 3d51b123367b..a0322abf19d3 100644
--- a/dspace/config/log4j2-console.xml
+++ b/dspace/config/log4j2-console.xml
@@ -25,7 +25,7 @@
          For command line / Ant scripts, we are only concerned about significant warnings/errors.
          For the full detail, change this to INFO and re-run Ant. -->
     <Loggers>
-        <Root level='WARN'>
+        <Root level='INFO'>
             <AppenderRef ref='A1'/>
         </Root>
     </Loggers>
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
deleted file mode 100644
index f890d39e6992..000000000000
--- a/dspace/modules/server/pom.xml
+++ /dev/null
@@ -1,355 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.dspace.modules</groupId>
-    <artifactId>server</artifactId>
-    <packaging>war</packaging>
-    <name>DSpace Server Webapp:: Local Customizations</name>
-    <description>Overlay customizations.
-This is probably a temporary solution to the build problems. We like to investigate about
-the possibility to remove the overlays enable a more flexible extension mechanism.
-The use of web-fragment and spring mvc technology allow us to add request handlers
-just adding new jar in the classloader</description>
-
-    <parent>
-        <artifactId>modules</artifactId>
-        <groupId>org.dspace</groupId>
-        <version>cris-2022.03.01-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <properties>
-        <!-- This is the path to the root [dspace-src] directory. -->
-        <root.basedir>${basedir}/../../..</root.basedir>
-    </properties>
-
-    <build>
-        <plugins>
-            <!-- Unpack the "additions" module into our target directory,
-                 so that any custom classes in that module can be included
-                 into this WAR's WEB-INF/classes (see maven-war-plugin below). -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <includeGroupIds>org.dspace.modules</includeGroupIds>
-                            <includeArtifactIds>additions</includeArtifactIds>
-                            <!--NOTE: by default this will also unpack transitive dependencies. To disable, uncomment this next line:
-                            <excludeTransitive>true</excludeTransitive>
-                            -->
-                            <outputDirectory>${project.build.directory}/additions</outputDirectory>
-                            <excludes>META-INF/**</excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <configuration>
-                    <archiveClasses>false</archiveClasses>
-                    <!-- Filter the web.xml (needed for IDE compatibility/debugging) -->
-                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
-                    <!-- Copy any 'additions' (see m-dependency-p above) into WEB-INF/classes.
-                         This ensures they are loaded prior to dependencies in WEB-INF/lib
-                         (per Servlet 3.0 spec, section 10.5), and allows them to override
-                         default classes in this WAR -->
-                    <webResources>
-                        <resource>
-                            <directory>${project.build.directory}/additions</directory>
-                            <targetPath>WEB-INF/classes</targetPath>
-                        </resource>
-                    </webResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- This plugin allows us to run a Groovy script in our Maven POM
-                 (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
-                 We are generating a OS-agnostic version (agnostic.build.dir) of
-                 the ${project.build.directory} property (full path of target dir).
-                 This is needed by the Surefire & Failsafe plugins (see below)
-                 to initialize the Unit Test environment's dspace.cfg file.
-                 Otherwise, the Unit Test Framework will not work on Windows OS.
-                 This Groovy code was mostly borrowed from:
-                 http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
-            -->
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>setproperty</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>execute</goal>
-                        </goals>
-                        <configuration>
-                            <source>
-                                project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
-                                log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
-                            </source>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
-        <profile>
-            <id>unit-test-environment</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>skipUnitTests</name>
-                    <value>false</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- Unit Testing setup: This plugin unzips the
-                         'testEnvironment.zip' file (created by dspace-parent POM), into
-                         the 'target/testing/' folder, to essentially create a test
-                         install of DSpace, against which Tests can be run. -->
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.dspace</groupId>
-                                    <artifactId>dspace-parent</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>zip</type>
-                                    <classifier>testEnvironment</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>setupUnitTestEnvironment</id>
-                                <phase>generate-test-resources</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Run Unit Testing! This plugin just kicks off the tests (when enabled). -->
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <!-- Specify the dspace.dir to use for test environment -->
-                                <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
-                                <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace</dspace.dir>
-                                <!-- Turn off any DSpace logging -->
-                                <dspace.log.init.disable>true</dspace.log.init.disable>
-                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <!-- When running tests, also include test classes from dspace-server-webapp
-                     (this test-jar is only built when tests are enabled). -->
-                <dependency>
-                    <groupId>org.dspace</groupId>
-                    <artifactId>dspace-server-webapp</artifactId>
-                    <type>test-jar</type>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <!-- Setup the Integration Test Environment (when -DskipIntegrationTests=false) -->
-        <profile>
-            <id>integration-test-environment</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <property>
-                    <name>skipIntegrationTests</name>
-                    <value>false</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <!-- Integration Testing setup: This plugin unzips the
-                         'testEnvironment.zip' file (created by dspace-parent POM), into
-                         the 'target/testing/' folder, to essentially create a test
-                         install of DSpace, against which Tests can be run. -->
-                    <plugin>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.dspace</groupId>
-                                    <artifactId>dspace-parent</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>zip</type>
-                                    <classifier>testEnvironment</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>setupIntegrationTestEnvironment</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
-                    <plugin>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <!-- Specify the dspace.dir to use for test environment -->
-                                <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace</dspace.dir>
-                                <!-- Turn off any DSpace logging -->
-                                <dspace.log.init.disable>true</dspace.log.init.disable>
-                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <!-- When running tests, also include test classes from dspace-server-webapp
-                     (this test-jar is only built when tests are enabled). -->
-                <dependency>
-                    <groupId>org.dspace</groupId>
-                    <artifactId>dspace-server-webapp</artifactId>
-                    <type>test-jar</type>
-                    <scope>test</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>oracle-support</id>
-            <activation>
-                <property>
-                    <name>db.name</name>
-                    <value>oracle</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.oracle</groupId>
-                    <artifactId>ojdbc6</artifactId>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.dspace.modules</groupId>
-            <artifactId>additions</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-server-webapp</artifactId>
-            <classifier>classes</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-server-webapp</artifactId>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-solrj</artifactId>
-            <version>${solr.client.version}</version>
-        </dependency>
-
-        <!-- Test Dependencies -->
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-api</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-server-webapp</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <version>${spring-security.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path-assert</artifactId>
-            <version>${json-path.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- Solr Core is only needed for Integration Tests (to run a MockSolrServer) -->
-        <!-- The following Solr / Lucene dependencies also support integration tests -->
-        <dependency>
-            <groupId>org.apache.solr</groupId>
-            <artifactId>solr-core</artifactId>
-            <version>${solr.client.version}</version>
-            <scope>test</scope>
-            <exclusions>
-                <!-- Newer version brought in by opencsv -->
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-icu</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/dspace/modules/server/src/main/webapp/.gitignore b/dspace/modules/server/src/main/webapp/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/pom.xml b/pom.xml
index d30aa94e2a2c..6a0ed9272cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -798,6 +798,21 @@
             </modules>
         </profile>
 
+        <!--
+           Builds central WebApp boot for DSpace
+        -->
+        <profile>
+            <id>dspace-webapp-boot</id>
+            <activation>
+                <file>
+                    <exists>dspace-webapp-boot/pom.xml</exists>
+                </file>
+            </activation>
+            <modules>
+                <module>dspace-webapp-boot</module>
+            </modules>
+        </profile>
+
         <!--
            Builds Services for DSpace
         -->
@@ -1133,32 +1148,24 @@
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
-                <type>test-jar</type>
-                <version>cris-2022.03.01-SNAPSHOT</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-rdf</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-iiif</artifactId>
+                <artifactId>dspace-server-webapp</artifactId>
+                <type>test-jar</type>
                 <version>cris-2022.03.01-SNAPSHOT</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-server-webapp</artifactId>
+                <artifactId>dspace-rdf</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
-                <type>jar</type>
-                <classifier>classes</classifier>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-server-webapp</artifactId>
+                <artifactId>dspace-iiif</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
-                <type>war</type>
             </dependency>
             <!-- DSpace API Localization Packages -->
             <dependency>

From e9ed6d2d6327f1ce8aab8df6f498a462b37e6f56 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 15:32:59 +0100
Subject: [PATCH 02/25] [DSC-963] Fixed test configuration

---
 .../src/test/resources/application.properties | 64 +++++++++++++++++++
 .../src/main/resources/application.properties |  7 +-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 dspace-server-webapp/src/test/resources/application.properties

diff --git a/dspace-server-webapp/src/test/resources/application.properties b/dspace-server-webapp/src/test/resources/application.properties
new file mode 100644
index 000000000000..9b408d9612de
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/application.properties
@@ -0,0 +1,64 @@
+#
+# 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/
+#
+
+# Spring Boot's Test application.properties
+
+########################
+# Jackson serialization settings
+#
+spring.jackson.serialization.fail-on-empty-beans=false
+
+########################
+# Internationalization
+#
+# Base Path for our messages file (i18n)
+spring.messages.basename=i18n/messages
+spring.messages.encoding=UTF-8
+
+########################
+# URI Encoding and Decoding
+#
+#
+# Charset of HTTP requests and responses. Added to the "Content-Type" header if not set explicitly.
+server.servlet.encoding.charset=UTF-8
+# Force the encoding to the configured charset on HTTP requests and responses.
+server.servlet.encoding.force=true
+
+###########################
+# Server Properties
+#
+# Error handling settings
+server.error.include-stacktrace = never
+
+# When to include the error message in error responses (introduced in Spring 2.3.x)
+server.error.include-message = always
+
+# Spring Boot proxy configuration (can be overridden in local.cfg).
+server.forward-headers-strategy=FRAMEWORK
+
+######################
+# Cache Properties
+# Added for IIIF cache support.
+# Path to configuration file.
+spring.cache.jcache.config=classpath:iiif/cache/ehcache.xml
+
+######################
+# Spring Boot Autoconfigure
+#
+# TODO: At some point we may want to investigate whether we can re-enable these and remove the custom DSpace init code
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, \
+                             org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, \
+                             org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration, \
+                             org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration, \
+                             org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration
+
+spring.main.allow-bean-definition-overriding = true
+
+#########################
+# Spring Boot Logging levels
+logging.config = classpath:log4j2-test.xml
diff --git a/dspace-webapp-boot/src/main/resources/application.properties b/dspace-webapp-boot/src/main/resources/application.properties
index 8dd8e2903cc6..0c26d530b74c 100644
--- a/dspace-webapp-boot/src/main/resources/application.properties
+++ b/dspace-webapp-boot/src/main/resources/application.properties
@@ -27,7 +27,6 @@
 #    http://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html
 #
 
-server.servlet.context-path=/server
 ########################
 # DSpace Settings
 #
@@ -38,6 +37,12 @@ server.servlet.context-path=/server
 # NOTE: this configuration is filled out by Apache Ant during the DSpace install/update process. It does NOT
 # interact with or read its configuration from dspace.cfg.
 dspace.dir=${dspace.dir}
+
+########################
+# Servlet context path configuration for spring boot application running with embedded tomcat
+#
+server.servlet.context-path=/server
+
 ########################
 # Jackson serialization settings
 #

From 98ef4e560f9625df842cd4a5d442c9b852eff503 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 15:37:57 +0100
Subject: [PATCH 03/25] [DSC-963] Fixed dspace pom

---
 dspace/pom.xml | 6 +++++-
 pom.xml        | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dspace/pom.xml b/dspace/pom.xml
index 47ef9c46475a..e3e05f0c096b 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -217,7 +217,11 @@
                 <dependency>
                     <groupId>org.dspace</groupId>
                     <artifactId>dspace-server-webapp</artifactId>
-                    <type>war</type>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.dspace</groupId>
+                    <artifactId>dspace-webapp-boot</artifactId>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
diff --git a/pom.xml b/pom.xml
index 6a0ed9272cb2..fd6542421c77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1157,6 +1157,11 @@
                 <version>cris-2022.03.01-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.dspace</groupId>
+                <artifactId>dspace-webapp-boot</artifactId>
+                <version>cris-2022.03.01-SNAPSHOT</version>
+            </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-rdf</artifactId>

From baeab16708a01f0c6a2d32886040292288174190 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 16:14:50 +0100
Subject: [PATCH 04/25] [DSC-963] Improved tests configuration

---
 .../src/main/resources/application.properties |  0
 .../src/test/resources/application.properties | 64 -------------------
 2 files changed, 64 deletions(-)
 rename {dspace-webapp-boot => dspace-server-webapp}/src/main/resources/application.properties (100%)
 delete mode 100644 dspace-server-webapp/src/test/resources/application.properties

diff --git a/dspace-webapp-boot/src/main/resources/application.properties b/dspace-server-webapp/src/main/resources/application.properties
similarity index 100%
rename from dspace-webapp-boot/src/main/resources/application.properties
rename to dspace-server-webapp/src/main/resources/application.properties
diff --git a/dspace-server-webapp/src/test/resources/application.properties b/dspace-server-webapp/src/test/resources/application.properties
deleted file mode 100644
index 9b408d9612de..000000000000
--- a/dspace-server-webapp/src/test/resources/application.properties
+++ /dev/null
@@ -1,64 +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/
-#
-
-# Spring Boot's Test application.properties
-
-########################
-# Jackson serialization settings
-#
-spring.jackson.serialization.fail-on-empty-beans=false
-
-########################
-# Internationalization
-#
-# Base Path for our messages file (i18n)
-spring.messages.basename=i18n/messages
-spring.messages.encoding=UTF-8
-
-########################
-# URI Encoding and Decoding
-#
-#
-# Charset of HTTP requests and responses. Added to the "Content-Type" header if not set explicitly.
-server.servlet.encoding.charset=UTF-8
-# Force the encoding to the configured charset on HTTP requests and responses.
-server.servlet.encoding.force=true
-
-###########################
-# Server Properties
-#
-# Error handling settings
-server.error.include-stacktrace = never
-
-# When to include the error message in error responses (introduced in Spring 2.3.x)
-server.error.include-message = always
-
-# Spring Boot proxy configuration (can be overridden in local.cfg).
-server.forward-headers-strategy=FRAMEWORK
-
-######################
-# Cache Properties
-# Added for IIIF cache support.
-# Path to configuration file.
-spring.cache.jcache.config=classpath:iiif/cache/ehcache.xml
-
-######################
-# Spring Boot Autoconfigure
-#
-# TODO: At some point we may want to investigate whether we can re-enable these and remove the custom DSpace init code
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, \
-                             org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, \
-                             org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration, \
-                             org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration, \
-                             org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration
-
-spring.main.allow-bean-definition-overriding = true
-
-#########################
-# Spring Boot Logging levels
-logging.config = classpath:log4j2-test.xml

From 05b6251469d5873a7bda8edc27cf81b17d22e2de Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 16:42:00 +0100
Subject: [PATCH 05/25] [DSC-963] Fixed dspace-server-webapp pom

---
 dspace-server-webapp/pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index e6423a7bc8bc..fa607629e7d8 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -57,6 +57,25 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

From ab2ff11216eb38598e9fbe32ada6a496e2633f8f Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 17:39:33 +0100
Subject: [PATCH 06/25] [DSC-963] Fixed Sword tests

---
 .../src/test/java/org/dspace/app/rdf/RdfIT.java                 | 2 +-
 .../src/test/java/org/dspace/app/sword/Swordv1IT.java           | 2 +-
 .../src/test/java/org/dspace/app/sword2/Swordv2IT.java          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
index 85ab3dcadd78..10f06370ad5c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
@@ -47,7 +47,7 @@
  */
 // Ensure the RDF endpoint IS ENABLED before any tests run.
 // This annotation overrides default DSpace config settings loaded into Spring Context
-@TestPropertySource(properties = {"rdf.enabled = true"})
+@TestPropertySource(properties = {"rdf.enabled = true", "server.servlet.context-path = /"})
 public class RdfIT extends AbstractWebClientIntegrationTest {
 
     @Autowired
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java b/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java
index 24244e1773e6..ffef89316b93 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java
@@ -34,7 +34,7 @@
  */
 // Ensure the SWORD SERVER IS ENABLED before any tests run.
 // This annotation overrides default DSpace config settings loaded into Spring Context
-@TestPropertySource(properties = {"sword-server.enabled = true"})
+@TestPropertySource(properties = { "sword-server.enabled = true", "server.servlet.context-path = /" })
 public class Swordv1IT extends AbstractWebClientIntegrationTest {
 
     @Autowired
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java b/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java
index 95ec76251415..f9caeead664e 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java
@@ -34,7 +34,7 @@
  */
 // Ensure the SWORDv2 SERVER IS ENABLED before any tests run.
 // This annotation overrides default DSpace config settings loaded into Spring Context
-@TestPropertySource(properties = {"swordv2-server.enabled = true"})
+@TestPropertySource(properties = {"swordv2-server.enabled = true", "server.servlet.context-path = /"})
 public class Swordv2IT extends AbstractWebClientIntegrationTest {
 
     @Autowired

From 819bf788081dbc69c82ce050ba64aeb3a964415e Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 17:50:08 +0100
Subject: [PATCH 07/25] [DSC-963] Fixed dspace pom

---
 dspace/pom.xml |  1 +
 pom.xml        | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dspace/pom.xml b/dspace/pom.xml
index e3e05f0c096b..0dba032e688b 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -222,6 +222,7 @@
                 <dependency>
                     <groupId>org.dspace</groupId>
                     <artifactId>dspace-webapp-boot</artifactId>
+                    <type>war</type>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
diff --git a/pom.xml b/pom.xml
index fd6542421c77..e17dfbf384c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1148,29 +1148,30 @@
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
+                <type>test-jar</type>
                 <version>cris-2022.03.01-SNAPSHOT</version>
+                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-server-webapp</artifactId>
-                <type>test-jar</type>
+                <artifactId>dspace-rdf</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-webapp-boot</artifactId>
+                <artifactId>dspace-iiif</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-rdf</artifactId>
+                <artifactId>dspace-server-webapp</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
-                <artifactId>dspace-iiif</artifactId>
+                <artifactId>dspace-webapp-boot</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
+                <type>war</type>
             </dependency>
             <!-- DSpace API Localization Packages -->
             <dependency>

From 382105dfdae418eb6a238f1bfa9d968c82a58727 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 19:32:46 +0100
Subject: [PATCH 08/25] [DSC-963] Set default servlet context path on
 application-test.properties

---
 .../src/test/java/org/dspace/app/rdf/RdfIT.java               | 2 +-
 .../src/test/java/org/dspace/app/sword/Swordv1IT.java         | 2 +-
 .../src/test/java/org/dspace/app/sword2/Swordv2IT.java        | 2 +-
 .../src/test/resources/application-test.properties            | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
index 10f06370ad5c..85ab3dcadd78 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
@@ -47,7 +47,7 @@
  */
 // Ensure the RDF endpoint IS ENABLED before any tests run.
 // This annotation overrides default DSpace config settings loaded into Spring Context
-@TestPropertySource(properties = {"rdf.enabled = true", "server.servlet.context-path = /"})
+@TestPropertySource(properties = {"rdf.enabled = true"})
 public class RdfIT extends AbstractWebClientIntegrationTest {
 
     @Autowired
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java b/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java
index ffef89316b93..24244e1773e6 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/sword/Swordv1IT.java
@@ -34,7 +34,7 @@
  */
 // Ensure the SWORD SERVER IS ENABLED before any tests run.
 // This annotation overrides default DSpace config settings loaded into Spring Context
-@TestPropertySource(properties = { "sword-server.enabled = true", "server.servlet.context-path = /" })
+@TestPropertySource(properties = {"sword-server.enabled = true"})
 public class Swordv1IT extends AbstractWebClientIntegrationTest {
 
     @Autowired
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java b/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java
index f9caeead664e..95ec76251415 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/sword2/Swordv2IT.java
@@ -34,7 +34,7 @@
  */
 // Ensure the SWORDv2 SERVER IS ENABLED before any tests run.
 // This annotation overrides default DSpace config settings loaded into Spring Context
-@TestPropertySource(properties = {"swordv2-server.enabled = true", "server.servlet.context-path = /"})
+@TestPropertySource(properties = {"swordv2-server.enabled = true"})
 public class Swordv2IT extends AbstractWebClientIntegrationTest {
 
     @Autowired
diff --git a/dspace-server-webapp/src/test/resources/application-test.properties b/dspace-server-webapp/src/test/resources/application-test.properties
index 9a396cf8e5b1..e92e1166e355 100644
--- a/dspace-server-webapp/src/test/resources/application-test.properties
+++ b/dspace-server-webapp/src/test/resources/application-test.properties
@@ -14,4 +14,6 @@
 
 ## Log4j2 configuration for test environment
 ## This file is found on classpath at src/test/resources/log4j2-test.xml
-logging.config = classpath:log4j2-test.xml
\ No newline at end of file
+logging.config = classpath:log4j2-test.xml
+
+server.servlet.context-path=/
\ No newline at end of file

From 7524053a5c10071b99edf453a112ecc30f06779f Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Fri, 10 Mar 2023 20:41:07 +0100
Subject: [PATCH 09/25] [DSC-963] Improved TestApplication configuration

---
 .../test/java/org/dspace/app/{ => rest}/TestApplication.java | 5 ++---
 .../app/rest/test/AbstractControllerIntegrationTest.java     | 2 +-
 .../app/rest/test/AbstractWebClientIntegrationTest.java      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename dspace-server-webapp/src/test/java/org/dspace/app/{ => rest}/TestApplication.java (70%)

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java
similarity index 70%
rename from dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
rename to dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java
index 0f80e866edd7..e387e3f0024d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java
@@ -5,12 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app;
+package org.dspace.app.rest;
 
-import org.dspace.app.rest.WebApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
+@SpringBootApplication
 public class TestApplication {
 
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
index 4ec66fb00081..a27e0ab75c8c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.TestApplication;
+import org.dspace.app.rest.TestApplication;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
index be0a27b4ebd1..7f58a9999dd4 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
@@ -9,7 +9,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.TestApplication;
+import org.dspace.app.rest.TestApplication;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.junit.runner.RunWith;

From fa651fea6d986c7433b93e93c4bb2f531b9eefc9 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Mon, 13 Mar 2023 10:33:06 +0100
Subject: [PATCH 10/25] [DSC-963] Added @Order on
 AdminRestPermissionEvaluatorPlugin

---
 .../app/rest/security/AdminRestPermissionEvaluatorPlugin.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AdminRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AdminRestPermissionEvaluatorPlugin.java
index 0d251f6400f7..338eed4a7340 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AdminRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AdminRestPermissionEvaluatorPlugin.java
@@ -20,6 +20,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
@@ -29,6 +31,7 @@
  * the authenticated EPerson is allowed to perform the requested action.
  */
 @Component
+@Order(value = Ordered.HIGHEST_PRECEDENCE)
 public class AdminRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
     private static final Logger log = LoggerFactory.getLogger(RestObjectPermissionEvaluatorPlugin.class);

From 4436549f0b33e90de3069d38a5a5272d889db3fe Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Mon, 13 Mar 2023 11:46:20 +0100
Subject: [PATCH 11/25] [DSC-963] Minor improvements

---
 dspace-server-webapp/pom.xml                  | 31 +++++++------------
 .../org/dspace/app/rest/WebApplication.java   | 10 ++----
 .../app/{rest => }/TestApplication.java       | 11 +++++--
 .../AbstractControllerIntegrationTest.java    |  2 +-
 .../AbstractWebClientIntegrationTest.java     |  2 +-
 .../main/java/org/dspace/app/Application.java | 13 ++++++++
 dspace/config/log4j2-console.xml              |  2 +-
 7 files changed, 39 insertions(+), 32 deletions(-)
 rename dspace-server-webapp/src/test/java/org/dspace/app/{rest => }/TestApplication.java (55%)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index fa607629e7d8..c884ea7d57c1 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -28,6 +28,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <!-- Builds a *-tests.jar of all test classes -->
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin allows us to run a Groovy script in our Maven POM
                  (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
                  We are generating a OS-agnostic version (agnostic.build.dir) of
@@ -57,25 +69,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
index 213477698ac8..b04b6ebc9ee9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
@@ -43,17 +43,11 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
- * Define the Spring Boot Application settings itself. This class takes the place
- * of a web.xml file, and configures all Filters/Listeners as methods (see below).
- * <p>
- * NOTE: Requires a Servlet 3.0 container, e.g. Tomcat 7.0 or above.
- * <p>
- * NOTE: This extends SpringBootServletInitializer in order to allow us to build
- * a deployable WAR file with Spring Boot. See:
- * http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
+ * Main configuration for the dspace web module.
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  * @author Tim Donohue
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  */
 @EnableScheduling
 @EnableCaching
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java b/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
similarity index 55%
rename from dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java
rename to dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
index e387e3f0024d..8db55b6dedd1 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/TestApplication.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
@@ -5,11 +5,18 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.app.rest;
+package org.dspace.app;
 
+import org.dspace.app.rest.WebApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication
+/**
+ * Spring boot application for integration tests.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
 public class TestApplication {
 
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
index a27e0ab75c8c..4ec66fb00081 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractControllerIntegrationTest.java
@@ -23,7 +23,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.rest.TestApplication;
+import org.dspace.app.TestApplication;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
index 7f58a9999dd4..be0a27b4ebd1 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/AbstractWebClientIntegrationTest.java
@@ -9,7 +9,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
-import org.dspace.app.rest.TestApplication;
+import org.dspace.app.TestApplication;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.junit.runner.RunWith;
diff --git a/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java b/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
index 90039887f862..dc84b29a5620 100644
--- a/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
+++ b/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
@@ -14,6 +14,19 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
+/**
+ * Define the Spring Boot Application settings itself. This class takes the place
+ * of a web.xml file, and configures all Filters/Listeners as methods (see below).
+ * <p>
+ * NOTE: Requires a Servlet 3.0 container, e.g. Tomcat 7.0 or above.
+ * <p>
+ * NOTE: This extends SpringBootServletInitializer in order to allow us to build
+ * a deployable WAR file with Spring Boot. See:
+ * http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
 @SpringBootApplication(scanBasePackageClasses = WebApplication.class)
 public class Application extends SpringBootServletInitializer {
 
diff --git a/dspace/config/log4j2-console.xml b/dspace/config/log4j2-console.xml
index a0322abf19d3..3d51b123367b 100644
--- a/dspace/config/log4j2-console.xml
+++ b/dspace/config/log4j2-console.xml
@@ -25,7 +25,7 @@
          For command line / Ant scripts, we are only concerned about significant warnings/errors.
          For the full detail, change this to INFO and re-run Ant. -->
     <Loggers>
-        <Root level='INFO'>
+        <Root level='WARN'>
             <AppenderRef ref='A1'/>
         </Root>
     </Loggers>

From 5cd9476fb812c56e0fe44b04d82ec1e73c857bbf Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Mon, 13 Mar 2023 17:44:07 +0100
Subject: [PATCH 12/25] [DSC-963] Fixed ItemRestRepositoryIT and
 GenericAuthorizationFeatureIT integration tests

---
 .../ExternalSourceItemUriListHandler.java      |  8 +++++---
 .../GenericAuthorizationFeatureIT.java         | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceItemUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceItemUriListHandler.java
index d619100bf67a..201a7ba1633d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceItemUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceItemUriListHandler.java
@@ -30,16 +30,19 @@
 @Component
 public class ExternalSourceItemUriListHandler extends ExternalSourceEntryItemUriListHandler<Item> {
 
+    private Pattern pattern = Pattern.compile("\\/api\\/core\\/items\\/(.*)");
+
     @Autowired
     private ItemService itemService;
 
     @Override
     @SuppressWarnings("rawtypes")
     public boolean supports(List<String> uriList, String method,Class clazz) {
-        if (clazz != Item.class) {
+        if (clazz != Item.class || uriList.size() != 1) {
             return false;
         }
-        return true;
+
+        return pattern.matcher(uriList.get(0)).find();
     }
 
     @Override
@@ -61,7 +64,6 @@ public boolean validate(Context context, HttpServletRequest request, List<String
     private Item getObjectFromUriList(Context context, List<String> uriList) {
         Item item = null;
         String url = uriList.get(0);
-        Pattern pattern = Pattern.compile("\\/api\\/core\\/items\\/(.*)");
         Matcher matcher = pattern.matcher(url);
         if (!matcher.find()) {
             throw new DSpaceBadRequestException("The uri: " + url + " doesn't resolve to an item");
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
index 1d3b5b051605..e6ccf5954c7a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
@@ -757,7 +757,8 @@ public void testCanMoveAdmin() throws Exception {
         // Verify the general admin has this feature on item 1
         getClient(adminToken).perform(
             get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+                + "http://localhost/api/core/items/" + item1.getID())
+            .param("size", "1000"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -765,7 +766,8 @@ public void testCanMoveAdmin() throws Exception {
         // Verify community A admin has this feature on item 1
         getClient(communityAAdminToken).perform(
             get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+                + "http://localhost/api/core/items/" + item1.getID())
+            .param("size", "1000"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -773,7 +775,8 @@ public void testCanMoveAdmin() throws Exception {
         // Verify collection X admin has this feature on item 1
         getClient(collectionXAdminToken).perform(
             get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+                + "http://localhost/api/core/items/" + item1.getID())
+            .param("size", "1000"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -781,7 +784,8 @@ public void testCanMoveAdmin() throws Exception {
         // Verify item 1 admin doesn’t have this feature on item 1
         getClient(item1AdminToken).perform(
             get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+                + "http://localhost/api/core/items/" + item1.getID())
+            .param("size", "1000"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -789,7 +793,8 @@ public void testCanMoveAdmin() throws Exception {
         // Verify community A admin doesn’t have this feature on item 2
         getClient(communityAAdminToken).perform(
             get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID()))
+                + "http://localhost/api/core/items/" + item2.getID())
+            .param("size", "1000"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -808,7 +813,8 @@ public void testCanMoveAdmin() throws Exception {
         // verify item 1 write has this feature on item 1
         getClient(item1WriterToken).perform(
             get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+                + "http://localhost/api/core/items/" + item1.getID())
+            .param("size", "1000"))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canMove')]")
                 .exists());

From 4c303770d56ef863155d03c74c54267324f82172 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Tue, 14 Mar 2023 11:31:12 +0100
Subject: [PATCH 13/25] [DSC-963] Added size parameter on
 GenericAuthorizationFeatureIT tests

---
 .../GenericAuthorizationFeatureIT.java        | 340 ++++++++++--------
 1 file changed, 188 insertions(+), 152 deletions(-)

diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
index e6ccf5954c7a..d59ef00018b1 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
@@ -209,7 +209,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
         String siteId = ContentServiceFactory.getInstance().getSiteService().findSite(context).getID().toString();
 
         // Verify the general admin has this feature on the site
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/sites/" + siteId))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -217,14 +217,14 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin doesn’t have this feature on the site
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/sites/" + siteId))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on community A
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -232,7 +232,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin has this feature on community A
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -240,7 +240,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin has this feature on community AA
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -248,7 +248,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify collection X admin doesn’t have this feature on community A
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -256,7 +256,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin doesn’t have this feature on community B
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityB.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -264,7 +264,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify the general admin has this feature on collection X
         getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -272,7 +272,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin has this feature on collection X
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -280,7 +280,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify collection X admin has this feature on collection X
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -288,7 +288,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin doesn’t have this feature on collection X
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -296,7 +296,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify collection X admin doesn’t have this feature on collection Y
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionY.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -304,7 +304,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify the general admin has this feature on item 1
         getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -312,7 +312,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin has this feature on item 1
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -320,7 +320,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify collection X admin has this feature on item 1
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -328,7 +328,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin has this feature on item 1
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -336,7 +336,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin doesn’t have this feature on item 2
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -344,7 +344,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify the general admin has this feature on the bundle in item 1
         getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -352,7 +352,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin has this feature on the bundle in item 1
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -360,7 +360,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify collection X admin has this feature on the bundle in item 1
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -368,7 +368,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin has this feature on the bundle in item 1
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -376,7 +376,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin doesn’t have this feature on the bundle in item 2
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -384,7 +384,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify the general admin has this feature on the bitstream in item 1
         getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -392,7 +392,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify community A admin has this feature on the bitstream in item 1
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -400,7 +400,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify collection X admin has this feature on the bitstream in item 1
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -408,7 +408,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin has this feature on the bitstream in item 1
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -416,7 +416,7 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
 
         // Verify item 1 admin doesn’t have this feature on the bitstream in item 2
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -431,7 +431,7 @@ private void testAdminsHavePermissionsItem(String feature) throws Exception {
 
         // Verify the general admin has this feature on item 1
         getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -439,7 +439,7 @@ private void testAdminsHavePermissionsItem(String feature) throws Exception {
 
         // Verify community A admin has this feature on item 1
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -447,7 +447,7 @@ private void testAdminsHavePermissionsItem(String feature) throws Exception {
 
         // Verify collection X admin has this feature on item 1
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -455,7 +455,7 @@ private void testAdminsHavePermissionsItem(String feature) throws Exception {
 
         // Verify item 1 admin has this feature on item 1
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -463,7 +463,7 @@ private void testAdminsHavePermissionsItem(String feature) throws Exception {
 
         // Verify community A admin doesn’t have this feature on item 2
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -480,14 +480,14 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
             getClient(communityAWriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/communities/" + communityA.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
             getClient(communityAWriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/communities/" + communityA.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -496,7 +496,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify community A write doesn’t have this feature on community AA
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -504,7 +504,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify community A write doesn’t have this feature on collection X
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -512,7 +512,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify community A write doesn’t have this feature on item 1
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -520,7 +520,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify community A write doesn’t have this feature on the bundle in item 1
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -528,7 +528,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify community A write doesn’t have this feature on the bitstream in item 1
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -536,7 +536,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify collection X write doesn’t have this feature on community A
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -544,7 +544,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify collection X write doesn’t have this feature on community AA
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -554,14 +554,14 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
             getClient(collectionXWriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/collections/" + collectionX.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
             getClient(collectionXWriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/collections/" + collectionX.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -570,7 +570,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify collection X write doesn’t have this feature on item 1
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -578,7 +578,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify collection X write doesn’t have this feature on the bundle in item 1
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -586,7 +586,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify collection X write doesn’t have this feature on the bitstream in item 1
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -594,7 +594,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify item 1 write doesn’t have this feature on community A
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -602,7 +602,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify item 1 write doesn’t have this feature on community AA
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -610,7 +610,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify item 1 write doesn’t have this feature on collection X
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -620,14 +620,14 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
             getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/items/" + item1.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
             getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/items/" + item1.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -636,7 +636,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify item 1 write doesn’t have this feature on the bundle in item 1
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -644,7 +644,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify item 1 write doesn’t have this feature on the bitstream in item 1
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -652,7 +652,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify community A write doesn’t have this feature on community B
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/communities/" + communityB.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -660,7 +660,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify collection X write doesn’t have this feature on collection Y
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/collections/" + collectionY.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -668,7 +668,7 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
 
         // Verify item 1 write doesn’t have this feature on item 2
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -682,7 +682,7 @@ private void testWriteUsersHavePermissionsItem(String feature, boolean hasDSOAcc
 
         // Verify community A write doesn’t have this feature on item 1
         getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -690,7 +690,7 @@ private void testWriteUsersHavePermissionsItem(String feature, boolean hasDSOAcc
 
         // Verify collection X write doesn’t have this feature on item 1
         getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -700,14 +700,14 @@ private void testWriteUsersHavePermissionsItem(String feature, boolean hasDSOAcc
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
             getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/items/" + item1.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
             getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?embed=feature&uri="
+                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                     + "http://localhost/api/core/items/" + item1.getID()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -716,7 +716,7 @@ private void testWriteUsersHavePermissionsItem(String feature, boolean hasDSOAcc
 
         // Verify item 1 write doesn’t have this feature on item 2
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -756,45 +756,40 @@ public void testCanMoveAdmin() throws Exception {
 
         // Verify the general admin has this feature on item 1
         getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID())
-            .param("size", "1000"))
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
+                + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on item 1
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID())
-            .param("size", "1000"))
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
+                + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on item 1
         getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID())
-            .param("size", "1000"))
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
+                + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on item 1
         getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID())
-            .param("size", "1000"))
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
+                + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A admin doesn’t have this feature on item 2
         getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID())
-            .param("size", "1000"))
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
+                + "http://localhost/api/core/items/" + item2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -812,9 +807,8 @@ public void testCanMoveAdmin() throws Exception {
 
         // verify item 1 write has this feature on item 1
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID())
-            .param("size", "1000"))
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
+                + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canMove')]")
                 .exists());
@@ -836,7 +830,7 @@ public void testCanMoveWriter() throws Exception {
         String item1WriterToken = getAuthToken(item1Writer.getEmail(), password);
         // verify item 1 write has this feature on item 1
         getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
                 + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canMove')]")
@@ -873,28 +867,30 @@ public void testCanDeleteAdmin() throws Exception {
         final String feature = "canDelete";
 
         // Verify the general admin doesn’t have this feature on the site
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/sites/" + siteId))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on community A
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on community A
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on community AA
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -914,161 +910,173 @@ public void testCanDeleteAdmin() throws Exception {
             .build();
         context.restoreAuthSystemState();
         String communityAAAdminToken = getAuthToken(communityAAAdmin.getEmail(), password);
-        getClient(communityAAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X admin doesn’t have this feature on community A
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A admin doesn’t have this feature on community B
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityB.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on collection X
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on collection X
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin doesn’t have this feature on collection X
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 admin doesn’t have this feature on collection X
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X admin doesn’t have this feature on collection Y
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionY.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on item 1
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on item 1
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 admin doesn’t have this feature on item 2
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on the bundle in item 2
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on the bitstream in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bitstream in item 1
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bitstream in item 1
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bitstream in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on the bitstream in item 2
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1096,7 +1104,8 @@ public void testCanDeleteAdminParent() throws Exception {
         context.restoreAuthSystemState();
         String communityAAAdminToken = getAuthToken(communityAAAdmin.getEmail(), password);
         //verify the community AA admin has this feature on community AA
-        getClient(communityAAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1111,7 +1120,8 @@ public void testCanDeleteAdminParent() throws Exception {
             .build();
         context.restoreAuthSystemState();
         // verify collection X admin has this feature on collection X
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1126,7 +1136,7 @@ public void testCanDeleteAdminParent() throws Exception {
             .build();
         context.restoreAuthSystemState();
         // verify item 1 admin has this feature on item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1157,13 +1167,15 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String communityADeleterToken = getAuthToken(communityADeleter.getEmail(), password);
         // Verify the user has this feature on community A
-        getClient(communityADeleterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityADeleterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on community AA
-        getClient(communityADeleterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityADeleterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1185,19 +1197,22 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String communityARemoverToken = getAuthToken(communityARemover.getEmail(), password);
         // Verify the user has this feature on community AA
-        getClient(communityARemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityARemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on community A
-        getClient(communityARemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityARemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on collection X
-        getClient(communityARemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityARemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1218,19 +1233,22 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String communityAARemoverToken = getAuthToken(communityAARemover.getEmail(), password);
         // Verify the user has this feature on collection X
-        getClient(communityAARemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAARemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on community AA
-        getClient(communityAARemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAARemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/communities/" + communityAA.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on item 1
-        getClient(communityAARemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAARemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1251,7 +1269,8 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String collectionXRemoverToken = getAuthToken(collectionXRemover.getEmail(), password);
         // Verify the user doesn’t have this feature on item 1
-        getClient(collectionXRemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXRemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1272,7 +1291,7 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String item1DeleterToken = getAuthToken(item1Deleter.getEmail(), password);
         // Verify the user doesn’t have this feature on item 1
-        getClient(item1DeleterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1DeleterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1299,21 +1318,21 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         String collectionXRemoverItem1DeleterToken = getAuthToken(collectionXRemoverItem1Deleter.getEmail(), password);
         // Verify the user has this feature on item 1
         getClient(collectionXRemoverItem1DeleterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on collection X
         getClient(collectionXRemoverItem1DeleterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/collections/" + collectionX.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on the bundle in item 1
         getClient(collectionXRemoverItem1DeleterToken).perform(
-            get("/api/authz/authorizations/search/object?embed=feature&uri="
+            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1334,19 +1353,19 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String item1RemoverToken = getAuthToken(item1Remover.getEmail(), password);
         // Verify the user has this feature on the bundle in item 1
-        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on item 1
-        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on the bitstream in item 1
-        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1367,7 +1386,8 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String bundle1RemoverToken = getAuthToken(bundle1Remover.getEmail(), password);
         // Verify the user doesn’t have this feature on the bitstream in item 1
-        getClient(bundle1RemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(bundle1RemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1394,7 +1414,8 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String bundle1item1RemoverToken = getAuthToken(bundle1item1Remover.getEmail(), password);
         // Verify the user has this feature on the bitstream in item 1
-        getClient(bundle1item1RemoverToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(bundle1item1RemoverToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1410,35 +1431,38 @@ public void testCanReorderBitstreamsAdmin() throws Exception {
         final String feature = "canReorderBitstreams";
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin doesn’t have this feature on the bundle in item 2
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1453,19 +1477,21 @@ public void testCanReorderBitstreamsWriter() throws Exception {
         final String feature = "canReorderBitstreams";
 
         // Verify community A write doesn’t have this feature on the bundle in item 1
-        getClient(communityAWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify collection X write doesn’t have this feature on the bundle in item 1
-        getClient(collectionXWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify item 1 write doesn’t have this feature on the bundle in item 1
-        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1473,7 +1499,8 @@ public void testCanReorderBitstreamsWriter() throws Exception {
 
         // Create a new user, grant WRITE permissions on the bundle in item 1 to this user
         // Verify the user has this feature on the bundle in item 1
-        getClient(communityAWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1489,35 +1516,38 @@ public void testCanCreateBitstreamAdmin() throws Exception {
         final String feature = "canCreateBitstream";
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin doesn’t have this feature on the bundle in item 2
-        getClient(communityAAdminToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAAdminToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle2.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1532,21 +1562,23 @@ public void testCanCreateBitstreamWriter() throws Exception {
         final String feature = "canCreateBitstream";
 
         // Verify community A write doesn’t have this feature on the bundle in item 1
-        getClient(communityAWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on the bundle in item 1
-        getClient(collectionXWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on the bundle in item 1
-        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1567,7 +1599,7 @@ public void testCanCreateBitstreamWriter() throws Exception {
         context.restoreAuthSystemState();
         String bundle1WriterToken = getAuthToken(bundle1Writer.getEmail(), password);
         // Verify the user doesn’t have this feature on the bundle in item 1
-        getClient(bundle1WriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(bundle1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1588,7 +1620,7 @@ public void testCanCreateBitstreamWriter() throws Exception {
         context.restoreAuthSystemState();
         String bundle1AdderToken = getAuthToken(bundle1Adder.getEmail(), password);
         // Verify the user doesn’t have this feature on the bundle in item 1
-        getClient(bundle1AdderToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(bundle1AdderToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1625,7 +1657,8 @@ public void testCanCreateBitstreamWriter() throws Exception {
         context.restoreAuthSystemState();
         String bundle1WriterAdderToken = getAuthToken(bundle1WriterAdder.getEmail(), password);
         // Verify the user has this feature on the bundle in item 1
-        getClient(bundle1WriterAdderToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(bundle1WriterAdderToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/bundles/" + bundle1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1645,21 +1678,23 @@ public void testCanCreateBundleWriter() throws Exception {
         final String feature = "canCreateBundle";
 
         // Verify community A write doesn’t have this feature on item 1
-        getClient(communityAWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(communityAWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on item 1
-        getClient(collectionXWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(collectionXWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on item 1
-        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
@@ -1685,7 +1720,8 @@ public void testCanCreateBundleWriter() throws Exception {
         context.restoreAuthSystemState();
         String item1AdderWriterToken = getAuthToken(item1AdderWriter.getEmail(), password);
         // Verify the user has this feature on item 1
-        getClient(item1AdderWriterToken).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
+        getClient(item1AdderWriterToken)
+            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
             + "http://localhost/api/core/items/" + item1.getID()))
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"

From 76fdd16a9b3d374c3fe7f47f8e732bd9fd57025b Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Tue, 14 Mar 2023 12:57:50 +0100
Subject: [PATCH 14/25] [DSC-963] Fixed SubmissionCCLicenseUrlRepositoryIT
 tests

---
 .../org/dspace/app/rest/link/DSpaceResourceHalLinkFactory.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/DSpaceResourceHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/DSpaceResourceHalLinkFactory.java
index c306691eb352..30404e030ab6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/DSpaceResourceHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/DSpaceResourceHalLinkFactory.java
@@ -21,6 +21,8 @@
 import org.dspace.app.rest.model.hateoas.DSpaceResource;
 import org.dspace.app.rest.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.data.domain.Pageable;
 import org.springframework.hateoas.IanaLinkRelations;
 import org.springframework.hateoas.Link;
@@ -33,6 +35,7 @@
  * @author Tom Desair (tom dot desair at atmire dot com)
  */
 @Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class DSpaceResourceHalLinkFactory extends HalLinkFactory<DSpaceResource, RestResourceController> {
 
     @Autowired

From fd955c49884073474842fb75d4ced2761207f83e Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Tue, 14 Mar 2023 17:12:09 +0100
Subject: [PATCH 15/25] [DSC-963] Refactoring to maintain server module

---
 dspace-server-webapp/pom.xml                  |  17 +
 .../src/main/resources/static/index.html      |   0
 .../resources/static/js/hal/http/client.js    |   0
 .../static/js/vendor/CustomPostForm.js        |   0
 .../src/main/resources/static/login.html      |   0
 .../src/main/resources/static/styles.css      |   0
 dspace/modules/pom.xml                        |  11 +
 .../modules/server-boot}/pom.xml              |  28 +-
 .../org/dspace/app/ServerBootApplication.java |  36 ++
 dspace/modules/server/pom.xml                 | 349 ++++++++++++++++++
 .../org/dspace/app/ServerApplication.java     |  10 +-
 .../modules/server/src/main/webapp/.gitignore |   0
 .../app/rest/example/ExampleController.java   |   0
 .../app/rest/example/ExampleControllerIT.java |   0
 dspace/pom.xml                                |   6 -
 pom.xml                                       |  21 --
 16 files changed, 419 insertions(+), 59 deletions(-)
 rename {dspace-webapp-boot => dspace-server-webapp}/src/main/resources/static/index.html (100%)
 rename {dspace-webapp-boot => dspace-server-webapp}/src/main/resources/static/js/hal/http/client.js (100%)
 rename {dspace-webapp-boot => dspace-server-webapp}/src/main/resources/static/js/vendor/CustomPostForm.js (100%)
 rename {dspace-webapp-boot => dspace-server-webapp}/src/main/resources/static/login.html (100%)
 rename {dspace-webapp-boot => dspace-server-webapp}/src/main/resources/static/styles.css (100%)
 rename {dspace-webapp-boot => dspace/modules/server-boot}/pom.xml (73%)
 create mode 100644 dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
 create mode 100644 dspace/modules/server/pom.xml
 rename dspace-webapp-boot/src/main/java/org/dspace/app/Application.java => dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java (85%)
 create mode 100644 dspace/modules/server/src/main/webapp/.gitignore
 rename {dspace-webapp-boot => dspace/modules/server}/src/test/java/org/dspace/app/rest/example/ExampleController.java (100%)
 rename {dspace-webapp-boot => dspace/modules/server}/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java (100%)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index c884ea7d57c1..0d3458199d37 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -40,6 +40,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- Verify OS license headers for all source code files -->
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/src/test/resources/**</exclude>
+                        <exclude>**/src/test/data/**</exclude>
+                        <!--Skip license check of third party files included/customized from HAL Browser -->
+                        <exclude>src/main/resources/static/index.html</exclude>
+                        <exclude>src/main/resources/static/login.html</exclude>
+                        <exclude>src/main/resources/static/styles.css</exclude>
+                        <exclude>src/main/resources/static/js/hal/**</exclude>
+                        <exclude>src/main/resources/static/js/vendor/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
             <!-- This plugin allows us to run a Groovy script in our Maven POM
                  (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
                  We are generating a OS-agnostic version (agnostic.build.dir) of
diff --git a/dspace-webapp-boot/src/main/resources/static/index.html b/dspace-server-webapp/src/main/resources/static/index.html
similarity index 100%
rename from dspace-webapp-boot/src/main/resources/static/index.html
rename to dspace-server-webapp/src/main/resources/static/index.html
diff --git a/dspace-webapp-boot/src/main/resources/static/js/hal/http/client.js b/dspace-server-webapp/src/main/resources/static/js/hal/http/client.js
similarity index 100%
rename from dspace-webapp-boot/src/main/resources/static/js/hal/http/client.js
rename to dspace-server-webapp/src/main/resources/static/js/hal/http/client.js
diff --git a/dspace-webapp-boot/src/main/resources/static/js/vendor/CustomPostForm.js b/dspace-server-webapp/src/main/resources/static/js/vendor/CustomPostForm.js
similarity index 100%
rename from dspace-webapp-boot/src/main/resources/static/js/vendor/CustomPostForm.js
rename to dspace-server-webapp/src/main/resources/static/js/vendor/CustomPostForm.js
diff --git a/dspace-webapp-boot/src/main/resources/static/login.html b/dspace-server-webapp/src/main/resources/static/login.html
similarity index 100%
rename from dspace-webapp-boot/src/main/resources/static/login.html
rename to dspace-server-webapp/src/main/resources/static/login.html
diff --git a/dspace-webapp-boot/src/main/resources/static/styles.css b/dspace-server-webapp/src/main/resources/static/styles.css
similarity index 100%
rename from dspace-webapp-boot/src/main/resources/static/styles.css
rename to dspace-server-webapp/src/main/resources/static/styles.css
diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml
index f18f2c09c7b3..0cf13c7f31cc 100644
--- a/dspace/modules/pom.xml
+++ b/dspace/modules/pom.xml
@@ -64,5 +64,16 @@
                 <module>server</module>
             </modules>
         </profile>
+        <profile>
+            <id>dspace-server-webapp-boot</id>
+            <activation>
+                <file>
+                    <exists>server-boot/pom.xml</exists>
+                </file>
+            </activation>
+            <modules>
+                <module>server-boot</module>
+            </modules>
+        </profile>
     </profiles>
 </project>
diff --git a/dspace-webapp-boot/pom.xml b/dspace/modules/server-boot/pom.xml
similarity index 73%
rename from dspace-webapp-boot/pom.xml
rename to dspace/modules/server-boot/pom.xml
index 1a110886cf42..313cf0e78f62 100644
--- a/dspace-webapp-boot/pom.xml
+++ b/dspace/modules/server-boot/pom.xml
@@ -1,26 +1,23 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dspace</groupId>
-    <artifactId>dspace-webapp-boot</artifactId>
-    <packaging>war</packaging>
-    <name>DSpace WebApplication Boot</name>
+    <artifactId>server-boot</artifactId>
+    <name>DSpace Server Webapp:: Boot</name>
 
     <!--
       A Parent POM that Maven inherits DSpace Default
       POM attributes from.
     -->
     <parent>
+        <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <artifactId>dspace-parent</artifactId>
         <version>cris-2022.03.01-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
     <properties>
         <!-- This is the path to the root [dspace-src] directory. -->
-        <root.basedir>${basedir}/..</root.basedir>
-        <!-- Default resource delimiter for Spring Boot, so it doesn't clash with Spring ${} placeholders-->
-        <resource.delimiter>@</resource.delimiter>
+        <root.basedir>${basedir}/../../..</root.basedir>
     </properties>
 
     <dependencies>
@@ -108,23 +105,6 @@
     
     <build>
         <plugins>
-            <!-- Verify OS license headers for all source code files -->
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <exclude>**/src/test/resources/**</exclude>
-                        <exclude>**/src/test/data/**</exclude>
-                        <!--Skip license check of third party files included/customized from HAL Browser -->
-                        <exclude>src/main/resources/static/index.html</exclude>
-                        <exclude>src/main/resources/static/login.html</exclude>
-                        <exclude>src/main/resources/static/styles.css</exclude>
-                        <exclude>src/main/resources/static/js/hal/**</exclude>
-                        <exclude>src/main/resources/static/js/vendor/**</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java b/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
new file mode 100644
index 000000000000..f46532ff14b5
--- /dev/null
+++ b/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
@@ -0,0 +1,36 @@
+/**
+ * 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;
+
+import org.dspace.app.rest.WebApplication;
+import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
+import org.dspace.app.rest.utils.DSpaceKernelInitializer;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+
+/**
+ * Define the Spring Boot Application settings itself to be runned using an
+ * embedded application server.
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
+public class ServerBootApplication {
+
+    private ServerBootApplication() {
+
+    }
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(ServerBootApplication.class)
+            .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer())
+            .run(args);
+    }
+
+}
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
new file mode 100644
index 000000000000..65849295e8c4
--- /dev/null
+++ b/dspace/modules/server/pom.xml
@@ -0,0 +1,349 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.dspace.modules</groupId>
+    <artifactId>server</artifactId>
+    <packaging>war</packaging>
+    <name>DSpace Server Webapp:: Local Customizations</name>
+    <parent>
+        <artifactId>modules</artifactId>
+        <groupId>org.dspace</groupId>
+        <version>cris-2022.03.01-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <properties>
+        <!-- This is the path to the root [dspace-src] directory. -->
+        <root.basedir>${basedir}/../../..</root.basedir>
+    </properties>
+
+    <build>
+        <plugins>
+            <!-- Unpack the "additions" module into our target directory,
+                 so that any custom classes in that module can be included
+                 into this WAR's WEB-INF/classes (see maven-war-plugin below). -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeGroupIds>org.dspace.modules</includeGroupIds>
+                            <includeArtifactIds>additions</includeArtifactIds>
+                            <!--NOTE: by default this will also unpack transitive dependencies. To disable, uncomment this next line:
+                            <excludeTransitive>true</excludeTransitive>
+                            -->
+                            <outputDirectory>${project.build.directory}/additions</outputDirectory>
+                            <excludes>META-INF/**</excludes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archiveClasses>false</archiveClasses>
+                    <!-- Filter the web.xml (needed for IDE compatibility/debugging) -->
+                    <filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
+                    <!-- Copy any 'additions' (see m-dependency-p above) into WEB-INF/classes.
+                         This ensures they are loaded prior to dependencies in WEB-INF/lib
+                         (per Servlet 3.0 spec, section 10.5), and allows them to override
+                         default classes in this WAR -->
+                    <webResources>
+                        <resource>
+                            <directory>${project.build.directory}/additions</directory>
+                            <targetPath>WEB-INF/classes</targetPath>
+                        </resource>
+                    </webResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- This plugin allows us to run a Groovy script in our Maven POM
+                 (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
+                 We are generating a OS-agnostic version (agnostic.build.dir) of
+                 the ${project.build.directory} property (full path of target dir).
+                 This is needed by the Surefire & Failsafe plugins (see below)
+                 to initialize the Unit Test environment's dspace.cfg file.
+                 Otherwise, the Unit Test Framework will not work on Windows OS.
+                 This Groovy code was mostly borrowed from:
+                 http://stackoverflow.com/questions/3872355/how-to-convert-file-separator-in-maven
+            -->
+            <plugin>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>setproperty</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                project.properties['agnostic.build.dir'] = project.build.directory.replace(File.separator, '/');
+                                log.info("Initializing Maven property 'agnostic.build.dir' to: {}", project.properties['agnostic.build.dir']);
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <!-- Setup the Unit Test Environment (when -DskipUnitTests=false) -->
+        <profile>
+            <id>unit-test-environment</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipUnitTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Unit Testing setup: This plugin unzips the
+                         'testEnvironment.zip' file (created by dspace-parent POM), into
+                         the 'target/testing/' folder, to essentially create a test
+                         install of DSpace, against which Tests can be run. -->
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>testEnvironment</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setupUnitTestEnvironment</id>
+                                <phase>generate-test-resources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Run Unit Testing! This plugin just kicks off the tests (when enabled). -->
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <!-- Specify the dspace.dir to use for test environment -->
+                                <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
+                                <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
+                                <dspace.dir>${agnostic.build.dir}/testing/dspace</dspace.dir>
+                                <!-- Turn off any DSpace logging -->
+                                <dspace.log.init.disable>true</dspace.log.init.disable>
+                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <!-- When running tests, also include test classes from dspace-server-webapp
+                     (this test-jar is only built when tests are enabled). -->
+                <dependency>
+                    <groupId>org.dspace</groupId>
+                    <artifactId>dspace-server-webapp</artifactId>
+                    <type>test-jar</type>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <!-- Setup the Integration Test Environment (when -DskipIntegrationTests=false) -->
+        <profile>
+            <id>integration-test-environment</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>skipIntegrationTests</name>
+                    <value>false</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Integration Testing setup: This plugin unzips the
+                         'testEnvironment.zip' file (created by dspace-parent POM), into
+                         the 'target/testing/' folder, to essentially create a test
+                         install of DSpace, against which Tests can be run. -->
+                    <plugin>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/testing</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.dspace</groupId>
+                                    <artifactId>dspace-parent</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <classifier>testEnvironment</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>setupIntegrationTestEnvironment</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Run Integration Testing! This plugin just kicks off the tests (when enabled). -->
+                    <plugin>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <!-- Specify the dspace.dir to use for test environment -->
+                                <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
+                                <dspace.dir>${agnostic.build.dir}/testing/dspace</dspace.dir>
+                                <!-- Turn off any DSpace logging -->
+                                <dspace.log.init.disable>true</dspace.log.init.disable>
+                                <solr.install.dir>${agnostic.build.dir}/testing/dspace/solr/</solr.install.dir>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <!-- When running tests, also include test classes from dspace-server-webapp
+                     (this test-jar is only built when tests are enabled). -->
+                <dependency>
+                    <groupId>org.dspace</groupId>
+                    <artifactId>dspace-server-webapp</artifactId>
+                    <type>test-jar</type>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>oracle-support</id>
+            <activation>
+                <property>
+                    <name>db.name</name>
+                    <value>oracle</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>com.oracle</groupId>
+                    <artifactId>ojdbc6</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dspace.modules</groupId>
+            <artifactId>additions</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-server-webapp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+            <version>${spring-boot.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-solrj</artifactId>
+            <version>${solr.client.version}</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-api</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.dspace</groupId>
+            <artifactId>dspace-server-webapp</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <version>${spring-security.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path-assert</artifactId>
+            <version>${json-path.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Solr Core is only needed for Integration Tests (to run a MockSolrServer) -->
+        <!-- The following Solr / Lucene dependencies also support integration tests -->
+        <dependency>
+            <groupId>org.apache.solr</groupId>
+            <artifactId>solr-core</artifactId>
+            <version>${solr.client.version}</version>
+            <scope>test</scope>
+            <exclusions>
+                <!-- Newer version brought in by opencsv -->
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-text</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-analyzers-icu</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java b/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java
similarity index 85%
rename from dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
rename to dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java
index dc84b29a5620..34acc778b7f3 100644
--- a/dspace-webapp-boot/src/main/java/org/dspace/app/Application.java
+++ b/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java
@@ -28,13 +28,7 @@
  *
  */
 @SpringBootApplication(scanBasePackageClasses = WebApplication.class)
-public class Application extends SpringBootServletInitializer {
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class)
-            .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer())
-            .run(args);
-    }
+public class ServerApplication extends SpringBootServletInitializer {
 
     /**
      * Override the default SpringBootServletInitializer.configure() method,
@@ -52,7 +46,7 @@ public static void main(String[] args) {
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         // Pass this Application class, and our initializers for DSpace Kernel and Configuration
         // NOTE: Kernel must be initialized before Configuration
-        return application.sources(Application.class)
+        return application.sources(ServerApplication.class)
                           .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer());
     }
 }
diff --git a/dspace/modules/server/src/main/webapp/.gitignore b/dspace/modules/server/src/main/webapp/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleController.java b/dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleController.java
similarity index 100%
rename from dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleController.java
rename to dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleController.java
diff --git a/dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java b/dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java
similarity index 100%
rename from dspace-webapp-boot/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java
rename to dspace/modules/server/src/test/java/org/dspace/app/rest/example/ExampleControllerIT.java
diff --git a/dspace/pom.xml b/dspace/pom.xml
index 0dba032e688b..d5e7108fa52e 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -219,12 +219,6 @@
                     <artifactId>dspace-server-webapp</artifactId>
                     <scope>compile</scope>
                 </dependency>
-                <dependency>
-                    <groupId>org.dspace</groupId>
-                    <artifactId>dspace-webapp-boot</artifactId>
-                    <type>war</type>
-                    <scope>compile</scope>
-                </dependency>
                 <dependency>
                     <groupId>org.dspace</groupId>
                     <artifactId>dspace-sword</artifactId>
diff --git a/pom.xml b/pom.xml
index e17dfbf384c0..a5d5b12f079f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -798,21 +798,6 @@
             </modules>
         </profile>
 
-        <!--
-           Builds central WebApp boot for DSpace
-        -->
-        <profile>
-            <id>dspace-webapp-boot</id>
-            <activation>
-                <file>
-                    <exists>dspace-webapp-boot/pom.xml</exists>
-                </file>
-            </activation>
-            <modules>
-                <module>dspace-webapp-boot</module>
-            </modules>
-        </profile>
-
         <!--
            Builds Services for DSpace
         -->
@@ -1167,12 +1152,6 @@
                 <artifactId>dspace-server-webapp</artifactId>
                 <version>cris-2022.03.01-SNAPSHOT</version>
             </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-webapp-boot</artifactId>
-                <version>cris-2022.03.01-SNAPSHOT</version>
-                <type>war</type>
-            </dependency>
             <!-- DSpace API Localization Packages -->
             <dependency>
                 <groupId>org.dspace</groupId>

From 47fc9169179d738739cd9d0a56b51bc852a6e6b6 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Tue, 14 Mar 2023 18:36:50 +0100
Subject: [PATCH 16/25] [DSC-963] Configured spring boot maven plugin

---
 dspace/modules/server-boot/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
index 313cf0e78f62..a1dd702f97c5 100644
--- a/dspace/modules/server-boot/pom.xml
+++ b/dspace/modules/server-boot/pom.xml
@@ -108,6 +108,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+            </executions>
             </plugin>
         </plugins>
     </build>

From 06e77f354ca4d4ca1cdbd75200e97d824954c70b Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Wed, 15 Mar 2023 17:58:16 +0100
Subject: [PATCH 17/25] [DSC-963] Suppress checkstyle warning

---
 .../src/main/java/org/dspace/app/ServerBootApplication.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java b/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
index f46532ff14b5..5efa79a02aca 100644
--- a/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
+++ b/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
@@ -20,13 +20,10 @@
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
+@SuppressWarnings({ "checkstyle:hideutilityclassconstructor" })
 @SpringBootApplication(scanBasePackageClasses = WebApplication.class)
 public class ServerBootApplication {
 
-    private ServerBootApplication() {
-
-    }
-
     public static void main(String[] args) {
         new SpringApplicationBuilder(ServerBootApplication.class)
             .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer())

From 82a0ccf9ba2380498cda6219b62ebf83cd201b15 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Thu, 23 Mar 2023 15:06:32 +0100
Subject: [PATCH 18/25] [DSC-963] Fixed webjars classpath

---
 .../src/main/java/org/dspace/app/rest/WebApplication.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
index b04b6ebc9ee9..c67830e92573 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WebApplication.java
@@ -214,7 +214,7 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
                 // Make all other Webjars available off the /webjars path
                 registry
                     .addResourceHandler("/webjars/**")
-                    .addResourceLocations("/webjars/");
+                    .addResourceLocations("/webjars/", "classpath:/META-INF/resources/webjars/");
             }
 
             @Override

From 38d851a2cb886d2bfea43eee6a56861f96639c5a Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Thu, 28 Dec 2023 16:22:48 +0100
Subject: [PATCH 19/25] [DSC-963] Fixes testResources generation

---
 dspace-server-webapp/pom.xml | 68 +++++++++++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 4 deletions(-)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 3a755eaff937..1f21df10c623 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -28,6 +28,66 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>${root.basedir}/dspace/config/dspace.cfg</file>
+                                <file>${root.basedir}/dspace/config/local.cfg</file>
+                            </files>
+                            <quiet>true</quiet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>testEnvironment</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>testResources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/test/resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>webappFiltering</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                        <include>**/static/**</include>
+                                        <include>**/spring/**</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -333,7 +393,7 @@
         <dependency>
             <groupId>com.flipkart.zjsonpatch</groupId>
             <artifactId>zjsonpatch</artifactId>
-            <version>0.4.6</version>
+            <version>0.4.14</version>
         </dependency>
 
         <!-- HAL Browser (via WebJars) : https://github.com/mikekelly/hal-browser -->
@@ -353,7 +413,7 @@
         <dependency>
             <groupId>org.webjars.bowergithub.jquery</groupId>
             <artifactId>jquery-dist</artifactId>
-            <version>3.6.0</version>
+            <version>3.7.0</version>
         </dependency>
         <!-- Pull in current version of Toastr (toastrjs.com) via WebJars
              Made available at: webjars/toastr/build/toastr.min.js -->
@@ -367,7 +427,7 @@
         <dependency>
             <groupId>org.webjars.bowergithub.medialize</groupId>
             <artifactId>uri.js</artifactId>
-            <version>1.19.10</version>
+            <version>1.19.11</version>
         </dependency>
         <!-- Pull in current version of Underscore.js (https://underscorejs.org/) via WebJars
              Made available at: webjars/underscore/underscore-min.js -->
@@ -590,7 +650,7 @@
         <dependency>
             <groupId>org.exparity</groupId>
             <artifactId>hamcrest-date</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.8</version>
             <scope>test</scope>
         </dependency>
         <dependency>

From 9b86cb750a61efd71ad7a0dc1465f24d74f8a28b Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Thu, 28 Dec 2023 17:09:57 +0100
Subject: [PATCH 20/25] [DSC-963] Fixes server unpacking

---
 dspace/modules/server/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
index b61a3515195e..a91491a89f3a 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -12,6 +12,7 @@
     </parent>
 
     <properties>
+        <dspace.version>cris-2023.02.00</dspace.version>
         <!-- This is the path to the root [dspace-src] directory. -->
         <root.basedir>${basedir}/../../..</root.basedir>
     </properties>
@@ -67,6 +68,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeScope>runtime</includeScope>
+                            <includeGroupIds>org.dspace</includeGroupIds>
+                            <includeArtifactIds>dspace-server-webapp</includeArtifactIds>
+                            <includes>**/static/**,**/*.properties</includes>
+                            <outputDirectory>${project.build.directory}/additions</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <!-- This plugin allows us to run a Groovy script in our Maven POM
                  (see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
                  We are generating a OS-agnostic version (agnostic.build.dir) of

From 7b9e0b8c8ea99e4787e858adefec85a88c1a7fc4 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Fri, 29 Dec 2023 09:31:20 +0100
Subject: [PATCH 21/25] [DSC-963] Fixes resource copy and filtering

---
 dspace-server-webapp/pom.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 1f21df10c623..1cade653bfa1 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -61,7 +61,6 @@
                             <resources>
                                 <resource>
                                     <directory>${basedir}/src/test/resources</directory>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>
@@ -78,10 +77,15 @@
                                     <directory>${basedir}/src/main/resources</directory>
                                     <includes>
                                         <include>**/*.properties</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <includes>
                                         <include>**/static/**</include>
                                         <include>**/spring/**</include>
                                     </includes>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                         </configuration>

From ed9a301fa2a01f970da1e3cd9696c70a6084ca1c Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Mon, 8 Jan 2024 15:21:23 +0100
Subject: [PATCH 22/25] [DSC-963] Fixes server-boot version

---
 dspace/modules/server-boot/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
index a1dd702f97c5..c98af585c50d 100644
--- a/dspace/modules/server-boot/pom.xml
+++ b/dspace/modules/server-boot/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>cris-2022.03.01-SNAPSHOT</version>
+        <version>cris-2023.02.00</version>
         <relativePath>..</relativePath>
     </parent>
 

From 9769bffd16cb3f61589dd4b12c3ef3fd5af5b831 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Mon, 8 Jan 2024 15:50:02 +0100
Subject: [PATCH 23/25] [DSC-963] Updated version to 2023.02.02-SNAPSHOT

---
 dspace/modules/server-boot/pom.xml | 2 +-
 dspace/modules/server/pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
index c98af585c50d..96cad508db79 100644
--- a/dspace/modules/server-boot/pom.xml
+++ b/dspace/modules/server-boot/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>cris-2023.02.00</version>
+        <version>cris-2023.02.02-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
index bae1ded5cf45..04f6f5cd089f 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -12,7 +12,7 @@
     </parent>
 
     <properties>
-        <dspace.version>cris-2023.02.00</dspace.version>
+        <dspace.version>cris-2023.02.02-SNAPSHOT</dspace.version>
         <!-- This is the path to the root [dspace-src] directory. -->
         <root.basedir>${basedir}/../../..</root.basedir>
     </properties>

From 4b0d938c5df314f535801d0e174ebf23be287546 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Mon, 8 Jan 2024 16:38:50 +0100
Subject: [PATCH 24/25] [DSC-963] Fixes Checkstyle issues

---
 .../service/OrcidProfileSectionFactoryServiceIT.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
index 60122ba5dbde..fa0b47133a7b 100644
--- a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidProfileSectionFactoryServiceIT.java
@@ -298,7 +298,7 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreation() {
         assertThat(organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier(), is("12345"));
         assertThat(organization.getDisambiguatedOrganization().getDisambiguationSource(), is("RINGGOLD"));
     }
-    
+
     @Test
     public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithAncestor() {
 
@@ -310,14 +310,13 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithAncest
                                   .withOrgUnitLocality("Milan")
                                   .withOrgUnitRinggoldIdentifier("12345")
                                   .build();
-        
+
         Item orgUnitFather = ItemBuilder.createItem(context, orgUnits)
                 .withTitle("4Science without rin")
                 .withOrgUnitCountry("IT")
                 .withOrgUnitLocality("Milan")
                 .withParentOrganization("4Science with rin", orgUnitGranfather.getID().toString())
                 .build();
-        
 
         Item orgUnit = ItemBuilder.createItem(context, orgUnits)
                                   .withTitle("4Science")
@@ -363,7 +362,7 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithAncest
         assertThat(organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier(), is("12345"));
         assertThat(organization.getDisambiguatedOrganization().getDisambiguationSource(), is("RINGGOLD"));
     }
-    
+
     @Test
     public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithNoId() {
 
@@ -417,8 +416,7 @@ public void testDisambiguationFromOrgUnitHierarchyOnEmploymentCreationWithNoId()
         assertThat(organization.getAddress().getCity(), is("Milan"));
         assertThat(organization.getDisambiguatedOrganization(), nullValue());
     }
-    
-    
+
 
     @Test
     public void testQualificationCreation() {

From 1f1f6f4e84c51373b910b07f7c30fd7c82ff2cf9 Mon Sep 17 00:00:00 2001
From: Vincenzo Mecca <vincenzo.mecca@4science.com>
Date: Tue, 23 Jan 2024 12:19:13 +0100
Subject: [PATCH 25/25] [DSC-963] Addresses changes of the PR#8797

---
 dspace-server-webapp/pom.xml                  |  13 +-
 .../GenericAuthorizationFeatureIT.java        | 547 +++++-------------
 .../resources/application-test.properties     |   1 +
 dspace/modules/server-boot/pom.xml            |   2 +-
 dspace/modules/server/pom.xml                 |   2 +-
 5 files changed, 171 insertions(+), 394 deletions(-)

diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index fe47ad87ef3c..0a0b394d576a 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -76,10 +76,21 @@
                                 <resource>
                                     <directory>${basedir}/src/main/resources</directory>
                                     <includes>
-                                        <include>**/*.properties</include>
+                                        <include>**/*application*.properties</include>
+                                        <include>**/*dspace*.properties</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                    <excludes>
+                                        <exclude>**/*application*.properties</exclude>
+                                        <exclude>**/*dspace*.properties</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>**/*.properties</include>
+                                    </includes>
+                                </resource>
                                 <resource>
                                     <directory>${basedir}/src/main/resources</directory>
                                     <includes>
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
index 7872067a31e2..0ac7eea4250d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/GenericAuthorizationFeatureIT.java
@@ -37,6 +37,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.ResultActions;
 
 /**
  * Test for the following authorization features:
@@ -52,6 +53,8 @@
  */
 public class GenericAuthorizationFeatureIT extends AbstractControllerIntegrationTest {
 
+    private static final int SIZE = 100;
+
     @Autowired
     ConfigurationService configurationService;
 
@@ -208,215 +211,163 @@ private void testAdminsHavePermissionsAllDso(String feature) throws Exception {
         String siteId = ContentServiceFactory.getInstance().getSiteService().findSite(context).getID().toString();
 
         // Verify the general admin has this feature on the site
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/sites/" + siteId))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/sites/" + siteId)
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin doesn’t have this feature on the site
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/sites/" + siteId))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/sites/" + siteId)
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on community A
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(adminToken,"http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on community A
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on community AA
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin doesn’t have this feature on community A
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A admin doesn’t have this feature on community B
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityB.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/communities/" + communityB.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on collection X
-        getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on collection X
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on collection X
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on collection X
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X admin doesn’t have this feature on collection Y
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionY.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/collections/" + collectionY.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on item 1
-        getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on item 1
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on item 1
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on item 1
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on item 2
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on the bundle in item 2
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle2.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bundles/" + bundle2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on the bitstream in item 1
-        getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bitstream in item 1
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bitstream in item 1
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bitstream in item 1
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on the bitstream in item 2
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream2.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bitstreams/" + bitstream2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -429,41 +380,31 @@ private void testAdminsHavePermissionsItem(String feature) throws Exception {
         String item1AdminToken = getAuthToken(item1Admin.getEmail(), password);
 
         // Verify the general admin has this feature on item 1
-        getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on item 1
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on item 1
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on item 1
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin doesn’t have this feature on item 2
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/items/" + item2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -478,73 +419,55 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
         // Verify community A write has this feature on community A if the boolean parameter is true
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
-            getClient(communityAWriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/communities/" + communityA.getID()))
+            getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/communities/" + communityA.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
-            getClient(communityAWriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/communities/" + communityA.getID()))
+            getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/communities/" + communityA.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").doesNotExist());
         }
 
         // Verify community A write doesn’t have this feature on community AA
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A write doesn’t have this feature on collection X
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A write doesn’t have this feature on item 1
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A write doesn’t have this feature on the bundle in item 1
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A write doesn’t have this feature on the bitstream in item 1
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on community A
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on community AA
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -552,65 +475,49 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
         // Verify collection X write has this feature on collection X if the boolean parameter is true
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
-            getClient(collectionXWriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/collections/" + collectionX.getID()))
+            getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/collections/" + collectionX.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
-            getClient(collectionXWriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/collections/" + collectionX.getID()))
+            getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/collections/" + collectionX.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").doesNotExist());
         }
 
         // Verify collection X write doesn’t have this feature on item 1
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on the bundle in item 1
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on the bitstream in item 1
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on community A
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on community AA
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on collection X
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -618,57 +525,43 @@ private void testWriteUsersHavePermissionsAllDso(String feature, boolean hasDSOA
         // Verify item 1 write has this feature on item 1 if the boolean parameter is true
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
-            getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/items/" + item1.getID()))
+            getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
-            getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/items/" + item1.getID()))
+            getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").doesNotExist());
         }
 
         // Verify item 1 write doesn’t have this feature on the bundle in item 1
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on the bitstream in item 1
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A write doesn’t have this feature on community B
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/communities/" + communityB.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/communities/" + communityB.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on collection Y
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/collections/" + collectionY.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/collections/" + collectionY.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on item 2
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -680,17 +573,13 @@ private void testWriteUsersHavePermissionsItem(String feature, boolean hasDSOAcc
         String item1WriterToken = getAuthToken(item1Writer.getEmail(), password);
 
         // Verify community A write doesn’t have this feature on item 1
-        getClient(communityAWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on item 1
-        getClient(collectionXWriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -698,25 +587,19 @@ private void testWriteUsersHavePermissionsItem(String feature, boolean hasDSOAcc
         // Verify item 1 write has this feature on item 1 if the boolean parameter is true
         // (or doesn’t have access otherwise)
         if (hasDSOAccess) {
-            getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/items/" + item1.getID()))
+            getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").exists());
         } else {
-            getClient(item1WriterToken).perform(
-                get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                    + "http://localhost/api/core/items/" + item1.getID()))
+            getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                     + feature + "')]").doesNotExist());
         }
 
         // Verify item 1 write doesn’t have this feature on item 2
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -754,41 +637,31 @@ public void testCanMoveAdmin() throws Exception {
         final String feature = "canMove";
 
         // Verify the general admin has this feature on item 1
-        getClient(adminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on item 1
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on item 1
-        getClient(collectionXAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on item 1
-        getClient(item1AdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A admin doesn’t have this feature on item 2
-        getClient(communityAAdminToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item2.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/items/" + item2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -805,9 +678,7 @@ public void testCanMoveAdmin() throws Exception {
         context.restoreAuthSystemState();
 
         // verify item 1 write has this feature on item 1
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canMove')]")
                 .exists());
@@ -828,9 +699,7 @@ public void testCanMoveWriter() throws Exception {
 
         String item1WriterToken = getAuthToken(item1Writer.getEmail(), password);
         // verify item 1 write has this feature on item 1
-        getClient(item1WriterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-                + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canMove')]")
                 .exists());
@@ -866,31 +735,25 @@ public void testCanDeleteAdmin() throws Exception {
         final String feature = "canDelete";
 
         // Verify the general admin doesn’t have this feature on the site
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/sites/" + siteId))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/sites/" + siteId)
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on community A
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on community A
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on community AA
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -909,174 +772,139 @@ public void testCanDeleteAdmin() throws Exception {
             .build();
         context.restoreAuthSystemState();
         String communityAAAdminToken = getAuthToken(communityAAAdmin.getEmail(), password);
-        getClient(communityAAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityAAAdminToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X admin doesn’t have this feature on community A
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify community A admin doesn’t have this feature on community B
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityB.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/communities/" + communityB.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on collection X
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on collection X
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin doesn’t have this feature on collection X
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 admin doesn’t have this feature on collection X
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X admin doesn’t have this feature on collection Y
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionY.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/collections/" + collectionY.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on item 1
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAAdminToken,"http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on item 1
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken,"http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 admin doesn’t have this feature on item 2
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item2.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on the bundle in item 2
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle2.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bundles/" + bundle2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify the general admin has this feature on the bitstream in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bitstream in item 1
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bitstream in item 1
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bitstream in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin doesn’t have this feature on the bitstream in item 2
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream2.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bitstreams/" + bitstream2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1103,9 +931,7 @@ public void testCanDeleteAdminParent() throws Exception {
         context.restoreAuthSystemState();
         String communityAAAdminToken = getAuthToken(communityAAAdmin.getEmail(), password);
         //verify the community AA admin has this feature on community AA
-        getClient(communityAAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityAAAdminToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -1119,9 +945,7 @@ public void testCanDeleteAdminParent() throws Exception {
             .build();
         context.restoreAuthSystemState();
         // verify collection X admin has this feature on collection X
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -1135,8 +959,7 @@ public void testCanDeleteAdminParent() throws Exception {
             .build();
         context.restoreAuthSystemState();
         // verify item 1 admin has this feature on item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -1166,16 +989,12 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String communityADeleterToken = getAuthToken(communityADeleter.getEmail(), password);
         // Verify the user has this feature on community A
-        getClient(communityADeleterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(communityADeleterToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on community AA
-        getClient(communityADeleterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityADeleterToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1196,23 +1015,17 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String communityARemoverToken = getAuthToken(communityARemover.getEmail(), password);
         // Verify the user has this feature on community AA
-        getClient(communityARemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityARemoverToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on community A
-        getClient(communityARemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityA.getID()))
+        getAuthorizationFeatures(communityARemoverToken, "http://localhost/api/core/communities/" + communityA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on collection X
-        getClient(communityARemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(communityARemoverToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1232,23 +1045,17 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String communityAARemoverToken = getAuthToken(communityAARemover.getEmail(), password);
         // Verify the user has this feature on collection X
-        getClient(communityAARemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(communityAARemoverToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on community AA
-        getClient(communityAARemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/communities/" + communityAA.getID()))
+        getAuthorizationFeatures(communityAARemoverToken, "http://localhost/api/core/communities/" + communityAA.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on item 1
-        getClient(communityAARemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAARemoverToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1268,9 +1075,7 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String collectionXRemoverToken = getAuthToken(collectionXRemover.getEmail(), password);
         // Verify the user doesn’t have this feature on item 1
-        getClient(collectionXRemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXRemoverToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1290,8 +1095,7 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String item1DeleterToken = getAuthToken(item1Deleter.getEmail(), password);
         // Verify the user doesn’t have this feature on item 1
-        getClient(item1DeleterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1DeleterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1316,23 +1120,17 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String collectionXRemoverItem1DeleterToken = getAuthToken(collectionXRemoverItem1Deleter.getEmail(), password);
         // Verify the user has this feature on item 1
-        getClient(collectionXRemoverItem1DeleterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXRemoverItem1DeleterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on collection X
-        getClient(collectionXRemoverItem1DeleterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/collections/" + collectionX.getID()))
+        getAuthorizationFeatures(collectionXRemoverItem1DeleterToken, "http://localhost/api/core/collections/" + collectionX.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on the bundle in item 1
-        getClient(collectionXRemoverItem1DeleterToken).perform(
-            get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXRemoverItem1DeleterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1352,20 +1150,17 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String item1RemoverToken = getAuthToken(item1Remover.getEmail(), password);
         // Verify the user has this feature on the bundle in item 1
-        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1RemoverToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
         // Verify this user doesn’t have this feature on item 1
-        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1RemoverToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify this user doesn’t have this feature on the bitstream in item 1
-        getClient(item1RemoverToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(item1RemoverToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1385,9 +1180,7 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String bundle1RemoverToken = getAuthToken(bundle1Remover.getEmail(), password);
         // Verify the user doesn’t have this feature on the bitstream in item 1
-        getClient(bundle1RemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(bundle1RemoverToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1413,9 +1206,7 @@ public void testCanDeleteMinimalPermissions() throws Exception {
         context.restoreAuthSystemState();
         String bundle1item1RemoverToken = getAuthToken(bundle1item1Remover.getEmail(), password);
         // Verify the user has this feature on the bitstream in item 1
-        getClient(bundle1item1RemoverToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bitstreams/" + bitstream1.getID()))
+        getAuthorizationFeatures(bundle1item1RemoverToken, "http://localhost/api/core/bitstreams/" + bitstream1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1430,39 +1221,31 @@ public void testCanReorderBitstreamsAdmin() throws Exception {
         final String feature = "canReorderBitstreams";
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin doesn’t have this feature on the bundle in item 2
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle2.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bundles/" + bundle2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1476,31 +1259,24 @@ public void testCanReorderBitstreamsWriter() throws Exception {
         final String feature = "canReorderBitstreams";
 
         // Verify community A write doesn’t have this feature on the bundle in item 1
-        getClient(communityAWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify collection X write doesn’t have this feature on the bundle in item 1
-        getClient(collectionXWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
         // Verify item 1 write doesn’t have this feature on the bundle in item 1
-        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Create a new user, grant WRITE permissions on the bundle in item 1 to this user
         // Verify the user has this feature on the bundle in item 1
-        getClient(communityAWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1515,39 +1291,31 @@ public void testCanCreateBitstreamAdmin() throws Exception {
         final String feature = "canCreateBitstream";
 
         // Verify the general admin has this feature on the bundle in item 1
-        getClient(adminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(adminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin has this feature on the bundle in item 1
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify collection X admin has this feature on the bundle in item 1
-        getClient(collectionXAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXAdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify item 1 admin has this feature on the bundle in item 1
-        getClient(item1AdminToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1AdminToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
 
         // Verify community A admin doesn’t have this feature on the bundle in item 2
-        getClient(communityAAdminToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle2.getID()))
+        getAuthorizationFeatures(communityAAdminToken, "http://localhost/api/core/bundles/" + bundle2.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1561,24 +1329,19 @@ public void testCanCreateBitstreamWriter() throws Exception {
         final String feature = "canCreateBitstream";
 
         // Verify community A write doesn’t have this feature on the bundle in item 1
-        getClient(communityAWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on the bundle in item 1
-        getClient(collectionXWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on the bundle in item 1
-        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1598,8 +1361,7 @@ public void testCanCreateBitstreamWriter() throws Exception {
         context.restoreAuthSystemState();
         String bundle1WriterToken = getAuthToken(bundle1Writer.getEmail(), password);
         // Verify the user doesn’t have this feature on the bundle in item 1
-        getClient(bundle1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(bundle1WriterToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1619,8 +1381,7 @@ public void testCanCreateBitstreamWriter() throws Exception {
         context.restoreAuthSystemState();
         String bundle1AdderToken = getAuthToken(bundle1Adder.getEmail(), password);
         // Verify the user doesn’t have this feature on the bundle in item 1
-        getClient(bundle1AdderToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(bundle1AdderToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1656,9 +1417,7 @@ public void testCanCreateBitstreamWriter() throws Exception {
         context.restoreAuthSystemState();
         String bundle1WriterAdderToken = getAuthToken(bundle1WriterAdder.getEmail(), password);
         // Verify the user has this feature on the bundle in item 1
-        getClient(bundle1WriterAdderToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/bundles/" + bundle1.getID()))
+        getAuthorizationFeatures(bundle1WriterAdderToken, "http://localhost/api/core/bundles/" + bundle1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
@@ -1677,24 +1436,19 @@ public void testCanCreateBundleWriter() throws Exception {
         final String feature = "canCreateBundle";
 
         // Verify community A write doesn’t have this feature on item 1
-        getClient(communityAWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(communityAWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify collection X write doesn’t have this feature on item 1
-        getClient(collectionXWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(collectionXWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
 
         // Verify item 1 write doesn’t have this feature on item 1
-        getClient(item1WriterToken).perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").doesNotExist());
@@ -1719,11 +1473,22 @@ public void testCanCreateBundleWriter() throws Exception {
         context.restoreAuthSystemState();
         String item1AdderWriterToken = getAuthToken(item1AdderWriter.getEmail(), password);
         // Verify the user has this feature on item 1
-        getClient(item1AdderWriterToken)
-            .perform(get("/api/authz/authorizations/search/object?size=1000&embed=feature&uri="
-            + "http://localhost/api/core/items/" + item1.getID()))
+        getAuthorizationFeatures(item1AdderWriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='"
                 + feature + "')]").exists());
     }
+
+    private ResultActions getAuthorizationFeatures(String adminToken, String uri) throws Exception {
+        return getAuthorizationFeatures(adminToken, uri, SIZE);
+    }
+
+    private ResultActions getAuthorizationFeatures(String adminToken, String uri, int size) throws Exception {
+        return getClient(adminToken)
+            .perform(
+                get(
+                    "/api/authz/authorizations/search/object?size=" + size + "&embed=feature&uri=" + uri
+                )
+            );
+    }
 }
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/application-test.properties b/dspace-server-webapp/src/test/resources/application-test.properties
index e92e1166e355..bd9e2ea4a17b 100644
--- a/dspace-server-webapp/src/test/resources/application-test.properties
+++ b/dspace-server-webapp/src/test/resources/application-test.properties
@@ -16,4 +16,5 @@
 ## This file is found on classpath at src/test/resources/log4j2-test.xml
 logging.config = classpath:log4j2-test.xml
 
+# Our integration tests expect application to be deployed at the root path (/)
 server.servlet.context-path=/
\ No newline at end of file
diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
index 96cad508db79..ee23c8ee7bc7 100644
--- a/dspace/modules/server-boot/pom.xml
+++ b/dspace/modules/server-boot/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.dspace</groupId>
     <artifactId>server-boot</artifactId>
-    <name>DSpace Server Webapp:: Boot</name>
+    <name>DSpace Server Webapp:: Executable JAR</name>
 
     <!--
       A Parent POM that Maven inherits DSpace Default
diff --git a/dspace/modules/server/pom.xml b/dspace/modules/server/pom.xml
index 04f6f5cd089f..3797e809dca5 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -3,7 +3,7 @@
     <groupId>org.dspace.modules</groupId>
     <artifactId>server</artifactId>
     <packaging>war</packaging>
-    <name>DSpace Server Webapp:: Local Customizations</name>
+    <name>DSpace Server Webapp:: Tomcat deployable WAR</name>
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>